You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2023/04/12 09:19:56 UTC
[ozone] branch master updated: HDDS-8300. Enable topology aware replication and reads by default. (#4489)
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 eaf7f9a0c1 HDDS-8300. Enable topology aware replication and reads by default. (#4489)
eaf7f9a0c1 is described below
commit eaf7f9a0c12107b0c4272b605c0e280099fcbfc6
Author: ashishkumar50 <11...@users.noreply.github.com>
AuthorDate: Wed Apr 12 14:49:50 2023 +0530
HDDS-8300. Enable topology aware replication and reads by default. (#4489)
---
.../src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java | 2 +-
hadoop-hdds/common/src/main/resources/ozone-default.xml | 4 ++--
.../placement/algorithms/TestContainerPlacementFactory.java | 7 +++++--
.../java/org/apache/hadoop/ozone/scm/TestXceiverClientGrpc.java | 2 ++
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
index b0560daa9a..8be7c50759 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConfigKeys.java
@@ -484,7 +484,7 @@ public final class OzoneConfigKeys {
public static final String OZONE_NETWORK_TOPOLOGY_AWARE_READ_KEY =
"ozone.network.topology.aware.read";
- public static final boolean OZONE_NETWORK_TOPOLOGY_AWARE_READ_DEFAULT = false;
+ public static final boolean OZONE_NETWORK_TOPOLOGY_AWARE_READ_DEFAULT = true;
public static final String OZONE_MANAGER_FAIR_LOCK = "ozone.om.lock.fair";
public static final boolean OZONE_MANAGER_FAIR_LOCK_DEFAULT = false;
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index a5b8a905da..84f4f253cb 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -870,7 +870,7 @@
</property>
<property>
<name>ozone.scm.container.placement.impl</name>
- <value>org.apache.hadoop.hdds.scm.container.placement.algorithms.SCMContainerPlacementRandom</value>
+ <value>org.apache.hadoop.hdds.scm.container.placement.algorithms.SCMContainerPlacementRackAware</value>
<tag>OZONE, MANAGEMENT</tag>
<description>
The full name of class which implements
@@ -2753,7 +2753,7 @@
</property>
<property>
<name>ozone.network.topology.aware.read</name>
- <value>false</value>
+ <value>true</value>
<tag>OZONE, PERFORMANCE</tag>
<description>
Whether to enable topology aware read to improve the read performance.
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestContainerPlacementFactory.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestContainerPlacementFactory.java
index 5d17f1389a..31016f017c 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestContainerPlacementFactory.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/placement/algorithms/TestContainerPlacementFactory.java
@@ -163,10 +163,13 @@ public class TestContainerPlacementFactory {
}
@Test
- public void testDefaultPolicy() throws IOException {
+ public void testRackAwareContainerPolicy() throws IOException {
+ conf.set(ScmConfigKeys.OZONE_SCM_CONTAINER_PLACEMENT_IMPL_KEY,
+ SCMContainerPlacementRackAware.class.getName());
PlacementPolicy policy = ContainerPlacementPolicyFactory
.getPolicy(conf, null, null, true, null);
- Assertions.assertSame(SCMContainerPlacementRandom.class, policy.getClass());
+ Assertions.assertSame(SCMContainerPlacementRackAware.class,
+ policy.getClass());
}
@Test
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientGrpc.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientGrpc.java
index baa7a49e29..ae156be8a4 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientGrpc.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/scm/TestXceiverClientGrpc.java
@@ -87,6 +87,8 @@ public class TestXceiverClientGrpc {
@Timeout(5)
public void testRandomFirstNodeIsCommandTarget() throws IOException {
final ArrayList<DatanodeDetails> allDNs = new ArrayList<>(dns);
+ conf.setBoolean(
+ OzoneConfigKeys.OZONE_NETWORK_TOPOLOGY_AWARE_READ_KEY, false);
// Using a new Xceiver Client, call it repeatedly until all DNs in the
// pipeline have been the target of the command, indicating it is shuffling
// the DNs on each call with a new client. This test will timeout if this
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org