diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerManagerImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerManagerImpl.java index 5beae37e016..8b3fe109274 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerManagerImpl.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerManagerImpl.java @@ -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()); } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java index 110093a1475..7e783308388 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java @@ -256,6 +256,35 @@ public class TestContainerPersistence { .containsKey(containerName1)); } + @Test + public void testGetContainerReports() throws Exception{ + final int count = 10; + List containerNames = new ArrayList(); + + 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 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.