Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-11761. Ozone: Get container report should only report closed containers. Contributed by Weiwei Yang.

This commit is contained in:
Anu Engineer 2017-05-06 09:44:07 -07:00
parent 2feec0045d
commit f713452e7e
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerManagerImpl.java
View File

@ -746,7 +746,7 @@ public class ContainerManagerImpl implements ContainerManager {
// after we iterate a point.
return containerMap.entrySet().stream()
.filter(containerStatus ->
containerStatus.getValue().getContainer().isOpen())
!containerStatus.getValue().getContainer().isOpen())
.map(containerStatus -> containerStatus.getValue().getContainer())
.collect(Collectors.toList());
}

29
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
View File

@ -256,6 +256,35 @@ public class TestContainerPersistence {
.containsKey(containerName1));
}
@Test
public void testGetContainerReports() throws Exception{
final int count = 10;
List<String> containerNames = new ArrayList<String>();
for (int i = 0; i < count; i++) {
String containerName = OzoneUtils.getRequestID();
ContainerData data = new ContainerData(containerName);
containerManager.createContainer(createSingleNodePipeline(containerName),
data);
// Close a bunch of containers.
// Put closed container names to a list.
if (i%3 == 0) {
containerManager.closeContainer(containerName);
containerNames.add(containerName);
}
}
// The container report only returns reports of closed containers.
List<ContainerData> reports = containerManager.getContainerReports();
Assert.assertEquals(4, reports.size());
for(ContainerData report : reports) {
String actualName = report.getContainerName();
Assert.assertTrue(containerNames.remove(actualName));
}
Assert.assertTrue(containerNames.isEmpty());
}
/**
* This test creates 1000 containers and reads them back 5 containers at a
* time and verifies that we did get back all containers.