HDDS-6114. Intermittent error due to Failed to init RocksDB

hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java

@@ -20,7 +20,6 @@
 
 import java.io.IOException;
 import java.time.Duration;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -102,15 +101,13 @@ public static FailureService of(String serviceName) {
 
   @SuppressWarnings("parameternumber")
   public MiniOzoneChaosCluster(OzoneConfiguration conf,
-      List<OzoneManager> ozoneManagers, List<StorageContainerManager> scms,
-      List<HddsDatanodeService> hddsDatanodes, String omServiceID,
-      String scmServiceId, String clusterPath,
+      OMHAService omService, SCMHAService scmService,
+      List<HddsDatanodeService> hddsDatanodes, String clusterPath,
       Set<Class<? extends Failures>> clazzes) {
-    super(conf, ozoneManagers, scms, hddsDatanodes, omServiceID, scmServiceId,
-        clusterPath);
+    super(conf, omService, scmService, hddsDatanodes, clusterPath, null);
     this.numDatanodes = getHddsDatanodes().size();
-    this.numOzoneManagers = ozoneManagers.size();
-    this.numStorageContainerManagers = scms.size();
+    this.numOzoneManagers = omService.getServices().size();
+    this.numStorageContainerManagers = scmService.getServices().size();
 
     this.failedOmSet = new HashSet<>();
     this.failedDnSet = new HashSet<>();
@@ -304,33 +301,21 @@ public MiniOzoneChaosCluster build() throws IOException {
         initOMRatisConf();
       }
 
-      List<OzoneManager> omList;
-      List<StorageContainerManager> scmList;
+      SCMHAService scmService;
+      OMHAService omService;
       try {
-        if (numOfSCMs > 1) {
-          scmList = createSCMService();
-        } else {
-          StorageContainerManager scm = createSCM();
-          scm.start();
-          scmList = Arrays.asList(scm);
-        }
-        if (numOfOMs > 1) {
-          omList = createOMService();
-        } else {
-          OzoneManager om = createOM();
-          om.start();
-          omList = Arrays.asList(om);
-        }
+        scmService = createSCMService();
+        omService = createOMService();
       } catch (AuthenticationException ex) {
         throw new IOException("Unable to build MiniOzoneCluster. ", ex);
       }
 
       final List<HddsDatanodeService> hddsDatanodes = createHddsDatanodes(
-          scmList, null);
+          scmService.getActiveServices(), null);
 
       MiniOzoneChaosCluster cluster =
-          new MiniOzoneChaosCluster(conf, omList, scmList, hddsDatanodes,
-              omServiceId, scmServiceId, path, clazzes);
+          new MiniOzoneChaosCluster(conf, omService, scmService, hddsDatanodes,
+              path, clazzes);
 
       if (startDataNodes) {
         cluster.startHddsDatanodes();

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsHAURLs.java

@@ -26,7 +26,7 @@
 import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.scm.ScmConfigKeys;
 import org.apache.hadoop.ozone.MiniOzoneCluster;
-import org.apache.hadoop.ozone.MiniOzoneOMHAClusterImpl;
+import org.apache.hadoop.ozone.MiniOzoneHAClusterImpl;
 import org.apache.hadoop.ozone.OzoneConsts;
 import org.apache.hadoop.ozone.client.ObjectStore;
 import org.apache.hadoop.ozone.client.OzoneClientFactory;
@@ -167,7 +167,7 @@ public static void shutdown() {
    * @return the leader OM's RPC address in the MiniOzoneHACluster
    */
   private String getLeaderOMNodeAddr() {
-    MiniOzoneOMHAClusterImpl haCluster = (MiniOzoneOMHAClusterImpl) cluster;
+    MiniOzoneHAClusterImpl haCluster = (MiniOzoneHAClusterImpl) cluster;
     OzoneManager omLeader = haCluster.getOMLeader();
     Assert.assertNotNull("There should be a leader OM at this point.",
         omLeader);

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java

@@ -63,7 +63,7 @@ static Builder newBuilder(OzoneConfiguration conf) {
    * @return MiniOzoneCluster builder
    */
   static Builder newOMHABuilder(OzoneConfiguration conf) {
-    return new MiniOzoneOMHAClusterImpl.Builder(conf);
+    return new MiniOzoneHAClusterImpl.Builder(conf);
   }
 
   static Builder newHABuilder(OzoneConfiguration conf) {

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java

@@ -152,22 +152,6 @@ protected MiniOzoneClusterImpl(OzoneConfiguration conf,
     this.reconServer = reconServer;
   }
 
-  /**
-   * Creates a new MiniOzoneCluster without the OzoneManager. This is used by
-   * {@link MiniOzoneOMHAClusterImpl} for starting multiple OzoneManagers.
-   *
-   * @param conf
-   * @param scm
-   * @param hddsDatanodes
-   */
-  MiniOzoneClusterImpl(OzoneConfiguration conf, StorageContainerManager scm,
-      List<HddsDatanodeService> hddsDatanodes, ReconServer reconServer) {
-    this.conf = conf;
-    this.scm = scm;
-    this.hddsDatanodes = hddsDatanodes;
-    this.reconServer = reconServer;
-  }
-
   /**
    * Creates a new MiniOzoneCluster without the OzoneManager and
    * StorageContainerManager. This is used by