You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2018/10/17 16:35:17 UTC
hbase git commit: HBASE-21327 Fix minor logging issue where we don't
report servername if no associated SCP
Repository: hbase
Updated Branches:
refs/heads/branch-2.1 999a3c67d -> 47364d4db
HBASE-21327 Fix minor logging issue where we don't report servername if no associated SCP
Signed-off-by: Duo Zhang <zh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/47364d4d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/47364d4d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/47364d4d
Branch: refs/heads/branch-2.1
Commit: 47364d4db6d2057f272bb98965cec68c3222a76f
Parents: 999a3c6
Author: Michael Stack <st...@apache.org>
Authored: Tue Oct 16 21:21:02 2018 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Wed Oct 17 09:34:58 2018 -0700
----------------------------------------------------------------------
.../hbase/master/RegionServerTracker.java | 4 ++--
.../master/balancer/StochasticLoadBalancer.java | 21 ++++++++------------
.../procedure/MasterProcedureScheduler.java | 4 ++--
3 files changed, 12 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/47364d4d/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionServerTracker.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionServerTracker.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionServerTracker.java
index b2aedf0..f419732 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionServerTracker.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionServerTracker.java
@@ -126,8 +126,8 @@ public class RegionServerTracker extends ZKListener {
// deadServersFromPE is made from a list of outstanding ServerCrashProcedures.
// splittingServersFromWALDir are being actively split -- the directory in the FS ends in
// '-SPLITTING'. Each splitting server should have a corresponding SCP. Log if not.
- splittingServersFromWALDir.stream().map(s -> !deadServersFromPE.contains(s)).
- forEach(s -> LOG.error("{} has no matching ServerCrashProcedure", s));
+ splittingServersFromWALDir.stream().filter(s -> !deadServersFromPE.contains(s)).
+ forEach(s -> LOG.error("{} has no matching ServerCrashProcedure", s));
watcher.registerListener(this);
synchronized (this) {
List<String> servers =
http://git-wip-us.apache.org/repos/asf/hbase/blob/47364d4d/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/47364d4d/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 02d8b10..422a11b 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
@@ -693,7 +693,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;
@@ -702,7 +702,7 @@ public class MasterProcedureScheduler extends AbstractProcedureScheduler {
}
break;
} else {
- LOG.info("xlock for {}", procedure);
+ LOG.info("Took xlock for {}", procedure);
}
}