This is an automated email from the ASF dual-hosted git repository.
sumitagrawal 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 38cb0e7477 HDDS-9273. Set CapacityVolumeChoosingPolicy as default
VolumeChoosingPolicy. (#5285)
38cb0e7477 is described below
commit 38cb0e7477fa27da1afa768d710ea1c7dd38399d
Author: Sadanand Shenoy <[email protected]>
AuthorDate: Fri Sep 22 10:33:48 2023 +0530
HDDS-9273. Set CapacityVolumeChoosingPolicy as default
VolumeChoosingPolicy. (#5285)
---
.../common/volume/VolumeChoosingPolicyFactory.java | 44 ++++++++++++++++++++++
.../ozone/container/keyvalue/KeyValueHandler.java | 7 +---
.../container/replication/ContainerImporter.java | 8 +---
.../volume/TestCapacityVolumeChoosingPolicy.java | 19 ++++++++++
.../container/keyvalue/TestKeyValueHandler.java | 2 +-
5 files changed, 68 insertions(+), 12 deletions(-)
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeChoosingPolicyFactory.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeChoosingPolicyFactory.java
new file mode 100644
index 0000000000..a902312d07
--- /dev/null
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeChoosingPolicyFactory.java
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.ozone.container.common.volume;
+
+import org.apache.hadoop.hdds.conf.ConfigurationSource;
+import org.apache.hadoop.hdds.HddsConfigKeys;
+import
org.apache.hadoop.ozone.container.common.interfaces.VolumeChoosingPolicy;
+
+import static
org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_VOLUME_CHOOSING_POLICY;
+
+/**
+ * A factory to create volume choosing policy instance based on configuration
+ * property {@link HddsConfigKeys#HDDS_DATANODE_VOLUME_CHOOSING_POLICY}.
+ */
+public final class VolumeChoosingPolicyFactory {
+
+ private static final Class<? extends VolumeChoosingPolicy>
+ DEFAULT_VOLUME_CHOOSING_POLICY = CapacityVolumeChoosingPolicy.class;
+
+ private VolumeChoosingPolicyFactory() {
+ }
+
+ public static VolumeChoosingPolicy getPolicy(ConfigurationSource conf)
+ throws InstantiationException, IllegalAccessException {
+ return conf.getClass(HDDS_DATANODE_VOLUME_CHOOSING_POLICY,
+ DEFAULT_VOLUME_CHOOSING_POLICY, VolumeChoosingPolicy.class)
+ .newInstance();
+ }
+}
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java
index d43900a6c5..042ed97842 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java
@@ -78,7 +78,7 @@ import
org.apache.hadoop.ozone.container.common.transport.server.ratis.Dispatche
import org.apache.hadoop.ozone.container.common.utils.ContainerLogger;
import org.apache.hadoop.ozone.container.common.utils.StorageVolumeUtil;
import org.apache.hadoop.ozone.container.common.volume.HddsVolume;
-import
org.apache.hadoop.ozone.container.common.volume.RoundRobinVolumeChoosingPolicy;
+import
org.apache.hadoop.ozone.container.common.volume.VolumeChoosingPolicyFactory;
import org.apache.hadoop.ozone.container.common.volume.VolumeSet;
import org.apache.hadoop.ozone.container.keyvalue.helpers.BlockUtils;
import org.apache.hadoop.ozone.container.keyvalue.helpers.ChunkUtils;
@@ -91,7 +91,6 @@ import
org.apache.hadoop.ozone.container.upgrade.VersionedDatanodeFeatures;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
-import static
org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_VOLUME_CHOOSING_POLICY;
import static
org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Result.CLOSED_CONTAINER_IO;
import static
org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Result.CONTAINER_ALREADY_EXISTS;
import static
org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Result.CONTAINER_INTERNAL_ERROR;
@@ -154,9 +153,7 @@ public class KeyValueHandler extends Handler {
chunkManager = ChunkManagerFactory.createChunkManager(config, blockManager,
volSet);
try {
- volumeChoosingPolicy = conf.getClass(
- HDDS_DATANODE_VOLUME_CHOOSING_POLICY, RoundRobinVolumeChoosingPolicy
- .class, VolumeChoosingPolicy.class).newInstance();
+ volumeChoosingPolicy = VolumeChoosingPolicyFactory.getPolicy(conf);
} catch (Exception e) {
throw new RuntimeException(e);
}
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/ContainerImporter.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/ContainerImporter.java
index 1174523db8..0327af8aac 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/ContainerImporter.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/ContainerImporter.java
@@ -27,7 +27,7 @@ import
org.apache.hadoop.ozone.container.common.interfaces.VolumeChoosingPolicy;
import org.apache.hadoop.ozone.container.common.utils.StorageVolumeUtil;
import org.apache.hadoop.ozone.container.common.volume.HddsVolume;
import org.apache.hadoop.ozone.container.common.volume.MutableVolumeSet;
-import
org.apache.hadoop.ozone.container.common.volume.RoundRobinVolumeChoosingPolicy;
+import
org.apache.hadoop.ozone.container.common.volume.VolumeChoosingPolicyFactory;
import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainerData;
import org.apache.hadoop.ozone.container.keyvalue.TarContainerPacker;
import org.apache.hadoop.ozone.container.ozoneimpl.ContainerController;
@@ -40,8 +40,6 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import static
org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_VOLUME_CHOOSING_POLICY;
-
/**
* Imports container from tarball.
*/
@@ -65,9 +63,7 @@ public class ContainerImporter {
this.controller = controller;
this.volumeSet = volumeSet;
try {
- volumeChoosingPolicy = conf.getClass(
- HDDS_DATANODE_VOLUME_CHOOSING_POLICY, RoundRobinVolumeChoosingPolicy
- .class, VolumeChoosingPolicy.class).newInstance();
+ volumeChoosingPolicy = VolumeChoosingPolicyFactory.getPolicy(conf);
} catch (Exception e) {
throw new RuntimeException(e);
}
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestCapacityVolumeChoosingPolicy.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestCapacityVolumeChoosingPolicy.java
index 2dba615767..ff92275885 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestCapacityVolumeChoosingPolicy.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestCapacityVolumeChoosingPolicy.java
@@ -38,7 +38,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import static
org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DATANODE_VOLUME_CHOOSING_POLICY;
import static org.apache.ozone.test.GenericTestUtils.getTestDir;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -136,4 +138,21 @@ public class TestCapacityVolumeChoosingPolicy {
msg);
}
+ @Test
+ public void testVolumeChoosingPolicyFactory()
+ throws InstantiationException, IllegalAccessException {
+ // unset HDDS_DATANODE_VOLUME_CHOOSING_POLICY
+ // should assert the default policy.
+ assertEquals(CapacityVolumeChoosingPolicy.class,
+ VolumeChoosingPolicyFactory.getPolicy(CONF).getClass());
+ CONF.set(HDDS_DATANODE_VOLUME_CHOOSING_POLICY,
+ CapacityVolumeChoosingPolicy.class.getName());
+ assertEquals(CapacityVolumeChoosingPolicy.class,
+ VolumeChoosingPolicyFactory.getPolicy(CONF).getClass());
+ CONF.set(HDDS_DATANODE_VOLUME_CHOOSING_POLICY,
+ RoundRobinVolumeChoosingPolicy.class.getName());
+ assertEquals(RoundRobinVolumeChoosingPolicy.class,
+ VolumeChoosingPolicyFactory.getPolicy(CONF).getClass());
+ }
+
}
diff --git
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java
index e38a7415c5..fe857ce722 100644
---
a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java
+++
b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandler.java
@@ -288,7 +288,7 @@ public class TestKeyValueHandler {
volumeSet, metrics, c -> {
});
assertEquals("org.apache.hadoop.ozone.container.common" +
- ".volume.RoundRobinVolumeChoosingPolicy",
+ ".volume.CapacityVolumeChoosingPolicy",
keyValueHandler.getVolumeChoosingPolicyForTesting()
.getClass().getName());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
