Repository: hadoop Updated Branches: refs/heads/HDFS-7240 9796d60e6 -> 94a567dd0
HDFS-12467. Ozone: SCM: NodeManager should log when it comes out of chill mode. Contributed by Nandakumar. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/94a567dd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/94a567dd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/94a567dd Branch: refs/heads/HDFS-7240 Commit: 94a567dd071b65a29cbf6d5d09d86d9c4a13bda7 Parents: 9796d60 Author: Anu Engineer <[email protected]> Authored: Tue Oct 3 14:41:56 2017 -0700 Committer: Anu Engineer <[email protected]> Committed: Tue Oct 3 14:41:56 2017 -0700 ---------------------------------------------------------------------- .../hadoop/ozone/scm/node/SCMNodeManager.java | 73 ++++++++++++-------- .../hadoop/ozone/scm/node/TestNodeManager.java | 5 +- 2 files changed, 47 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/94a567dd/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/node/SCMNodeManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/node/SCMNodeManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/node/SCMNodeManager.java index 9f73606..16ebfd9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/node/SCMNodeManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/node/SCMNodeManager.java @@ -18,7 +18,6 @@ package org.apache.hadoop.ozone.scm.node; import com.google.common.annotations.VisibleForTesting; -import java.util.Optional; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ThreadFactoryBuilder; import org.apache.commons.collections.map.HashedMap; @@ -62,6 +61,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @@ -131,7 +131,17 @@ public class SCMNodeManager private final int maxHBToProcessPerLoop; private final String clusterID; private final VersionInfo version; - private Optional<Boolean> inManualChillMode; + /** + * During start up of SCM, it will enter into chill mode and will be there + * until number of Datanodes registered reaches {@code chillModeNodeCount}. + * This flag is for tracking startup chill mode. + */ + private AtomicBoolean inStartupChillMode; + /** + * Administrator can put SCM into chill mode manually. + * This flag is for tracking manual chill mode. + */ + private AtomicBoolean inManualChillMode; private final CommandQueue commandQueue; // Node manager MXBean private ObjectName nmInfoBean; @@ -173,7 +183,10 @@ public class SCMNodeManager executorService = HadoopExecutors.newScheduledThreadPool(1, new ThreadFactoryBuilder().setDaemon(true) .setNameFormat("SCM Heartbeat Processing Thread - %d").build()); - this.inManualChillMode = Optional.empty(); + + LOG.info("Entering startup chill mode."); + this.inStartupChillMode = new AtomicBoolean(true); + this.inManualChillMode = new AtomicBoolean(false); Preconditions.checkState(heartbeatCheckerIntervalMs > 0); executorService.schedule(this, heartbeatCheckerIntervalMs, @@ -286,11 +299,7 @@ public class SCMNodeManager */ @Override public boolean isOutOfNodeChillMode() { - if (inManualChillMode.isPresent()) { - return !inManualChillMode.get(); - } - - return (totalNodes.get() >= getMinimumChillModeNodes()); + return !inStartupChillMode.get() && !inManualChillMode.get(); } /** @@ -298,7 +307,8 @@ public class SCMNodeManager */ @Override public void clearChillModeFlag() { - this.inManualChillMode = Optional.empty(); + LOG.info("Clearing manual chill mode flag."); + this.inManualChillMode.getAndSet(false); } /** @@ -307,22 +317,15 @@ public class SCMNodeManager */ @Override public String getChillModeStatus() { - if (inManualChillMode.isPresent() && inManualChillMode.get()) { - return "Manual chill mode is set to true." + - getNodeStatus(); - } - - if (inManualChillMode.isPresent() && !inManualChillMode.get()) { - return "Manual chill mode is set to false." + - getNodeStatus(); - } - - if (isOutOfNodeChillMode()) { - return "Out of chill mode." + getNodeStatus(); - } else { + if (inStartupChillMode.get()) { return "Still in chill mode, waiting on nodes to report in." + getNodeStatus(); } + if (inManualChillMode.get()) { + return "Out of startup chill mode, but in manual chill mode." + + getNodeStatus(); + } + return "Out of chill mode." + getNodeStatus(); } /** @@ -344,19 +347,24 @@ public class SCMNodeManager */ @Override public boolean isInManualChillMode() { - if (this.inManualChillMode.isPresent()) { - return this.inManualChillMode.get(); - } - return false; + return inManualChillMode.get(); } /** * Forcefully exits the chill mode even if we have not met the minimum - * criteria of exiting the chill mode. + * criteria of exiting the chill mode. This will exit from both startup + * and manual chill mode. */ @Override public void forceExitChillMode() { - this.inManualChillMode = Optional.of(false); + if(inStartupChillMode.get()) { + LOG.info("Leaving startup chill mode."); + inStartupChillMode.getAndSet(false); + } + if(inManualChillMode.get()) { + LOG.info("Leaving manual chill mode."); + inManualChillMode.getAndSet(false); + } } /** @@ -364,7 +372,8 @@ public class SCMNodeManager */ @Override public void forceEnterChillMode() { - this.inManualChillMode = Optional.of(true); + LOG.info("Entering manual chill mode."); + inManualChillMode.getAndSet(true); } /** @@ -728,6 +737,12 @@ public class SCMNodeManager healthyNodeCount.incrementAndGet(); nodeStats.put(datanodeID.getDatanodeUuid(), new SCMNodeStat()); + if(inStartupChillMode.get() && + totalNodes.get() >= getMinimumChillModeNodes()) { + inStartupChillMode.getAndSet(false); + LOG.info("Leaving startup chill mode."); + } + // TODO: define node pool policy for non-default node pool. // For now, all nodes are added to the "DefaultNodePool" upon registration // if it has not been added to any node pool yet. http://git-wip-us.apache.org/repos/asf/hadoop/blob/94a567dd/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/node/TestNodeManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/node/TestNodeManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/node/TestNodeManager.java index e8bf0ad..9609588 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/node/TestNodeManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/node/TestNodeManager.java @@ -907,7 +907,7 @@ public class TestNodeManager { assertTrue(nodeManager.isOutOfNodeChillMode()); status = nodeManager.getChillModeStatus(); Assert.assertThat(status, - CoreMatchers.containsString("Manual chill mode is set to false.")); + CoreMatchers.containsString("Out of chill mode.")); assertFalse((nodeManager.isInManualChillMode())); @@ -916,7 +916,8 @@ public class TestNodeManager { assertFalse(nodeManager.isOutOfNodeChillMode()); status = nodeManager.getChillModeStatus(); Assert.assertThat(status, - CoreMatchers.containsString("Manual chill mode is set to true.")); + CoreMatchers.containsString("Out of startup chill mode," + + " but in manual chill mode.")); assertTrue((nodeManager.isInManualChillMode())); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
