Skip to content

Commit f017e7b

Browse files
committed
HBASE-22661 list_regions command in hbase shell is broken
Signed-off-by: Guanghao Zhang <[email protected]>
1 parent 4211266 commit f017e7b

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

hbase-shell/src/main/ruby/shell/commands/list_regions.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def command(table_name, options = nil, cols = nil)
8282
error = false
8383
admin_instance = admin.instance_variable_get('@admin')
8484
conn_instance = admin_instance.getConnection
85-
cluster_status = admin_instance.getClusterStatus
85+
cluster_status = org.apache.hadoop.hbase.ClusterStatus.new(admin_instance.getClusterMetrics)
8686
hregion_locator_instance = conn_instance.getRegionLocator(TableName.valueOf(table_name))
8787
hregion_locator_list = hregion_locator_instance.getAllRegionLocations.to_a
8888
results = []
@@ -103,7 +103,7 @@ def command(table_name, options = nil, cols = nil)
103103
end
104104

105105
regions.each do |hregion|
106-
hregion_info = hregion.getRegionInfo
106+
hregion_info = hregion.getRegion
107107
server_name = hregion.getServerName
108108
region_load_map = cluster_status.getLoad(server_name).getRegionsLoad
109109
region_load = region_load_map.get(hregion_info.getRegionName)

hbase-shell/src/test/ruby/hbase/admin_test.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,10 @@ def teardown
442442
encodedRegionName = region.getRegionInfo().getEncodedName()
443443
command(:unassign, encodedRegionName, true)
444444
end
445+
446+
define_test "list regions should allow table name" do
447+
command(:list_regions, @test_name)
448+
end
445449
end
446450

447451
# Simple administration methods tests

0 commit comments

Comments
 (0)