Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@hbase.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1587282 -
 /hbase/trunk/hbase-shell/src/main/ruby/shell/commands.rb
Date: Mon, 14 Apr 2014 18:59:33 -0000
To: commits@hbase.apache.org
From: rajeshbabu@apache.org
Message-Id: <20140414185933.399CE23888E2@eris.apache.org>

Author: rajeshbabu
Date: Mon Apr 14 18:59:32 2014
New Revision: 1587282

URL: http://svn.apache.org/r1587282
Log:
HBASE-10533 commands.rb is giving wrong error messages on exceptions(rajeshbabu)

Modified:
    hbase/trunk/hbase-shell/src/main/ruby/shell/commands.rb

Modified: hbase/trunk/hbase-shell/src/main/ruby/shell/commands.rb
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-shell/src/main/ruby/shell/commands.rb?rev=1587282&r1=1587281&r2=1587282&view=diff
==============================================================================
--- hbase/trunk/hbase-shell/src/main/ruby/shell/commands.rb (original)
+++ hbase/trunk/hbase-shell/src/main/ruby/shell/commands.rb Mon Apr 14 18:59:32 2014
@@ -95,14 +95,28 @@ module Shell
         # Get the special java exception which will be handled
         cause = e.cause
         if cause.kind_of?(org.apache.hadoop.hbase.TableNotFoundException) then
-          raise "Unknown table #{args.first}!"
+	  str = java.lang.String.new("#{cause}")
+          raise "Unknown table #{str}!"
         end
-        if cause.kind_of?(org.apache.hadoop.hbase.regionserver.NoSuchColumnFamilyException) then
-          valid_cols = table(args.first).get_all_columns.map { |c| c + '*' }
-          raise "Unknown column family! Valid column names: #{valid_cols.join(", ")}"
+        if cause.kind_of?(org.apache.hadoop.hbase.client.RetriesExhaustedWithDetailsException) then
+          exceptions = cause.getCauses
+          exceptions.each do |exception|
+            if exception.kind_of?(org.apache.hadoop.hbase.regionserver.NoSuchColumnFamilyException) then
+              valid_cols = table(args.first).get_all_columns.map { |c| c + '*' }
+              raise "Unknown column family! Valid column names: #{valid_cols.join(", ")}"
+            end
+          end
         end
         if cause.kind_of?(org.apache.hadoop.hbase.TableExistsException) then
-          raise "Table already exists: #{args.first}!"
+          str = java.lang.String.new("#{cause}")
+          strs = str.split("\n")
+          if strs.size > 0 then
+            s = strs[0].split(' ');
+            if(s.size > 1)
+              raise "Table already exists: #{s[1]}!"
+            end
+              raise "Table already exists: #{strs[0]}!"
+          end
         end
         # To be safe, here only AccessDeniedException is considered. In future
         # we might support more in more generic approach when possible.