This is an automated email from the ASF dual-hosted git repository.
sodonnell 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 c7785fa4fd HDDS-7463. SCM Pipeline scrubber never able to cleanup
allocated pipeline. (#4093)
c7785fa4fd is described below
commit c7785fa4fd6c008dfec0731b8a1674425b76e648
Author: ashishkumar50 <[email protected]>
AuthorDate: Wed Dec 21 01:54:13 2022 +0530
HDDS-7463. SCM Pipeline scrubber never able to cleanup allocated pipeline.
(#4093)
---
.../hadoop/hdds/scm/server/StorageContainerManager.java | 5 ++++-
.../org/apache/hadoop/hdds/scm/block/TestBlockManager.java | 3 ++-
.../hdds/scm/safemode/TestHealthyPipelineSafeModeRule.java | 8 ++++----
.../hadoop/hdds/scm/safemode/TestSCMSafeModeManager.java | 14 +++++++-------
4 files changed, 17 insertions(+), 13 deletions(-)
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index 9f32eb3731..e053076488 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -583,6 +583,9 @@ public final class StorageContainerManager extends
ServiceRuntimeInfoImpl
private void initializeSystemManagers(OzoneConfiguration conf,
SCMConfigurator configurator) throws IOException {
Clock clock = new MonotonicClock(ZoneOffset.UTC);
+ // Use SystemClock when data is persisted
+ // and used again after system restarts.
+ Clock systemClock = Clock.system(ZoneOffset.UTC);
if (configurator.getNetworkTopology() != null) {
clusterMap = configurator.getNetworkTopology();
@@ -670,7 +673,7 @@ public final class StorageContainerManager extends
ServiceRuntimeInfoImpl
eventQueue,
scmContext,
serviceManager,
- clock
+ systemClock
);
}
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java
index 908a21e162..d7557b7d8b 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.hdds.scm.block;
import java.io.IOException;
+import java.time.Clock;
import java.time.ZoneId;
import java.nio.file.Path;
import java.time.ZoneOffset;
@@ -143,7 +144,7 @@ public class TestBlockManager {
eventQueue,
scmContext,
serviceManager,
- new MonotonicClock(ZoneOffset.UTC));
+ Clock.system(ZoneOffset.UTC));
PipelineProvider mockRatisProvider =
new MockRatisPipelineProvider(nodeManager,
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestHealthyPipelineSafeModeRule.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestHealthyPipelineSafeModeRule.java
index 08b0122ee4..0b9dbdfbe7 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestHealthyPipelineSafeModeRule.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestHealthyPipelineSafeModeRule.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.hdds.scm.safemode;
import java.io.File;
+import java.time.Clock;
import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.List;
@@ -44,7 +45,6 @@ import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
import org.apache.hadoop.hdds.scm.pipeline.PipelineProvider;
import org.apache.hadoop.hdds.scm.pipeline.PipelineManagerImpl;
import org.apache.hadoop.hdds.server.events.EventQueue;
-import org.apache.hadoop.ozone.common.MonotonicClock;
import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.Assertions;
@@ -88,7 +88,7 @@ public class TestHealthyPipelineSafeModeRule {
eventQueue,
scmContext,
serviceManager,
- new MonotonicClock(ZoneOffset.UTC));
+ Clock.system(ZoneOffset.UTC));
PipelineProvider mockRatisProvider =
new MockRatisPipelineProvider(nodeManager,
pipelineManager.getStateManager(), config);
@@ -143,7 +143,7 @@ public class TestHealthyPipelineSafeModeRule {
eventQueue,
scmContext,
serviceManager,
- new MonotonicClock(ZoneOffset.UTC));
+ Clock.system(ZoneOffset.UTC));
PipelineProvider mockRatisProvider =
new MockRatisPipelineProvider(nodeManager,
@@ -242,7 +242,7 @@ public class TestHealthyPipelineSafeModeRule {
eventQueue,
scmContext,
serviceManager,
- new MonotonicClock(ZoneOffset.UTC));
+ Clock.system(ZoneOffset.UTC));
PipelineProvider mockRatisProvider =
new MockRatisPipelineProvider(nodeManager,
diff --git
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeManager.java
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeManager.java
index 77bd18faa5..20c1a788f8 100644
---
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeManager.java
+++
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeManager.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.hdds.scm.safemode;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
+import java.time.Clock;
import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.Collections;
@@ -55,7 +56,6 @@ import
org.apache.hadoop.hdds.scm.server.SCMDatanodeHeartbeatDispatcher;
import org.apache.hadoop.hdds.server.events.EventHandler;
import org.apache.hadoop.hdds.server.events.EventPublisher;
import org.apache.hadoop.hdds.server.events.EventQueue;
-import org.apache.hadoop.ozone.common.MonotonicClock;
import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.AfterEach;
@@ -254,7 +254,7 @@ public class TestSCMSafeModeManager {
queue,
scmContext,
serviceManager,
- new MonotonicClock(ZoneOffset.UTC));
+ Clock.system(ZoneOffset.UTC));
scmSafeModeManager = new SCMSafeModeManager(
conf, containers, null, pipelineManager, queue, serviceManager,
scmContext);
@@ -281,7 +281,7 @@ public class TestSCMSafeModeManager {
queue,
scmContext,
serviceManager,
- new MonotonicClock(ZoneOffset.UTC));
+ Clock.system(ZoneOffset.UTC));
scmSafeModeManager = new SCMSafeModeManager(
conf, containers, null, pipelineManager, queue, serviceManager,
scmContext);
@@ -307,7 +307,7 @@ public class TestSCMSafeModeManager {
queue,
scmContext,
serviceManager,
- new MonotonicClock(ZoneOffset.UTC));
+ Clock.system(ZoneOffset.UTC));
scmSafeModeManager = new SCMSafeModeManager(
conf, containers, null, pipelineManager, queue, serviceManager,
scmContext);
@@ -340,7 +340,7 @@ public class TestSCMSafeModeManager {
queue,
scmContext,
serviceManager,
- new MonotonicClock(ZoneOffset.UTC));
+ Clock.system(ZoneOffset.UTC));
PipelineProvider<RatisReplicationConfig> mockRatisProvider =
new MockRatisPipelineProvider(mockNodeManager,
pipelineManager.getStateManager(), config);
@@ -592,7 +592,7 @@ public class TestSCMSafeModeManager {
queue,
scmContext,
serviceManager,
- new MonotonicClock(ZoneOffset.UTC));
+ Clock.system(ZoneOffset.UTC));
PipelineProvider<RatisReplicationConfig> mockRatisProvider =
new MockRatisPipelineProvider(nodeManager,
@@ -657,7 +657,7 @@ public class TestSCMSafeModeManager {
queue,
scmContext,
serviceManager,
- new MonotonicClock(ZoneOffset.UTC));
+ Clock.system(ZoneOffset.UTC));
PipelineProvider<RatisReplicationConfig> mockRatisProvider =
new MockRatisPipelineProvider(nodeManager,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
