Skip to content

HDDS-2518. Ensure RATIS leader info is properly updated with pipeline… #195

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

Closed
xiaoyuyao wants to merge 1 commit into from
Closed

HDDS-2518. Ensure RATIS leader info is properly updated with pipeline… #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/pipeline/Pipeline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ public Builder(Pipeline pipeline) {
this.state = pipeline.state;
this.nodeStatus = pipeline.nodeStatus;
this.nodesInOrder = pipeline.nodesInOrder.get();
this.leaderId = pipeline.getLeaderId();
}

public Builder setId(PipelineID id1) {
Expand Down
9 changes: 9 additions & 0 deletions hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,15 @@ public static PipelineReportFromDatanode getPipelineReportFromDatanode(
return new PipelineReportFromDatanode(dn, reportBuilder.build());
}

public static PipelineReportFromDatanode getPipelineReportFromDatanode(
DatanodeDetails dn, PipelineID pipelineID, boolean isLeader) {
PipelineReportsProto.Builder reportBuilder =
PipelineReportsProto.newBuilder();
reportBuilder.addPipelineReport(PipelineReport.newBuilder()
.setPipelineID(pipelineID.getProtobuf()).setIsLeader(isLeader));
return new PipelineReportFromDatanode(dn, reportBuilder.build());
}

public static void openAllRatisPipelines(PipelineManager pipelineManager)
throws IOException {
// Pipeline is created by background thread
Expand Down
18 changes: 14 additions & 4 deletions ...ration-test/src/test/java/org/apache/hadoop/hdds/scm/pipeline/TestSCMPipelineManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,14 +177,19 @@ public void testPipelineReport() throws IOException {
// get pipeline report from each dn in the pipeline
PipelineReportHandler pipelineReportHandler =
new PipelineReportHandler(scmSafeModeManager, pipelineManager, conf);
Boolean isLeader = true;
for (DatanodeDetails dn: pipeline.getNodes()) {
PipelineReportFromDatanode pipelineReportFromDatanode =
TestUtils.getPipelineReportFromDatanode(dn, pipeline.getId());
TestUtils.getPipelineReportFromDatanode(dn, pipeline.getId(),
isLeader);
if (isLeader) {
isLeader = false;
}
// pipeline is not healthy until all dns report
Assert.assertFalse(
pipelineManager.getPipeline(pipeline.getId()).isHealthy());
pipelineReportHandler
.onMessage(pipelineReportFromDatanode, new EventQueue());
.onMessage(pipelineReportFromDatanode, eventQueue);
}

// pipeline is healthy when all dns report
Expand All @@ -197,12 +202,17 @@ public void testPipelineReport() throws IOException {
// close the pipeline
pipelineManager.finalizeAndDestroyPipeline(pipeline, false);

isLeader = true;
for (DatanodeDetails dn: pipeline.getNodes()) {
PipelineReportFromDatanode pipelineReportFromDatanode =
TestUtils.getPipelineReportFromDatanode(dn, pipeline.getId());
TestUtils.getPipelineReportFromDatanode(dn, pipeline.getId(),
isLeader);
if (isLeader) {
isLeader = false;
}
// pipeline report for destroyed pipeline should be ignored
pipelineReportHandler
.onMessage(pipelineReportFromDatanode, new EventQueue());
.onMessage(pipelineReportFromDatanode, eventQueue);
}

try {
Expand Down