big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDDS-347. TestCloseContainerByPipeline#testCloseContainerViaStandaAlone sometimes fails. Contributed by Lixin Ge.

Browse Source
This commit is contained in:
Xiaoyu Yao 2018-08-15 08:10:08 -07:00
parent 8dc07b4723
commit f2315f2e9c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerByPipeline.java
View File

@ -182,9 +182,11 @@ public void testCloseContainerViaStandAlone()
new CloseContainerCommand(containerID, new CloseContainerCommand(containerID,
HddsProtos.ReplicationType.STAND_ALONE, pipeline.getId())); HddsProtos.ReplicationType.STAND_ALONE, pipeline.getId()));
GenericTestUtils // The log will appear after the state changed to closed in standalone,
.waitFor(() -> isContainerClosed(cluster, containerID, datanodeDetails), // wait for the log to ensure the operation has been done.
500, 5 * 1000); GenericTestUtils.waitFor(() -> logCapturer.getOutput().contains(
"submitting CloseContainer request over STAND_ALONE server for"
+ " container " + containerID), 500, 5 * 1000);
//double check if it's really closed (waitFor also throws an exception) //double check if it's really closed (waitFor also throws an exception)
Assert.assertTrue(isContainerClosed(cluster, containerID, datanodeDetails)); Assert.assertTrue(isContainerClosed(cluster, containerID, datanodeDetails));
@ -260,7 +262,7 @@ private Boolean isContainerClosed(MiniOzoneCluster cluster, long containerID,
containerData = containerData =
datanodeService.getDatanodeStateMachine().getContainer() datanodeService.getDatanodeStateMachine().getContainer()
.getContainerSet().getContainer(containerID).getContainerData(); .getContainerSet().getContainer(containerID).getContainerData();
return !containerData.isOpen(); return containerData.isClosed();
} }
return false; return false;
} }