Skip to content

HDDS-4538: Workaround on HDDS-2823, hard code scmUuid and clusterID #1649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nandakumar131 merged 1 commit into from
Dec 2, 2020
Merged

HDDS-4538: Workaround on HDDS-2823, hard code scmUuid and clusterID #1649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/StorageInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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";
}

}
7 changes: 5 additions & 2 deletions hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMStorageConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down