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 6d4076c952 HDDS-8658. ReplicationManager: Change default command
timeout to 10 minutes (#4746)
6d4076c952 is described below
commit 6d4076c9520a7aafa1f4e56d6c897f8cae04012a
Author: Stephen O'Donnell <[email protected]>
AuthorDate: Sat May 20 12:31:47 2023 +0100
HDDS-8658. ReplicationManager: Change default command timeout to 10 minutes
(#4746)
---
.../hdds/scm/container/replication/ReplicationManager.java | 4 ++--
.../container/replication/TestLegacyReplicationManager.java | 12 ------------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManager.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManager.java
index 8e10b4ab87..1053b669d9 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManager.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManager.java
@@ -1130,12 +1130,12 @@ public class ReplicationManager implements SCMService {
*/
@Config(key = "event.timeout",
type = ConfigType.TIME,
- defaultValue = "30m",
+ defaultValue = "10m",
tags = {SCM, OZONE},
description = "Timeout for the container replication/deletion commands
"
+ "sent to datanodes. After this timeout the command will be "
+ "retried.")
- private long eventTimeout = Duration.ofMinutes(30).toMillis();
+ private long eventTimeout = Duration.ofMinutes(10).toMillis();
public void setInterval(Duration interval) {
this.interval = interval.toMillis();
}
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestLegacyReplicationManager.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestLegacyReplicationManager.java
index 9641cdd7d8..05eea067bb 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestLegacyReplicationManager.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestLegacyReplicationManager.java
@@ -316,18 +316,6 @@ public class TestLegacyReplicationManager {
replicationManager.start();
Assertions.assertTrue(replicationManager.isRunning());
}
-
- @Test
- public void testGeneratedConfig() {
- ReplicationManagerConfiguration rmc = OzoneConfiguration.newInstanceOf(
- ReplicationManagerConfiguration.class);
-
- //default is not included in ozone-site.xml but generated from annotation
- //to the ozone-site-generated.xml which should be loaded by the
- // OzoneConfiguration.
- Assertions.assertEquals(1800000, rmc.getEventTimeout());
-
- }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
