Skip to content

HDDS-7738. SCM terminates when adding container to a closed pipeline #4154

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
szetszwo merged 3 commits into from
Jan 7, 2023
Merged

HDDS-7738. SCM terminates when adding container to a closed pipeline #4154

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
78b7eb1
HDDS-7738: SCM terminates when adding container to a closed pipeline
duongkame Jan 6, 2023
5831308
Refine log statement.
duongkame Jan 7, 2023
6635ef7
Fix checkstyle.
duongkame Jan 7, 2023
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
6 changes: 3 additions & 3 deletions ...p-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ void addContainerToPipeline(PipelineID pipelineID, ContainerID containerID)

Pipeline pipeline = getPipeline(pipelineID);
if (pipeline.isClosed()) {
throw new IOException(String
.format("Cannot add container to pipeline=%s in closed state",
pipelineID));
LOG.warn("Adding container {} to pipeline={} in CLOSED state." +
" This happens only for some exceptional cases." +
" Check for the previous exceptions.", containerID, pipelineID);
}
pipeline2container.get(pipelineID).add(containerID);
}
Expand Down
26 changes: 25 additions & 1 deletion ...server-scm/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestPipelineManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ public void testSafeModeUpdatedOnSafemodeExit() throws Exception {
}

@Test
public void testAddContainerWithClosedPipeline() throws Exception {
public void testAddContainerWithClosedPipelineScmStart() throws Exception {
GenericTestUtils.LogCapturer logCapturer = GenericTestUtils.LogCapturer.
captureLogs(LoggerFactory.getLogger(PipelineStateMap.class));
SCMHADBTransactionBuffer buffer = new SCMHADBTransactionBufferStub(dbStore);
Expand All @@ -786,6 +786,30 @@ public void testAddContainerWithClosedPipeline() throws Exception {
pipelineID + " in closed state"));
}

@Test
public void testAddContainerWithClosedPipeline() throws Exception {
GenericTestUtils.LogCapturer logCapturer = GenericTestUtils.LogCapturer.
captureLogs(LoggerFactory.getLogger(PipelineStateMap.class));
SCMHADBTransactionBuffer buffer = new SCMHADBTransactionBufferStub(dbStore);
PipelineManagerImpl pipelineManager =
createPipelineManager(true, buffer);
Table<PipelineID, Pipeline> pipelineStore =
SCMDBDefinition.PIPELINES.getTable(dbStore);
Pipeline pipeline = pipelineManager.createPipeline(
RatisReplicationConfig
.getInstance(HddsProtos.ReplicationFactor.THREE));
PipelineID pipelineID = pipeline.getId();
pipelineManager.addContainerToPipeline(pipelineID, ContainerID.valueOf(1));
pipelineManager.getStateManager().updatePipelineState(
pipelineID.getProtobuf(), HddsProtos.PipelineState.PIPELINE_CLOSED);
buffer.flush();
Assertions.assertTrue(pipelineStore.get(pipelineID).isClosed());
pipelineManager.addContainerToPipeline(pipelineID,
ContainerID.valueOf(2));
assertTrue(logCapturer.getOutput().contains(
"Adding container #2 to pipeline=" + pipelineID + " in CLOSED state."));
}

@Test
public void testPipelineCloseFlow() throws IOException, TimeoutException {
GenericTestUtils.LogCapturer logCapturer = GenericTestUtils.LogCapturer
Expand Down