Repository: hbase Updated Branches: refs/heads/branch-2.0 f3a80a7ed -> 467b7ade2
HBASE-21327 Fix minor logging issue where we don't report servername if no associated SCP Signed-off-by: Duo Zhang <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/467b7ade Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/467b7ade Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/467b7ade Branch: refs/heads/branch-2.0 Commit: 467b7ade2766a5fcf85b96e47d26ce2f76204fba Parents: f3a80a7 Author: Michael Stack <[email protected]> Authored: Tue Oct 16 21:21:02 2018 -0700 Committer: Michael Stack <[email protected]> Committed: Wed Oct 17 09:36:51 2018 -0700 ---------------------------------------------------------------------- .../master/balancer/StochasticLoadBalancer.java | 21 ++++++++------------ .../procedure/MasterProcedureScheduler.java | 4 ++-- 2 files changed, 10 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/467b7ade/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java index ba080a3..d134690 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java @@ -431,21 +431,16 @@ public class StochasticLoadBalancer extends BaseLoadBalancer { updateStochasticCosts(tableName, curOverallCost, curFunctionCosts); if (initCost > currentCost) { plans = createRegionPlans(cluster); - if (LOG.isDebugEnabled()) { - LOG.debug("Finished computing new load balance plan. Computation took " - + (endTime - startTime) + "ms to try " + step - + " different iterations. Found a solution that moves " - + plans.size() + " regions; Going from a computed cost of " - + initCost + " to a new cost of " + currentCost); - } - + LOG.info("Finished computing new load balance plan. Computation took {}" + + " to try {} different iterations. Found a solution that moves " + + "{} regions; Going from a computed cost of {}" + + " to a new cost of {}", java.time.Duration.ofMillis(endTime - startTime), + step, plans.size(), initCost, currentCost); return plans; } - if (LOG.isDebugEnabled()) { - LOG.debug("Could not find a better load balance plan. Tried " - + step + " different configurations in " + (endTime - startTime) - + "ms, and did not find anything with a computed cost less than " + initCost); - } + LOG.info("Could not find a better load balance plan. Tried {} different configurations in " + + "{}, and did not find anything with a computed cost less than {}", step, + java.time.Duration.ofMillis(endTime - startTime), initCost); return null; } http://git-wip-us.apache.org/repos/asf/hbase/blob/467b7ade/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java index d1d3dbf..51cbc3f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java @@ -634,7 +634,7 @@ public class MasterProcedureScheduler extends AbstractProcedureScheduler { regionLocks[i] = locking.getRegionLock(regionInfo[i].getEncodedName()); if (!regionLocks[i].tryExclusiveLock(procedure)) { - LOG.info("Waiting xlock for {} held by pid={}", procedure, + LOG.info("Waiting on xlock for {} held by pid={}", procedure, regionLocks[i].getExclusiveLockProcIdOwner()); waitProcedure(regionLocks[i], procedure); hasLock = false; @@ -643,7 +643,7 @@ public class MasterProcedureScheduler extends AbstractProcedureScheduler { } break; } else { - LOG.info("xlock for {}", procedure); + LOG.info("Took xlock for {}", procedure); } }
