This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 3116fa2 HDDS-5773. Avoid code duplication for mini cluster without
datanodes (#2669)
3116fa2 is described below
commit 3116fa2db9116fe8e8b83a70a4bf53873800310d
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue Sep 21 21:47:18 2021 +0200
HDDS-5773. Avoid code duplication for mini cluster without datanodes (#2669)
---
.../test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java | 12 ++++++++++++
.../test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java | 5 +----
.../hadoop/ozone/om/TestOzoneManagerConfiguration.java | 5 +----
.../apache/hadoop/ozone/om/TestOzoneManagerListVolumes.java | 9 +++------
.../hadoop/ozone/om/TestOzoneManagerRocksDBLogging.java | 4 +---
5 files changed, 18 insertions(+), 17 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
index 8e30540..9057920 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
@@ -25,6 +25,7 @@ import java.util.UUID;
import java.util.concurrent.TimeoutException;
import org.apache.hadoop.conf.StorageUnit;
+import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
@@ -360,6 +361,17 @@ public interface MiniOzoneCluster {
return this;
}
+ /**
+ * For tests that do not use any features of SCM, we can get by with
+ * 0 datanodes. Also need to skip safemode in this case.
+ * This allows the cluster to come up much faster.
+ */
+ public Builder withoutDatanodes() {
+ setNumDatanodes(0);
+ conf.setBoolean(HddsConfigKeys.HDDS_SCM_SAFEMODE_ENABLED, false);
+ return this;
+ }
+
public Builder setStartDataNodes(boolean nodes) {
this.startDataNodes = nodes;
return this;
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java
index 880b403..a5410d8 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmMetrics.java
@@ -82,10 +82,7 @@ public class TestOmMetrics {
conf = new OzoneConfiguration();
conf.setTimeDuration(OMConfigKeys.OZONE_OM_METRICS_SAVE_INTERVAL,
1000, TimeUnit.MILLISECONDS);
- // Most tests in this class do not use any features of SCM, so we can skip
- // safemode which gets the cluster to come up much faster.
- conf.setBoolean(HddsConfigKeys.HDDS_SCM_SAFEMODE_ENABLED, false);
- clusterBuilder = MiniOzoneCluster.newBuilder(conf).setNumDatanodes(0);
+ clusterBuilder = MiniOzoneCluster.newBuilder(conf).withoutDatanodes();
}
private void startCluster() throws Exception {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java
index 8181eea..36a17a8 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java
@@ -81,9 +81,6 @@ public class TestOzoneManagerConfiguration {
conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, true);
conf.setTimeDuration(OMConfigKeys.OZONE_OM_RATIS_MINIMUM_TIMEOUT_KEY,
RATIS_RPC_TIMEOUT, TimeUnit.MILLISECONDS);
- // These test do not use any features of SCM, so we can skip safemode
- // which gets the cluster to come up much faster.
- conf.setBoolean(HddsConfigKeys.HDDS_SCM_SAFEMODE_ENABLED, false);
OMStorage omStore = new OMStorage(conf);
omStore.setClusterId("testClusterId");
// writes the version file properties
@@ -102,7 +99,7 @@ public class TestOzoneManagerConfiguration {
.setClusterId(clusterId)
.setScmId(scmId)
.setOmId(omId)
- .setNumDatanodes(0)
+ .withoutDatanodes()
.build();
cluster.waitForClusterToBeReady();
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerListVolumes.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerListVolumes.java
index a2da99d..33d3f12 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerListVolumes.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerListVolumes.java
@@ -27,7 +27,6 @@ import java.util.Set;
import java.util.UUID;
import java.util.concurrent.TimeoutException;
-import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.OzoneAcl;
@@ -98,13 +97,11 @@ public class TestOzoneManagerListVolumes {
// Use native impl here, default impl doesn't do actual checks
conf.set(OZONE_ACL_AUTHORIZER_CLASS, OZONE_ACL_AUTHORIZER_CLASS_NATIVE);
- // These test do not use any features of SCM, so we can skip safemode
- // which gets the cluster to come up much faster.
- conf.setBoolean(HddsConfigKeys.HDDS_SCM_SAFEMODE_ENABLED, false);
cluster = MiniOzoneCluster.newBuilder(conf)
- .setClusterId(clusterId).setScmId(scmId).setOmId(omId).
- setNumDatanodes(0).build();
+ .withoutDatanodes()
+ .setClusterId(clusterId).setScmId(scmId).setOmId(omId)
+ .build();
cluster.waitForClusterToBeReady();
// Create volumes with non-default owners and ACLs
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRocksDBLogging.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRocksDBLogging.java
index e0a1ee2..39ff4d3 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRocksDBLogging.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRocksDBLogging.java
@@ -21,7 +21,6 @@ package org.apache.hadoop.ozone.om;
import java.util.concurrent.TimeoutException;
-import org.apache.hadoop.hdds.HddsConfigKeys;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.utils.db.DBStoreBuilder;
import org.apache.hadoop.hdds.utils.db.RocksDBConfiguration;
@@ -53,9 +52,8 @@ public class TestOzoneManagerRocksDBLogging {
conf = new OzoneConfiguration();
dbConf = conf.getObject(RocksDBConfiguration.class);
enableRocksDbLogging(false);
- conf.setBoolean(HddsConfigKeys.HDDS_SCM_SAFEMODE_ENABLED, false);
cluster = MiniOzoneCluster.newBuilder(conf)
- .setNumDatanodes(0).build();
+ .withoutDatanodes().build();
cluster.waitForClusterToBeReady();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
