diff --git bin/region_mover.rb bin/region_mover.rb index 5df8140..88bde71 100644 --- bin/region_mover.rb +++ bin/region_mover.rb @@ -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 diff --git bin/region_status.rb bin/region_status.rb index 5ccc8c2..91aa4c3 100644 --- bin/region_status.rb +++ bin/region_status.rb @@ -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 diff --git hbase-server/src/main/ruby/shell/commands.rb hbase-server/src/main/ruby/shell/commands.rb index eb02607..fba5f1d 100644 --- hbase-server/src/main/ruby/shell/commands.rb +++ hbase-server/src/main/ruby/shell/commands.rb @@ -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