From 11575add01af619031f36d3e3041bb3316de1c67 Mon Sep 17 00:00:00 2001 From: lpalasthy <80091316+lpalasthy@users.noreply.github.com> Date: Tue, 24 Aug 2021 13:18:18 +0200 Subject: [PATCH 1/2] HBASE-26219 Negative time is logged while waiting on regionservers --- .../main/java/org/apache/hadoop/hbase/master/ServerManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java index a932ac603764..d7dc1227fdbb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java @@ -799,7 +799,7 @@ public void waitForRegionServers(MonitoredTask status) throws InterruptedExcepti String msg = "Waiting on regionserver count=" + count + "; waited="+ slept + "ms, expecting min=" + minToStart + " server(s), max="+ getStrForMax(maxToStart) + - " server(s), " + "timeout=" + timeout + "ms, lastChange=" + (lastCountChange - now) + "ms"; + " server(s), " + "timeout=" + timeout + "ms, lastChange=" + (now - lastCountChange) + "ms"; LOG.info(msg); status.setStatus(msg); } From 13c802407cbdf77befa5fda87866b14caaf17844 Mon Sep 17 00:00:00 2001 From: lpalasthy <80091316+lpalasthy@users.noreply.github.com> Date: Tue, 24 Aug 2021 15:14:38 +0200 Subject: [PATCH 2/2] checkstyle fix --- .../java/org/apache/hadoop/hbase/master/ServerManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java index d7dc1227fdbb..e9b109859bcc 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java @@ -798,8 +798,9 @@ public void waitForRegionServers(MonitoredTask status) throws InterruptedExcepti lastLogTime = now; String msg = "Waiting on regionserver count=" + count + "; waited="+ - slept + "ms, expecting min=" + minToStart + " server(s), max="+ getStrForMax(maxToStart) + - " server(s), " + "timeout=" + timeout + "ms, lastChange=" + (now - lastCountChange) + "ms"; + slept + "ms, expecting min=" + minToStart + " server(s), max=" + + getStrForMax(maxToStart) + " server(s), " + "timeout=" + timeout + + "ms, lastChange=" + (now - lastCountChange) + "ms"; LOG.info(msg); status.setStatus(msg); }