You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ni...@apache.org on 2024/09/06 13:07:30 UTC
(hbase) branch master updated: HBASE-28807 Remove some useless code and add some logs for CanaryTool (#6187)
This is an automated email from the ASF dual-hosted git repository.
nihaljain pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new b161ad573e6 HBASE-28807 Remove some useless code and add some logs for CanaryTool (#6187)
b161ad573e6 is described below
commit b161ad573e6ede257528a2b0802e07e6a6c8eccb
Author: WangXin <14...@qq.com>
AuthorDate: Fri Sep 6 21:07:23 2024 +0800
HBASE-28807 Remove some useless code and add some logs for CanaryTool (#6187)
Co-authored-by: wangxin <wa...@gmail.com>
Signed-off-by: Nihal Jain <ni...@apache.org>
---
.../org/apache/hadoop/hbase/tool/CanaryTool.java | 34 ++++++++++------------
1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/CanaryTool.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/CanaryTool.java
index 21e9edfe068..f21edd176d4 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/CanaryTool.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/CanaryTool.java
@@ -1734,26 +1734,22 @@ public class CanaryTool implements Tool, Canary {
TableDescriptor tableDesc, ExecutorService executor, TaskType taskType, boolean rawScanEnabled,
LongAdder rwLatency, boolean readAllCF) throws Exception {
LOG.debug("Reading list of regions for table {}", tableDesc.getTableName());
- try (Table table = admin.getConnection().getTable(tableDesc.getTableName())) {
- List<RegionTask> tasks = new ArrayList<>();
- try (RegionLocator regionLocator =
- admin.getConnection().getRegionLocator(tableDesc.getTableName())) {
- for (HRegionLocation location : regionLocator.getAllRegionLocations()) {
- if (location == null) {
- LOG.warn("Null location");
- continue;
- }
- ServerName rs = location.getServerName();
- RegionInfo region = location.getRegion();
- tasks.add(new RegionTask(admin.getConnection(), region, rs, (RegionStdOutSink) sink,
- taskType, rawScanEnabled, rwLatency, readAllCF));
- Map<String, List<RegionTaskResult>> regionMap = ((RegionStdOutSink) sink).getRegionMap();
- regionMap.put(region.getRegionNameAsString(), new ArrayList<RegionTaskResult>());
+ List<RegionTask> tasks = new ArrayList<>();
+ try (RegionLocator regionLocator =
+ admin.getConnection().getRegionLocator(tableDesc.getTableName())) {
+ for (HRegionLocation location : regionLocator.getAllRegionLocations()) {
+ if (location == null) {
+ LOG.warn("Null location for table {}", tableDesc.getTableName());
+ continue;
}
- return executor.invokeAll(tasks);
+ ServerName rs = location.getServerName();
+ RegionInfo region = location.getRegion();
+ tasks.add(new RegionTask(admin.getConnection(), region, rs, (RegionStdOutSink) sink,
+ taskType, rawScanEnabled, rwLatency, readAllCF));
+ Map<String, List<RegionTaskResult>> regionMap = ((RegionStdOutSink) sink).getRegionMap();
+ regionMap.put(region.getRegionNameAsString(), new ArrayList<RegionTaskResult>());
}
- } catch (TableNotFoundException e) {
- return Collections.EMPTY_LIST;
+ return executor.invokeAll(tasks);
}
}
@@ -1959,7 +1955,7 @@ public class CanaryTool implements Tool, Canary {
this.admin.getConnection().getRegionLocator(tableDesc.getTableName())) {
for (HRegionLocation location : regionLocator.getAllRegionLocations()) {
if (location == null) {
- LOG.warn("Null location");
+ LOG.warn("Null location for table {}", tableDesc.getTableName());
continue;
}
ServerName rs = location.getServerName();