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 ec3813fada HDDS-7808. Intermittent failure in
TestReplicationManager#testUnderReplicationQueuePopulated (#4213)
ec3813fada is described below
commit ec3813fada97ef05ac3a7c256fabe75b52538bbb
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Thu Jan 26 19:12:02 2023 +0100
HDDS-7808. Intermittent failure in
TestReplicationManager#testUnderReplicationQueuePopulated (#4213)
---
.../hdds/scm/container/replication/ReplicationManager.java | 12 +++++++-----
.../scm/container/replication/TestReplicationManager.java | 7 ++++++-
2 files changed, 13 insertions(+), 6 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 eee68e8623..af2ad50d90 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
@@ -265,10 +265,6 @@ public class ReplicationManager implements SCMService {
metrics = ReplicationManagerMetrics.create(this);
legacyReplicationManager.setMetrics(metrics);
containerReplicaPendingOps.setReplicationMetrics(metrics);
- replicationMonitor = new Thread(this::run);
- replicationMonitor.setName("ReplicationMonitor");
- replicationMonitor.setDaemon(true);
- replicationMonitor.start();
startSubServices();
} else {
LOG.info("Replication Monitor Thread is already running.");
@@ -311,7 +307,13 @@ public class ReplicationManager implements SCMService {
* Create Replication Manager sub services such as Over and Under Replication
* processors.
*/
- private void startSubServices() {
+ @VisibleForTesting
+ protected void startSubServices() {
+ replicationMonitor = new Thread(this::run);
+ replicationMonitor.setName("ReplicationMonitor");
+ replicationMonitor.setDaemon(true);
+ replicationMonitor.start();
+
underReplicatedProcessorThread = new Thread(underReplicatedProcessor);
underReplicatedProcessorThread.setName("Under Replicated Processor");
underReplicatedProcessorThread.setDaemon(true);
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManager.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManager.java
index 594aad42f0..825144e6f6 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManager.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/replication/TestReplicationManager.java
@@ -133,7 +133,12 @@ public class TestReplicationManager {
nodeManager,
clock,
legacyReplicationManager,
- containerReplicaPendingOps);
+ containerReplicaPendingOps) {
+ @Override
+ protected void startSubServices() {
+ // do not start any threads for processing
+ }
+ };
containerReplicaMap = new HashMap<>();
containerInfoSet = new HashSet<>();
repConfig = new ECReplicationConfig(3, 2);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
