HDDS-12249. Share cluster in reconfiguration tests

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/reconfig/ReconfigurationTestBase.java

@@ -18,11 +18,9 @@
 
 package org.apache.hadoop.ozone.reconfig;
 
-import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.conf.ReconfigurationHandler;
-import org.apache.hadoop.ozone.MiniOzoneCluster;
 import org.apache.hadoop.security.UserGroupInformation;
-import org.junit.jupiter.api.AfterAll;
+import org.apache.ozone.test.NonHATests;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.Timeout;
@@ -40,32 +38,17 @@
  */
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Timeout(300)
-abstract class ReconfigurationTestBase {
+abstract class ReconfigurationTestBase implements NonHATests.TestCase {
 
-  private MiniOzoneCluster cluster;
   private String currentUser;
 
   @BeforeAll
   void setup() throws Exception {
-    cluster = MiniOzoneCluster.newBuilder(new OzoneConfiguration())
-        .build();
-    cluster.waitForClusterToBeReady();
     currentUser = UserGroupInformation.getCurrentUser().getShortUserName();
   }
 
-  @AfterAll
-  void shutdown() {
-    if (cluster != null) {
-      cluster.shutdown();
-    }
-  }
-
   abstract ReconfigurationHandler getSubject();
 
-  MiniOzoneCluster getCluster() {
-    return cluster;
-  }
-
   String getCurrentUser() {
     return currentUser;
   }

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/reconfig/TestDatanodeReconfiguration.java

@@ -39,7 +39,7 @@
 /**
  * Tests for Datanode reconfiguration.
  */
-class TestDatanodeReconfiguration extends ReconfigurationTestBase {
+public abstract class TestDatanodeReconfiguration extends ReconfigurationTestBase {
   @Override
   ReconfigurationHandler getSubject() {
     return getFirstDatanode().getReconfigurationHandler();
@@ -108,7 +108,7 @@ void replicationStreamsLimit(int delta) throws ReconfigurationException {
   }
 
   private HddsDatanodeService getFirstDatanode() {
-    return getCluster().getHddsDatanodes().get(0);
+    return cluster().getHddsDatanodes().get(0);
   }
 
 }

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/reconfig/TestOmReconfiguration.java

@@ -36,11 +36,11 @@
 /**
  * Tests for OM reconfiguration.
  */
-class TestOmReconfiguration extends ReconfigurationTestBase {
+public abstract class TestOmReconfiguration extends ReconfigurationTestBase {
 
   @Override
   ReconfigurationHandler getSubject() {
-    return getCluster().getOzoneManager().getReconfigurationHandler();
+    return cluster().getOzoneManager().getReconfigurationHandler();
   }
 
   @Test
@@ -59,7 +59,7 @@ void adminUsernames() throws ReconfigurationException {
 
     assertEquals(
         ImmutableSet.of(newValue, getCurrentUser()),
-        getCluster().getOzoneManager().getOmAdminUsernames());
+        cluster().getOzoneManager().getOmAdminUsernames());
   }
 
   @Test
@@ -71,37 +71,37 @@ void readOnlyAdmins() throws ReconfigurationException {
 
     assertEquals(
         ImmutableSet.of(newValue),
-        getCluster().getOzoneManager().getOmReadOnlyAdminUsernames());
+        cluster().getOzoneManager().getOmReadOnlyAdminUsernames());
   }
 
   @Test
   public void keyDeletingLimitPerTask() throws ReconfigurationException {
-    int originLimit = getCluster().getOzoneManager()
+    int originLimit = cluster().getOzoneManager()
         .getKeyManager().getDeletingService().getKeyLimitPerTask();
 
     getSubject().reconfigurePropertyImpl(OZONE_KEY_DELETING_LIMIT_PER_TASK,
         String.valueOf(originLimit + 1));
 
-    assertEquals(originLimit + 1, getCluster().getOzoneManager()
+    assertEquals(originLimit + 1, cluster().getOzoneManager()
         .getKeyManager().getDeletingService().getKeyLimitPerTask());
   }
 
   @Test
   void allowListAllVolumes() throws ReconfigurationException {
-    final boolean newValue = !getCluster().getOzoneManager().getAllowListAllVolumes();
+    final boolean newValue = !cluster().getOzoneManager().getAllowListAllVolumes();
 
     getSubject().reconfigurePropertyImpl(OZONE_OM_VOLUME_LISTALL_ALLOWED,
         String.valueOf(newValue));
 
-    assertEquals(newValue, getCluster().getOzoneManager().getAllowListAllVolumes());
+    assertEquals(newValue, cluster().getOzoneManager().getAllowListAllVolumes());
   }
 
   @ParameterizedTest
   @ValueSource(strings = {"", "invalid"})
   void unsetAllowListAllVolumes(String newValue) throws ReconfigurationException {
     getSubject().reconfigurePropertyImpl(OZONE_OM_VOLUME_LISTALL_ALLOWED, newValue);
 
-    assertEquals(OZONE_OM_VOLUME_LISTALL_ALLOWED_DEFAULT, getCluster().getOzoneManager().getAllowListAllVolumes());
+    assertEquals(OZONE_OM_VOLUME_LISTALL_ALLOWED_DEFAULT, cluster().getOzoneManager().getAllowListAllVolumes());
   }
 
 }

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/reconfig/TestScmReconfiguration.java

@@ -38,11 +38,11 @@
 /**
  * Tests for SCM reconfiguration.
  */
-class TestScmReconfiguration extends ReconfigurationTestBase {
+public abstract class TestScmReconfiguration extends ReconfigurationTestBase {
 
   @Override
   ReconfigurationHandler getSubject() {
-    return getCluster().getStorageContainerManager()
+    return cluster().getStorageContainerManager()
         .getReconfigurationHandler();
   }
 
@@ -69,7 +69,7 @@ void adminUsernames() throws ReconfigurationException {
 
     assertEquals(
         ImmutableSet.of(newValue, getCurrentUser()),
-        getCluster().getStorageContainerManager().getScmAdminUsernames());
+        cluster().getStorageContainerManager().getScmAdminUsernames());
   }
 
   @Test
@@ -81,7 +81,7 @@ void readOnlyAdminUsernames() throws ReconfigurationException {
 
     assertEquals(
         ImmutableSet.of(newValue),
-        getCluster().getStorageContainerManager()
+        cluster().getStorageContainerManager()
             .getScmReadOnlyAdminUsernames());
   }
 
@@ -97,14 +97,14 @@ void replicationInterval() throws ReconfigurationException {
   }
 
   private ReplicationManagerConfiguration replicationManagerConfig() {
-    return getCluster().getStorageContainerManager().getReplicationManager()
+    return cluster().getStorageContainerManager().getReplicationManager()
         .getConfig();
   }
 
   @Test
   void blockDeletionPerInterval() throws ReconfigurationException {
     SCMBlockDeletingService blockDeletingService =
-        getCluster().getStorageContainerManager().getScmBlockManager()
+        cluster().getStorageContainerManager().getScmBlockManager()
         .getSCMBlockDeletingService();
     int blockDeleteTXNum = blockDeletingService.getBlockDeleteTXNum();
     int newValue = blockDeleteTXNum + 1;

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

@@ -186,4 +186,28 @@ public MiniOzoneCluster cluster() {
     }
   }
 
+  @Nested
+  class DatanodeReconfiguration extends org.apache.hadoop.ozone.reconfig.TestDatanodeReconfiguration {
+    @Override
+    public MiniOzoneCluster cluster() {
+      return getCluster();
+    }
+  }
+
+  @Nested
+  class OmReconfiguration extends org.apache.hadoop.ozone.reconfig.TestOmReconfiguration {
+    @Override
+    public MiniOzoneCluster cluster() {
+      return getCluster();
+    }
+  }
+
+  @Nested
+  class ScmReconfiguration extends org.apache.hadoop.ozone.reconfig.TestScmReconfiguration {
+    @Override
+    public MiniOzoneCluster cluster() {
+      return getCluster();
+    }
+  }
+
 }