Repository: hadoop Updated Branches: refs/heads/HDFS-7240 2628d1b06 -> 218f6f61b
HDFS-12684. Ozone: SCMMXBean NodeCount is overlapping with NodeManagerMXBean. Contributed by Weiwei Yang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/218f6f61 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/218f6f61 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/218f6f61 Branch: refs/heads/HDFS-7240 Commit: 218f6f61bf230e3178905c01fa3a2e747b08c5ea Parents: 2628d1b Author: Weiwei Yang <[email protected]> Authored: Tue Oct 24 14:09:33 2017 +0800 Committer: Weiwei Yang <[email protected]> Committed: Tue Oct 24 14:09:33 2017 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/ozone/scm/SCMMXBean.java | 9 --------- .../apache/hadoop/ozone/scm/StorageContainerManager.java | 9 --------- .../java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java | 4 ---- 3 files changed, 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/218f6f61/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/SCMMXBean.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/SCMMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/SCMMXBean.java index 0793ccd..9f50f77 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/SCMMXBean.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/SCMMXBean.java @@ -21,8 +21,6 @@ package org.apache.hadoop.ozone.scm; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.jmx.ServiceRuntimeInfo; -import java.util.Map; - /** * * This is the JMX management interface for scm information. @@ -31,13 +29,6 @@ import java.util.Map; public interface SCMMXBean extends ServiceRuntimeInfo { /** - * Get the number of data nodes that in all states. - * - * @return A state to number of nodes that in this state mapping - */ - Map<String, Integer> getNodeCount(); - - /** * Get the SCM RPC server port that used to listen to datanode requests. * @return SCM datanode RPC server port */ http://git-wip-us.apache.org/repos/asf/hadoop/blob/218f6f61/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/StorageContainerManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/StorageContainerManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/StorageContainerManager.java index 719d642..b6c1f49 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/StorageContainerManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/StorageContainerManager.java @@ -800,15 +800,6 @@ public class StorageContainerManager extends ServiceRuntimeInfoImpl return scmNodeManager.getNodeCount(nodestate); } - @Override - public Map<String, Integer> getNodeCount() { - Map<String, Integer> countMap = new HashMap<String, Integer>(); - for (NodeState state : NodeState.values()) { - countMap.put(state.toString(), scmNodeManager.getNodeCount(state)); - } - return countMap; - } - /** * Returns node manager. * @return - Node Manager http://git-wip-us.apache.org/repos/asf/hadoop/blob/218f6f61/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java index db0a459..5c065db 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMMXBean.java @@ -90,10 +90,6 @@ public class TestSCMMXBean { String clientRpcPort = (String)mbs.getAttribute(bean, "ClientRpcPort"); assertEquals(scm.getClientRpcPort(), clientRpcPort); - - TabularData nodeCountObj = (TabularData)mbs.getAttribute(bean, - "NodeCount"); - verifyEquals(nodeCountObj, scm.getNodeCount()); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
