Skip to content

HDDS-7463. SCM Pipeline scrubber never able to cleanup allocated pipeline. #4093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sodonnel merged 3 commits into from
Dec 20, 2022
Merged

HDDS-7463. SCM Pipeline scrubber never able to cleanup allocated pipeline. #4093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01d481e
HDDS-7463. SCM Pipeline scrubber never able to cleanup allocated pipe…
ashishkr200 Dec 15, 2022
820e70a
HDDS-7463. SCM Pipeline scrubber never able to cleanup allocated pipe…
ashishkr200 Dec 20, 2022
73ad2cd
HDDS-7463. SCM Pipeline scrubber never able to cleanup allocated pipe…
ashishkr200 Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...s/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,9 @@ public static StorageContainerManager createSCM(OzoneConfiguration conf)
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();
Expand Down Expand Up @@ -669,7 +672,7 @@ private void initializeSystemManagers(OzoneConfiguration conf,
eventQueue,
scmContext,
serviceManager,
clock
systemClock
);
}

Expand Down
3 changes: 2 additions & 1 deletion hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/block/TestBlockManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -143,7 +144,7 @@ public void setUp(@TempDir Path tempDir) throws Exception {
eventQueue,
scmContext,
serviceManager,
new MonotonicClock(ZoneOffset.UTC));
Clock.system(ZoneOffset.UTC));

PipelineProvider mockRatisProvider =
new MockRatisPipelineProvider(nodeManager,
Expand Down
8 changes: 4 additions & 4 deletions ...cm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestHealthyPipelineSafeModeRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -44,7 +45,6 @@
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;
Expand Down Expand Up @@ -88,7 +88,7 @@ public void testHealthyPipelineSafeModeRuleWithNoPipelines()
eventQueue,
scmContext,
serviceManager,
new MonotonicClock(ZoneOffset.UTC));
Clock.system(ZoneOffset.UTC));
PipelineProvider mockRatisProvider =
new MockRatisPipelineProvider(nodeManager,
pipelineManager.getStateManager(), config);
Expand Down Expand Up @@ -143,7 +143,7 @@ public void testHealthyPipelineSafeModeRuleWithPipelines() throws Exception {
eventQueue,
scmContext,
serviceManager,
new MonotonicClock(ZoneOffset.UTC));
Clock.system(ZoneOffset.UTC));

PipelineProvider mockRatisProvider =
new MockRatisPipelineProvider(nodeManager,
Expand Down Expand Up @@ -242,7 +242,7 @@ public void testHealthyPipelineSafeModeRuleWithMixedPipelines()
eventQueue,
scmContext,
serviceManager,
new MonotonicClock(ZoneOffset.UTC));
Clock.system(ZoneOffset.UTC));

PipelineProvider mockRatisProvider =
new MockRatisPipelineProvider(nodeManager,
Expand Down
14 changes: 7 additions & 7 deletions .../server-scm/src/test/java/org/apache/hadoop/hdds/scm/safemode/TestSCMSafeModeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
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;
Expand Down Expand Up @@ -55,7 +56,6 @@
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;
Expand Down Expand Up @@ -254,7 +254,7 @@ public void testFailWithIncorrectValueForHealthyPipelinePercent()
queue,
scmContext,
serviceManager,
new MonotonicClock(ZoneOffset.UTC));
Clock.system(ZoneOffset.UTC));
scmSafeModeManager = new SCMSafeModeManager(
conf, containers, null, pipelineManager, queue, serviceManager,
scmContext);
Expand All @@ -281,7 +281,7 @@ public void testFailWithIncorrectValueForOneReplicaPipelinePercent()
queue,
scmContext,
serviceManager,
new MonotonicClock(ZoneOffset.UTC));
Clock.system(ZoneOffset.UTC));
scmSafeModeManager = new SCMSafeModeManager(
conf, containers, null, pipelineManager, queue, serviceManager,
scmContext);
Expand All @@ -307,7 +307,7 @@ public void testFailWithIncorrectValueForSafeModePercent() throws Exception {
queue,
scmContext,
serviceManager,
new MonotonicClock(ZoneOffset.UTC));
Clock.system(ZoneOffset.UTC));
scmSafeModeManager = new SCMSafeModeManager(
conf, containers, null, pipelineManager, queue, serviceManager,
scmContext);
Expand Down Expand Up @@ -340,7 +340,7 @@ public void testSafeModeExitRuleWithPipelineAvailabilityCheck(
queue,
scmContext,
serviceManager,
new MonotonicClock(ZoneOffset.UTC));
Clock.system(ZoneOffset.UTC));
PipelineProvider<RatisReplicationConfig> mockRatisProvider =
new MockRatisPipelineProvider(mockNodeManager,
pipelineManager.getStateManager(), config);
Expand Down Expand Up @@ -592,7 +592,7 @@ public void testSafeModePipelineExitRule() throws Exception {
queue,
scmContext,
serviceManager,
new MonotonicClock(ZoneOffset.UTC));
Clock.system(ZoneOffset.UTC));

PipelineProvider<RatisReplicationConfig> mockRatisProvider =
new MockRatisPipelineProvider(nodeManager,
Expand Down Expand Up @@ -657,7 +657,7 @@ public void testPipelinesNotCreatedUntilPreCheckPasses()
queue,
scmContext,
serviceManager,
new MonotonicClock(ZoneOffset.UTC));
Clock.system(ZoneOffset.UTC));

PipelineProvider<RatisReplicationConfig> mockRatisProvider =
new MockRatisPipelineProvider(nodeManager,
Expand Down