Skip to content

HDDS-2499. IsLeader information is lost when update pipeline state. #180

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
ChenSammi merged 2 commits into from
Nov 19, 2019
Merged

HDDS-2499. IsLeader information is lost when update pipeline state. #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7586c1
HDDS-2499. IsLeader information is lost when update pipeline state.
ChenSammi Nov 15, 2019
cc81faf
Update per commens
ChenSammi Nov 18, 2019
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
63 changes: 26 additions & 37 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 @@ -34,12 +34,11 @@
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.DatanodeDetails;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.PipelineReport;
import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.PipelineReportsProto;
import org.apache.hadoop.hdds.scm.container.ContainerID;
import org.apache.hadoop.hdds.scm.container.MockNodeManager;
import org.apache.hadoop.hdds.scm.safemode.SCMSafeModeManager;
import org.apache.hadoop.hdds.scm.server.SCMDatanodeHeartbeatDispatcher.PipelineReportFromDatanode;
import org.apache.hadoop.hdds.scm.server.SCMDatanodeHeartbeatDispatcher
.PipelineReportFromDatanode;
import org.apache.hadoop.hdds.scm.TestUtils;
import org.apache.hadoop.hdds.server.events.EventQueue;
import org.apache.hadoop.metrics2.MetricsRecordBuilder;
Expand Down Expand Up @@ -174,18 +173,17 @@ public void testPipelineReport() throws IOException {
Assert
.assertFalse(pipelineManager.getPipeline(pipeline.getId()).isOpen());

// get pipeline report from each dn in the pipeline
// pipeline is not healthy until all dns report
PipelineReportHandler pipelineReportHandler =
new PipelineReportHandler(scmSafeModeManager, pipelineManager, conf);
for (DatanodeDetails dn: pipeline.getNodes()) {
PipelineReportFromDatanode pipelineReportFromDatanode =
TestUtils.getPipelineReportFromDatanode(dn, pipeline.getId());
// pipeline is not healthy until all dns report
Assert.assertFalse(
pipelineManager.getPipeline(pipeline.getId()).isHealthy());
pipelineReportHandler
.onMessage(pipelineReportFromDatanode, new EventQueue());
}
List<DatanodeDetails> nodes = pipeline.getNodes();
Copy link
Contributor

@xiaoyuyao xiaoyuyao Nov 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a similar negative case in Line 199-205. It does not cause failure but we can fix them similarly. The previous approach can also be fixed with slightly modification of TestUtils.getPipelineReportFromDatanode as demoed in the dup PR #195.

Assert.assertFalse(
pipelineManager.getPipeline(pipeline.getId()).isHealthy());
// get pipeline report from each dn in the pipeline
nodes.subList(0, 2).forEach(dn -> sendPipelineReport(dn, pipeline,
pipelineReportHandler, false, eventQueue));
sendPipelineReport(nodes.get(nodes.size() - 1), pipeline,
pipelineReportHandler, true, eventQueue);

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

for (DatanodeDetails dn: pipeline.getNodes()) {
PipelineReportFromDatanode pipelineReportFromDatanode =
TestUtils.getPipelineReportFromDatanode(dn, pipeline.getId());
// pipeline report for destroyed pipeline should be ignored
pipelineReportHandler
.onMessage(pipelineReportFromDatanode, new EventQueue());
}
// pipeline report for destroyed pipeline should be ignored
nodes.subList(0, 2).forEach(dn -> sendPipelineReport(dn, pipeline,
pipelineReportHandler, false, eventQueue));
sendPipelineReport(nodes.get(nodes.size() - 1), pipeline,
pipelineReportHandler, true, eventQueue);

try {
pipelineManager.getPipeline(pipeline.getId());
Expand Down Expand Up @@ -271,7 +267,7 @@ public void testPipelineCreationFailedMetric() throws Exception {
numPipelineCreateFailed = getLongCounter(
"NumPipelineCreationFailed", metrics);
Assert.assertTrue(numPipelineCreateFailed == 0);

// clean up
pipelineManager.close();
}
Expand Down Expand Up @@ -358,16 +354,16 @@ public void testPipelineOpenOnlyWhenLeaderReported() throws Exception {
List<DatanodeDetails> nodes = pipeline.getNodes();
Assert.assertEquals(3, nodes.size());
// Send report for all but no leader
nodes.forEach(dn ->
sendPipelineReport(dn, pipeline, pipelineReportHandler, false));
nodes.forEach(dn -> sendPipelineReport(dn, pipeline, pipelineReportHandler,
false, eventQueue));

Assert.assertEquals(Pipeline.PipelineState.ALLOCATED,
pipelineManager.getPipeline(pipeline.getId()).getPipelineState());

nodes.subList(0, 2).forEach(dn ->
sendPipelineReport(dn, pipeline, pipelineReportHandler, false));
nodes.subList(0, 2).forEach(dn -> sendPipelineReport(dn, pipeline,
pipelineReportHandler, false, eventQueue));
sendPipelineReport(nodes.get(nodes.size() - 1), pipeline,
pipelineReportHandler, true);
pipelineReportHandler, true, eventQueue);

Assert.assertEquals(Pipeline.PipelineState.OPEN,
pipelineManager.getPipeline(pipeline.getId()).getPipelineState());
Expand All @@ -377,16 +373,9 @@ public void testPipelineOpenOnlyWhenLeaderReported() throws Exception {

private void sendPipelineReport(DatanodeDetails dn,
Pipeline pipeline, PipelineReportHandler pipelineReportHandler,
boolean isLeader) {

PipelineReportsProto.Builder reportProtoBuilder =
PipelineReportsProto.newBuilder();
PipelineReport.Builder reportBuilder = PipelineReport.newBuilder();
reportBuilder.setPipelineID(pipeline.getId().getProtobuf());
reportBuilder.setIsLeader(isLeader);

pipelineReportHandler.onMessage(new PipelineReportFromDatanode(dn,
reportProtoBuilder.addPipelineReport(
reportBuilder.build()).build()), new EventQueue());
boolean isLeader, EventQueue eventQueue) {
PipelineReportFromDatanode report =
TestUtils.getPipelineReportFromDatanode(dn, pipeline.getId(), isLeader);
pipelineReportHandler.onMessage(report, eventQueue);
}
}