HDDS-4951. Return with exit code 0 in case of optional scm bootstrap/init (#2022)
Co-authored-by: Doroszlai, Attila <adoroszlai@apache.org>
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index d7bb0bc..3e9e709 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -750,7 +750,7 @@
"SCM bootstrap command can only be executed in non-Primordial SCM "
+ "{}, self id {} "
+ "Ignoring it.", primordialSCM, selfNodeId);
- return false;
+ return true;
}
OzoneConfiguration config =
SCMHAUtils.removeSelfId(conf,
@@ -808,7 +808,7 @@
"SCM init command can only be executed in Primordial SCM {}, "
+ "self id {} "
+ "Ignoring it.", primordialSCM, selfNodeId);
- return false;
+ return true;
}
if (state != StorageState.INITIALIZED) {
try {
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestStorageContainerManagerHA.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestStorageContainerManagerHA.java
index 1a60067..591be84 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestStorageContainerManagerHA.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestStorageContainerManagerHA.java
@@ -220,12 +220,12 @@
scm1.getSCMNodeId());
conf2.set(ScmConfigKeys.OZONE_SCM_PRIMORDIAL_NODE_ID_KEY,
scm1.getSCMNodeId());
- Assert.assertFalse(StorageContainerManager.scmBootstrap(conf1));
+ Assert.assertTrue(StorageContainerManager.scmBootstrap(conf1));
scm1.getScmHAManager().shutdown();
Assert.assertTrue(
StorageContainerManager.scmInit(conf1, scm1.getClusterId()));
Assert.assertTrue(StorageContainerManager.scmBootstrap(conf2));
- Assert.assertFalse(
+ Assert.assertTrue(
StorageContainerManager.scmInit(conf2, scm2.getClusterId()));
}
}
