Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1F2ACE216 for ; Fri, 8 Mar 2013 02:56:35 +0000 (UTC) Received: (qmail 55954 invoked by uid 500); 8 Mar 2013 02:56:34 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 55738 invoked by uid 500); 8 Mar 2013 02:56:34 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 55713 invoked by uid 99); 8 Mar 2013 02:56:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Mar 2013 02:56:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Mar 2013 02:56:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EE33A2388A68; Fri, 8 Mar 2013 02:56:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1454222 - in /hbase/trunk: bin/region_mover.rb bin/region_status.rb hbase-server/src/main/ruby/shell/commands.rb Date: Fri, 08 Mar 2013 02:56:10 -0000 To: commits@hbase.apache.org From: apurtell@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130308025610.EE33A2388A68@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: apurtell Date: Fri Mar 8 02:56:10 2013 New Revision: 1454222 URL: http://svn.apache.org/r1454222 Log: HBASE-8004. Creating an existing table from Shell does not throw TableExistsException (Jeffrey Zhong) Modified: hbase/trunk/bin/region_mover.rb hbase/trunk/bin/region_status.rb hbase/trunk/hbase-server/src/main/ruby/shell/commands.rb Modified: hbase/trunk/bin/region_mover.rb URL: http://svn.apache.org/viewvc/hbase/trunk/bin/region_mover.rb?rev=1454222&r1=1454221&r2=1454222&view=diff ============================================================================== --- hbase/trunk/bin/region_mover.rb (original) +++ hbase/trunk/bin/region_mover.rb Fri Mar 8 02:56:10 2013 @@ -379,7 +379,7 @@ def loadRegions(options, hostname) begin isSuccessfulScan(admin, r) exists = true - rescue org.apache.hadoop.hbase.NotServingRegionException => e + rescue org.apache.hadoop.hbase.exceptions.NotServingRegionException => e $LOG.info("Failed scan of " + e.message) end count = count + 1 Modified: hbase/trunk/bin/region_status.rb URL: http://svn.apache.org/viewvc/hbase/trunk/bin/region_status.rb?rev=1454222&r1=1454221&r2=1454222&view=diff ============================================================================== --- hbase/trunk/bin/region_status.rb (original) +++ hbase/trunk/bin/region_status.rb Fri Mar 8 02:56:10 2013 @@ -47,7 +47,7 @@ require 'java' import org.apache.hadoop.hbase.HBaseConfiguration import org.apache.hadoop.hbase.HConstants -import org.apache.hadoop.hbase.MasterNotRunningException +import org.apache.hadoop.hbase.exceptions.MasterNotRunningException import org.apache.hadoop.hbase.client.HBaseAdmin import org.apache.hadoop.hbase.client.HTable import org.apache.hadoop.hbase.client.Scan Modified: hbase/trunk/hbase-server/src/main/ruby/shell/commands.rb URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/ruby/shell/commands.rb?rev=1454222&r1=1454221&r2=1454222&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/main/ruby/shell/commands.rb (original) +++ hbase/trunk/hbase-server/src/main/ruby/shell/commands.rb Fri Mar 8 02:56:10 2013 @@ -81,12 +81,12 @@ module Shell def translate_hbase_exceptions(*args) yield - rescue org.apache.hadoop.hbase.TableNotFoundException + rescue org.apache.hadoop.hbase.exceptions.TableNotFoundException raise "Unknown table #{args.first}!" - rescue org.apache.hadoop.hbase.regionserver.NoSuchColumnFamilyException + rescue org.apache.hadoop.hbase.exceptions.NoSuchColumnFamilyException valid_cols = table(args.first).get_all_columns.map { |c| c + '*' } raise "Unknown column family! Valid column names: #{valid_cols.join(", ")}" - rescue org.apache.hadoop.hbase.TableExistsException + rescue org.apache.hadoop.hbase.exceptions.TableExistsException raise "Table already exists: #{args.first}!" end end