diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/StorageInfo.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/StorageInfo.java index 55911fcfd994..c88aaa9b25d5 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/StorageInfo.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/StorageInfo.java @@ -27,7 +27,6 @@ import java.io.IOException; import java.io.RandomAccessFile; import java.util.Properties; -import java.util.UUID; /** * Common class for storage information. This class defines the common @@ -198,7 +197,11 @@ private Properties readFrom(File from) throws IOException { * @return new clusterID */ public static String newClusterID() { - return "CID-" + UUID.randomUUID().toString(); + // TODO: + // Please check https://issues.apache.org/jira/browse/HDDS-4538 + // hard code clusterID and scmUuid on HDDS-2823, + // so that multi SCMs won't cause chaos in Datanode side. + return "CID-1df51ed9-19f1-4283-8f61-5d90a84c196c"; } } diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMStorageConfig.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMStorageConfig.java index a6282799cf55..fab33b575eeb 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMStorageConfig.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMStorageConfig.java @@ -25,7 +25,6 @@ import java.io.File; import java.io.IOException; import java.util.Properties; -import java.util.UUID; import static org.apache.hadoop.ozone.OzoneConsts.SCM_ID; import static org.apache.hadoop.ozone.OzoneConsts.STORAGE_DIR; @@ -69,7 +68,11 @@ public String getScmId() { protected Properties getNodeProperties() { String scmId = getScmId(); if (scmId == null) { - scmId = UUID.randomUUID().toString(); + // TODO: + // Please check https://issues.apache.org/jira/browse/HDDS-4538 + // hard code clusterID and scmUuid on HDDS-2823, + // so that multi SCMs won't cause chaos in Datanode side. + scmId = "3a11fedb-cce5-46ac-bb0d-cfdf17df9a19"; } Properties scmProperties = new Properties(); scmProperties.setProperty(SCM_ID, scmId);