Repository: hadoop Updated Branches: refs/heads/HDFS-7240 76b8ba737 -> 8f7f4aa80
HDFS-12876. Ozone: moving NodeType from OzoneConsts to Ozone.proto. Contributed by Nanda kumar. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8f7f4aa8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8f7f4aa8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8f7f4aa8 Branch: refs/heads/HDFS-7240 Commit: 8f7f4aa80060bc185163a07735ae35c49f220a16 Parents: 76b8ba7 Author: Nanda kumar <[email protected]> Authored: Fri Dec 1 19:53:39 2017 +0530 Committer: Nanda kumar <[email protected]> Committed: Fri Dec 1 19:53:39 2017 +0530 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/ozone/OzoneConsts.java | 9 --------- .../hadoop-hdfs-client/src/main/proto/Ozone.proto | 10 ++++++++++ .../main/java/org/apache/hadoop/ozone/common/Storage.java | 2 +- .../java/org/apache/hadoop/ozone/common/StorageInfo.java | 2 +- .../main/java/org/apache/hadoop/ozone/scm/SCMStorage.java | 2 +- .../apache/hadoop/ozone/TestStorageContainerManager.java | 7 ++++--- 6 files changed, 17 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/8f7f4aa8/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java index 15c4d4c..6c2966c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java @@ -147,15 +147,6 @@ public final class OzoneConsts { public static final int INVALID_PORT = -1; - /** - * Type of the node. - */ - public enum NodeType { - KSM, - SCM, - DATANODE - } - private OzoneConsts() { // Never Constructed } http://git-wip-us.apache.org/repos/asf/hadoop/blob/8f7f4aa8/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/Ozone.proto ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/Ozone.proto b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/Ozone.proto index e2f42cc..29bc284 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/Ozone.proto +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/Ozone.proto @@ -47,6 +47,16 @@ message KeyValue { } /** + * Type of the node. + */ +enum NodeType { + KSM = 1; + SCM = 2; + DATANODE = 3; +} + +// Should we rename NodeState to DatanodeState? +/** * Enum that represents the Node State. This is used in calls to getNodeList * and getNodeCount. */ http://git-wip-us.apache.org/repos/asf/hadoop/blob/8f7f4aa8/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/common/Storage.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/common/Storage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/common/Storage.java index eb02be6..9e9f48c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/common/Storage.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/common/Storage.java @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.fs.FileUtil; -import org.apache.hadoop.ozone.OzoneConsts.NodeType; +import org.apache.hadoop.ozone.protocol.proto.OzoneProtos.NodeType; import org.apache.hadoop.util.Time; /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/8f7f4aa8/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/common/StorageInfo.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/common/StorageInfo.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/common/StorageInfo.java index e7c2c35..82ad955 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/common/StorageInfo.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/common/StorageInfo.java @@ -28,7 +28,7 @@ import java.util.UUID; import com.google.common.base.Preconditions; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.ozone.OzoneConsts.NodeType; +import org.apache.hadoop.ozone.protocol.proto.OzoneProtos.NodeType; /** * Common class for storage information. This class defines the common http://git-wip-us.apache.org/repos/asf/hadoop/blob/8f7f4aa8/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/SCMStorage.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/SCMStorage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/SCMStorage.java index 88835b5..b3627bd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/SCMStorage.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/scm/SCMStorage.java @@ -20,7 +20,7 @@ package org.apache.hadoop.ozone.scm; import org.apache.hadoop.conf.OzoneConfiguration; import org.apache.hadoop.ozone.common.Storage; -import org.apache.hadoop.ozone.OzoneConsts.NodeType; +import org.apache.hadoop.ozone.protocol.proto.OzoneProtos.NodeType; import org.apache.hadoop.ozone.web.utils.OzoneUtils; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/hadoop/blob/8f7f4aa8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java index 3588187..2dd9fbb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/TestStorageContainerManager.java @@ -25,6 +25,7 @@ import org.apache.hadoop.conf.OzoneConfiguration; import org.apache.hadoop.ozone.protocol.commands.DeleteBlocksCommand; import org.apache.hadoop.ozone.protocol.commands.SCMCommand; import org.apache.hadoop.ozone.protocol.proto.OzoneProtos; +import org.apache.hadoop.ozone.protocol.proto.OzoneProtos.NodeType; import org.apache.hadoop.ozone.protocol.proto.OzoneProtos.NodeState; import org.apache.hadoop.ozone.protocol.proto.StorageContainerDatanodeProtocolProtos.DeletedBlocksTransaction; import org.apache.hadoop.ozone.protocol.proto.StorageContainerDatanodeProtocolProtos.ReportState; @@ -371,11 +372,11 @@ public class TestStorageContainerManager { StorageContainerManager.scmInit(conf); SCMStorage scmStore = new SCMStorage(conf); - Assert.assertEquals(OzoneConsts.NodeType.SCM, scmStore.getNodeType()); + Assert.assertEquals(NodeType.SCM, scmStore.getNodeType()); Assert.assertEquals("testClusterId", scmStore.getClusterID()); StartupOption.INIT.setClusterId("testClusterIdNew"); StorageContainerManager.scmInit(conf); - Assert.assertEquals(OzoneConsts.NodeType.SCM, scmStore.getNodeType()); + Assert.assertEquals(NodeType.SCM, scmStore.getNodeType()); Assert.assertEquals("testClusterId", scmStore.getClusterID()); } @@ -395,7 +396,7 @@ public class TestStorageContainerManager { // This will initialize SCM StorageContainerManager.scmInit(conf); SCMStorage scmStore = new SCMStorage(conf); - Assert.assertEquals(OzoneConsts.NodeType.SCM, scmStore.getNodeType()); + Assert.assertEquals(NodeType.SCM, scmStore.getNodeType()); Assert.assertNotEquals("testClusterId", scmStore.getClusterID()); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
