From b832e174b0ef617ca05b34dfdefd183584b622f0 Mon Sep 17 00:00:00 2001 From: Vivek Ratnavel Subramanian Date: Thu, 9 May 2019 17:11:09 -0700 Subject: [PATCH] HDDS-1474. "ozone.scm.datanode.id" config should take path for a dir and not a file (#809) --- .../apache/hadoop/hdds/scm/ScmConfigKeys.java | 7 +++---- .../org/apache/hadoop/ozone/OzoneConsts.java | 5 +++++ .../common/src/main/resources/ozone-default.xml | 2 +- .../apache/hadoop/hdds/scm/HddsServerUtil.java | 13 ++++++++----- .../hadoop/ozone/HddsDatanodeService.java | 14 ++++++++------ .../states/datanode/InitDatanodeState.java | 4 ++-- .../common/TestDatanodeStateMachine.java | 17 +++++++++-------- hadoop-hdds/docs/content/Settings.md | 6 +++--- .../src/main/compose/ozone-hdfs/docker-config | 2 +- .../src/main/compose/ozone-om-ha/docker-config | 2 +- .../src/main/compose/ozone-recon/docker-config | 2 +- .../dist/src/main/compose/ozone/docker-config | 2 +- .../main/compose/ozoneblockade/docker-config | 2 +- .../dist/src/main/compose/ozonefs/docker-config | 2 +- .../src/main/compose/ozoneperf/docker-config | 2 +- .../dist/src/main/compose/ozones3/docker-config | 2 +- .../src/main/compose/ozonescripts/docker-config | 2 +- .../main/compose/ozonesecure-mr/docker-config | 2 +- .../src/main/compose/ozonesecure/docker-config | 2 +- .../src/main/compose/ozonetrace/docker-config | 2 +- .../src/main/k8s/definitions/ozone/config.yaml | 3 ++- .../k8s/examples/minikube/config-configmap.yaml | 2 +- .../examples/ozone-dev/config-configmap.yaml | 2 +- .../k8s/examples/ozone/config-configmap.yaml | 2 +- 24 files changed, 56 insertions(+), 45 deletions(-) diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java index 7dfbc464f78..5cacc876d0b 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfigKeys.java @@ -296,11 +296,10 @@ public final class ScmConfigKeys { public static final int OZONE_SCM_DEFAULT_PORT = OZONE_SCM_DATANODE_PORT_DEFAULT; - // File Name and path where datanode ID is to written to. + // The path where datanode ID is to be written to. // if this value is not set then container startup will fail. - public static final String OZONE_SCM_DATANODE_ID = "ozone.scm.datanode.id"; - - public static final String OZONE_SCM_DATANODE_ID_PATH_DEFAULT = "datanode.id"; + public static final String OZONE_SCM_DATANODE_ID_DIR = + "ozone.scm.datanode.id.dir"; public static final String OZONE_SCM_DB_CACHE_SIZE_MB = "ozone.scm.db.cache.size.mb"; diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java index 3e15241e73c..ce1e97e34d9 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java @@ -195,6 +195,11 @@ public static Versioning getVersioning(boolean versioning) { public static final int INVALID_PORT = -1; + /** + * Default SCM Datanode ID file name. + */ + public static final String OZONE_SCM_DATANODE_ID_FILE_DEFAULT = "datanode.id"; + // The ServiceListJSONServlet context attribute where OzoneManager // instance gets stored. public static final String OM_CONTEXT_ATTRIBUTE = "ozone.om"; diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml b/hadoop-hdds/common/src/main/resources/ozone-default.xml index ddb97ddf23c..d43020e69ab 100644 --- a/hadoop-hdds/common/src/main/resources/ozone-default.xml +++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml @@ -883,7 +883,7 @@ - ozone.scm.datanode.id + ozone.scm.datanode.id.dir OZONE, MANAGEMENT The path that datanodes will use to store the datanode ID. diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/hdds/scm/HddsServerUtil.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/hdds/scm/HddsServerUtil.java index 9d1880c7d34..cddce03e072 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/hdds/scm/HddsServerUtil.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/hdds/scm/HddsServerUtil.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hdds.server.ServerUtils; import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.ozone.OzoneConfigKeys; +import org.apache.hadoop.ozone.OzoneConsts; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -380,8 +381,9 @@ public static String getDefaultRatisDirectory(Configuration conf) { * @return the path of datanode id as string */ public static String getDatanodeIdFilePath(Configuration conf) { - String dataNodeIDPath = conf.get(ScmConfigKeys.OZONE_SCM_DATANODE_ID); - if (dataNodeIDPath == null) { + String dataNodeIDDirPath = + conf.get(ScmConfigKeys.OZONE_SCM_DATANODE_ID_DIR); + if (dataNodeIDDirPath == null) { File metaDirPath = ServerUtils.getOzoneMetaDirPath(conf); if (metaDirPath == null) { // this means meta data is not found, in theory should not happen at @@ -389,9 +391,10 @@ public static String getDatanodeIdFilePath(Configuration conf) { throw new IllegalArgumentException("Unable to locate meta data" + "directory when getting datanode id path"); } - dataNodeIDPath = new File(metaDirPath, - ScmConfigKeys.OZONE_SCM_DATANODE_ID_PATH_DEFAULT).toString(); + dataNodeIDDirPath = metaDirPath.toString(); } - return dataNodeIDPath; + // Use default datanode id file name for file path + return new File(dataNodeIDDirPath, + OzoneConsts.OZONE_SCM_DATANODE_ID_FILE_DEFAULT).toString(); } } diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java index b41da8302aa..7cd4fd82c57 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java @@ -320,9 +320,10 @@ private DatanodeDetails initializeDatanodeDetails() throws IOException { String idFilePath = HddsServerUtil.getDatanodeIdFilePath(conf); if (idFilePath == null || idFilePath.isEmpty()) { - LOG.error("A valid file path is needed for config setting {}", - ScmConfigKeys.OZONE_SCM_DATANODE_ID); - throw new IllegalArgumentException(ScmConfigKeys.OZONE_SCM_DATANODE_ID + + LOG.error("A valid path is needed for config setting {}", + ScmConfigKeys.OZONE_SCM_DATANODE_ID_DIR); + throw new IllegalArgumentException( + ScmConfigKeys.OZONE_SCM_DATANODE_ID_DIR + " must be defined. See" + " https://wiki.apache.org/hadoop/Ozone#Configuration" + " for details on configuring Ozone."); @@ -350,9 +351,10 @@ private void persistDatanodeDetails(DatanodeDetails dnDetails) throws IOException { String idFilePath = HddsServerUtil.getDatanodeIdFilePath(conf); if (idFilePath == null || idFilePath.isEmpty()) { - LOG.error("A valid file path is needed for config setting {}", - ScmConfigKeys.OZONE_SCM_DATANODE_ID); - throw new IllegalArgumentException(ScmConfigKeys.OZONE_SCM_DATANODE_ID + + LOG.error("A valid path is needed for config setting {}", + ScmConfigKeys.OZONE_SCM_DATANODE_ID_DIR); + throw new IllegalArgumentException( + ScmConfigKeys.OZONE_SCM_DATANODE_ID_DIR + " must be defined. See" + " https://wiki.apache.org/hadoop/Ozone#Configuration" + " for details on configuring Ozone."); diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/datanode/InitDatanodeState.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/datanode/InitDatanodeState.java index 00e2bf0f94c..273886228f6 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/datanode/InitDatanodeState.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/datanode/InitDatanodeState.java @@ -119,8 +119,8 @@ public DatanodeStateMachine.DatanodeStates call() throws Exception { private void persistContainerDatanodeDetails() { String dataNodeIDPath = HddsServerUtil.getDatanodeIdFilePath(conf); if (Strings.isNullOrEmpty(dataNodeIDPath)) { - LOG.error("A valid file path is needed for config setting {}", - ScmConfigKeys.OZONE_SCM_DATANODE_ID); + LOG.error("A valid path is needed for config setting {}", + ScmConfigKeys.OZONE_SCM_DATANODE_ID_DIR); this.context.setState(DatanodeStateMachine.DatanodeStates.SHUTDOWN); return; } diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java index 9840f01bb34..0f3e7d12d22 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hdds.protocol.DatanodeDetails; import org.apache.hadoop.ipc.RPC; import org.apache.hadoop.ozone.OzoneConfigKeys; +import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.container.common.helpers.ContainerUtils; import org.apache.hadoop.ozone.container.common.statemachine .DatanodeStateMachine; @@ -49,7 +50,6 @@ import java.io.File; import java.io.IOException; import java.net.InetSocketAddress; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -117,9 +117,8 @@ public void setUp() throws Exception { } conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, new File(testRoot, "scm").getAbsolutePath()); - path = Paths.get(path.toString(), - TestDatanodeStateMachine.class.getSimpleName() + ".id").toString(); - conf.set(ScmConfigKeys.OZONE_SCM_DATANODE_ID, path); + path = new File(testRoot, "datanodeID").getAbsolutePath(); + conf.set(ScmConfigKeys.OZONE_SCM_DATANODE_ID_DIR, path); executorService = HadoopExecutors.newCachedThreadPool( new ThreadFactoryBuilder().setDaemon(true) .setNameFormat("Test Data Node State Machine Thread - %d").build()); @@ -212,7 +211,8 @@ public void testDatanodeStateContext() throws IOException, // There is no mini cluster started in this test, // create a ID file so that state machine could load a fake datanode ID. File idPath = new File( - conf.get(ScmConfigKeys.OZONE_SCM_DATANODE_ID)); + conf.get(ScmConfigKeys.OZONE_SCM_DATANODE_ID_DIR), + OzoneConsts.OZONE_SCM_DATANODE_ID_FILE_DEFAULT); idPath.delete(); DatanodeDetails datanodeDetails = getNewDatanodeDetails(); DatanodeDetails.Port port = DatanodeDetails.newPort( @@ -334,7 +334,8 @@ public void testDatanodeStateContext() throws IOException, public void testDatanodeStateMachineWithIdWriteFail() throws Exception { File idPath = new File( - conf.get(ScmConfigKeys.OZONE_SCM_DATANODE_ID)); + conf.get(ScmConfigKeys.OZONE_SCM_DATANODE_ID_DIR), + OzoneConsts.OZONE_SCM_DATANODE_ID_FILE_DEFAULT); idPath.delete(); DatanodeDetails datanodeDetails = getNewDatanodeDetails(); DatanodeDetails.Port port = DatanodeDetails.newPort( @@ -396,10 +397,10 @@ public void testDatanodeStateMachineWithInvalidConfiguration() /** Port out of range **/ confList.add(Maps.immutableEntry( ScmConfigKeys.OZONE_SCM_NAMES, "scm:123456")); - // Invalid ozone.scm.datanode.id + // Invalid ozone.scm.datanode.id.dir /** Empty **/ confList.add(Maps.immutableEntry( - ScmConfigKeys.OZONE_SCM_DATANODE_ID, "")); + ScmConfigKeys.OZONE_SCM_DATANODE_ID_DIR, "")); confList.forEach((entry) -> { Configuration perTestConf = new Configuration(conf); diff --git a/hadoop-hdds/docs/content/Settings.md b/hadoop-hdds/docs/content/Settings.md index c5d01df11cd..32a5884daa5 100644 --- a/hadoop-hdds/docs/content/Settings.md +++ b/hadoop-hdds/docs/content/Settings.md @@ -105,14 +105,14 @@ Here is an example, {{< /highlight >}} - * **ozone.scm.datanode.id** Data nodes generate a Unique ID called Datanode - ID. This identity is written to the file specified by this path. *Data nodes + * **ozone.scm.datanode.id.dir** Data nodes generate a Unique ID called Datanode + ID. This identity is written to the file datanode.id in a directory specified by this path. *Data nodes will create this path if it doesn't exist already.* Here is an example, {{< highlight xml >}} - ozone.scm.datanode.id + ozone.scm.datanode.id.dir /data/disk1/meta/node/datanode.id {{< /highlight >}} diff --git a/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-config b/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-config index 4fdb0cbf17f..3232a105f96 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozone-hdfs/docker-config @@ -18,7 +18,7 @@ OZONE-SITE.XML_ozone.om.address=om OZONE-SITE.XML_ozone.om.http-address=om:9874 OZONE-SITE.XML_ozone.scm.names=scm OZONE-SITE.XML_ozone.enabled=true -OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id +OZONE-SITE.XML_ozone.scm.datanode.id.dir=/data OZONE-SITE.XML_ozone.scm.block.client.address=scm OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata OZONE-SITE.XML_ozone.scm.client.address=scm diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-config b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-config index ddba89a48f9..6bebfdf8686 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozone-om-ha/docker-config @@ -21,7 +21,7 @@ OZONE-SITE.XML_ozone.om.address.om3=om3 OZONE-SITE.XML_ozone.om.ratis.enable=true OZONE-SITE.XML_ozone.scm.names=scm OZONE-SITE.XML_ozone.enabled=True -OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id +OZONE-SITE.XML_ozone.scm.datanode.id.dir=/data OZONE-SITE.XML_ozone.scm.block.client.address=scm OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata OZONE-SITE.XML_ozone.handler.type=distributed diff --git a/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-config b/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-config index 9813ac46185..e45353b7860 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozone-recon/docker-config @@ -18,7 +18,7 @@ OZONE-SITE.XML_ozone.om.address=om OZONE-SITE.XML_ozone.om.http-address=om:9874 OZONE-SITE.XML_ozone.scm.names=scm OZONE-SITE.XML_ozone.enabled=True -OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id +OZONE-SITE.XML_ozone.scm.datanode.id.dir=/data OZONE-SITE.XML_ozone.scm.block.client.address=scm OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata OZONE-SITE.XML_ozone.recon.db.dir=/data/metadata/recon diff --git a/hadoop-ozone/dist/src/main/compose/ozone/docker-config b/hadoop-ozone/dist/src/main/compose/ozone/docker-config index 6165499bb40..c7a1647774f 100644 --- a/hadoop-ozone/dist/src/main/compose/ozone/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozone/docker-config @@ -18,7 +18,7 @@ OZONE-SITE.XML_ozone.om.address=om OZONE-SITE.XML_ozone.om.http-address=om:9874 OZONE-SITE.XML_ozone.scm.names=scm OZONE-SITE.XML_ozone.enabled=True -OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id +OZONE-SITE.XML_ozone.scm.datanode.id.dir=/data OZONE-SITE.XML_ozone.scm.block.client.address=scm OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata OZONE-SITE.XML_ozone.handler.type=distributed diff --git a/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-config b/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-config index 3ab0c6ab46f..dae9ddb44c6 100644 --- a/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozoneblockade/docker-config @@ -18,7 +18,7 @@ OZONE-SITE.XML_ozone.om.address=om OZONE-SITE.XML_ozone.om.http-address=om:9874 OZONE-SITE.XML_ozone.scm.names=scm OZONE-SITE.XML_ozone.enabled=True -OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id +OZONE-SITE.XML_ozone.scm.datanode.id.dir=/data OZONE-SITE.XML_ozone.scm.block.client.address=scm OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata OZONE-SITE.XML_ozone.handler.type=distributed diff --git a/hadoop-ozone/dist/src/main/compose/ozonefs/docker-config b/hadoop-ozone/dist/src/main/compose/ozonefs/docker-config index 7c5e43df2c4..5da65050d01 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonefs/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozonefs/docker-config @@ -19,7 +19,7 @@ OZONE-SITE.XML_ozone.om.address=om OZONE-SITE.XML_ozone.om.http-address=om:9874 OZONE-SITE.XML_ozone.scm.names=scm OZONE-SITE.XML_ozone.enabled=True -OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id +OZONE-SITE.XML_ozone.scm.datanode.id.dir=/data OZONE-SITE.XML_ozone.scm.block.client.address=scm OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata OZONE-SITE.XML_ozone.handler.type=distributed diff --git a/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-config b/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-config index a60b72e39e1..eb23aad0cc6 100644 --- a/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-config @@ -18,7 +18,7 @@ OZONE-SITE.XML_ozone.om.address=om OZONE-SITE.XML_ozone.om.http-address=om:9874 OZONE-SITE.XML_ozone.scm.names=scm OZONE-SITE.XML_ozone.enabled=true -OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id +OZONE-SITE.XML_ozone.scm.datanode.id.dir=/data OZONE-SITE.XML_ozone.scm.block.client.address=scm OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata OZONE-SITE.XML_ozone.scm.client.address=scm diff --git a/hadoop-ozone/dist/src/main/compose/ozones3/docker-config b/hadoop-ozone/dist/src/main/compose/ozones3/docker-config index 22436a4d02a..4ffe9a6674c 100644 --- a/hadoop-ozone/dist/src/main/compose/ozones3/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozones3/docker-config @@ -17,7 +17,7 @@ OZONE-SITE.XML_ozone.om.address=om OZONE-SITE.XML_ozone.scm.names=scm OZONE-SITE.XML_ozone.enabled=true -OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id +OZONE-SITE.XML_ozone.scm.datanode.id.dir=/data OZONE-SITE.XML_ozone.scm.block.client.address=scm OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata OZONE-SITE.XML_ozone.scm.client.address=scm diff --git a/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-config b/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-config index cde284623ea..3c99cd7afb6 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozonescripts/docker-config @@ -19,7 +19,7 @@ CORE-SITE.XML_fs.defaultFS=hdfs://namenode:9000 OZONE-SITE.XML_ozone.ksm.address=ksm OZONE-SITE.XML_ozone.scm.names=scm OZONE-SITE.XML_ozone.enabled=true -OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id +OZONE-SITE.XML_ozone.scm.datanode.id.dir=/data OZONE-SITE.XML_ozone.om.address=om OZONE-SITE.XML_ozone.om.http-address=om:9874 OZONE-SITE.XML_ozone.scm.block.client.address=scm diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config index 95c280bf050..d17ae035f82 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/docker-config @@ -18,7 +18,7 @@ OZONE-SITE.XML_ozone.om.address=om OZONE-SITE.XML_ozone.om.http-address=om:9874 OZONE-SITE.XML_ozone.scm.names=scm OZONE-SITE.XML_ozone.enabled=True -OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id +OZONE-SITE.XML_ozone.scm.datanode.id.dir=/data OZONE-SITE.XML_ozone.scm.block.client.address=scm OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata OZONE-SITE.XML_ozone.handler.type=distributed diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config index b0c5c4a26c2..bf37292512b 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/docker-config @@ -20,7 +20,7 @@ OZONE-SITE.XML_ozone.om.address=om OZONE-SITE.XML_ozone.om.http-address=om:9874 OZONE-SITE.XML_ozone.scm.names=scm OZONE-SITE.XML_ozone.enabled=True -OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id +OZONE-SITE.XML_ozone.scm.datanode.id.dir=/data OZONE-SITE.XML_ozone.scm.block.client.address=scm OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata OZONE-SITE.XML_ozone.handler.type=distributed diff --git a/hadoop-ozone/dist/src/main/compose/ozonetrace/docker-config b/hadoop-ozone/dist/src/main/compose/ozonetrace/docker-config index d69ad4d8fa9..59747f7654d 100644 --- a/hadoop-ozone/dist/src/main/compose/ozonetrace/docker-config +++ b/hadoop-ozone/dist/src/main/compose/ozonetrace/docker-config @@ -17,7 +17,7 @@ OZONE-SITE.XML_ozone.om.address=om OZONE-SITE.XML_ozone.scm.names=scm OZONE-SITE.XML_ozone.enabled=true -OZONE-SITE.XML_ozone.scm.datanode.id=/data/datanode.id +OZONE-SITE.XML_ozone.scm.datanode.id.dir=/data OZONE-SITE.XML_ozone.scm.block.client.address=scm OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata OZONE-SITE.XML_ozone.scm.client.address=scm diff --git a/hadoop-ozone/dist/src/main/k8s/definitions/ozone/config.yaml b/hadoop-ozone/dist/src/main/k8s/definitions/ozone/config.yaml index f98f7f53726..5f5e70b5cdf 100644 --- a/hadoop-ozone/dist/src/main/k8s/definitions/ozone/config.yaml +++ b/hadoop-ozone/dist/src/main/k8s/definitions/ozone/config.yaml @@ -18,8 +18,9 @@ kind: ConfigMap metadata: name: config data: + OZONE-SITE.XML_hdds.datanode.dir: "/data/storage" - OZONE-SITE.XML_ozone.scm.datanode.id: "/data/datanode.id" + OZONE-SITE.XML_ozone.scm.datanode.id.dir: "/data" OZONE-SITE.XML_ozone.metadata.dirs: "/data/metadata" OZONE-SITE.XML_ozone.scm.block.client.address: "scm-0.scm" OZONE-SITE.XML_ozone.om.address: "om-0.om" diff --git a/hadoop-ozone/dist/src/main/k8s/examples/minikube/config-configmap.yaml b/hadoop-ozone/dist/src/main/k8s/examples/minikube/config-configmap.yaml index 427b977daa6..94d16d2f74d 100644 --- a/hadoop-ozone/dist/src/main/k8s/examples/minikube/config-configmap.yaml +++ b/hadoop-ozone/dist/src/main/k8s/examples/minikube/config-configmap.yaml @@ -20,7 +20,7 @@ metadata: name: config data: OZONE-SITE.XML_hdds.datanode.dir: /data/storage - OZONE-SITE.XML_ozone.scm.datanode.id: /data/datanode.id + OZONE-SITE.XML_ozone.scm.datanode.id.dir: /data OZONE-SITE.XML_ozone.metadata.dirs: /data/metadata OZONE-SITE.XML_ozone.scm.block.client.address: scm-0.scm OZONE-SITE.XML_ozone.om.address: om-0.om diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/config-configmap.yaml b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/config-configmap.yaml index 605f111f0b1..96d011c67cc 100644 --- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/config-configmap.yaml +++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/config-configmap.yaml @@ -20,7 +20,7 @@ metadata: name: config data: OZONE-SITE.XML_hdds.datanode.dir: /data/storage - OZONE-SITE.XML_ozone.scm.datanode.id: /data/datanode.id + OZONE-SITE.XML_ozone.scm.datanode.id.dir: /data OZONE-SITE.XML_ozone.metadata.dirs: /data/metadata OZONE-SITE.XML_ozone.scm.block.client.address: scm-0.scm OZONE-SITE.XML_ozone.om.address: om-0.om diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone/config-configmap.yaml b/hadoop-ozone/dist/src/main/k8s/examples/ozone/config-configmap.yaml index 427b977daa6..94d16d2f74d 100644 --- a/hadoop-ozone/dist/src/main/k8s/examples/ozone/config-configmap.yaml +++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/config-configmap.yaml @@ -20,7 +20,7 @@ metadata: name: config data: OZONE-SITE.XML_hdds.datanode.dir: /data/storage - OZONE-SITE.XML_ozone.scm.datanode.id: /data/datanode.id + OZONE-SITE.XML_ozone.scm.datanode.id.dir: /data OZONE-SITE.XML_ozone.metadata.dirs: /data/metadata OZONE-SITE.XML_ozone.scm.block.client.address: scm-0.scm OZONE-SITE.XML_ozone.om.address: om-0.om