This is an automated email from the ASF dual-hosted git repository.
msingh pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 214112b HDDS-1010. ContainerSet#getContainerMap should be renamed.
Contributed by Supratim Deka.
214112b is described below
commit 214112b2d706b301d18c4b270280cd7eee70e81e
Author: Mukul Kumar Singh <[email protected]>
AuthorDate: Thu Feb 7 18:06:23 2019 +0530
HDDS-1010. ContainerSet#getContainerMap should be renamed. Contributed by
Supratim Deka.
---
.../hadoop/ozone/container/common/impl/ContainerSet.java | 3 ++-
.../ozone/container/common/TestBlockDeletingService.java | 2 +-
.../common/impl/TestContainerDeletionChoosingPolicy.java | 4 ++--
.../container/common/impl/TestContainerPersistence.java | 14 +++++++-------
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerSet.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerSet.java
index 3c09f02..aff2275 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerSet.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerSet.java
@@ -135,7 +135,8 @@ public class ContainerSet {
* Return a copy of the containerMap.
* @return containerMap
*/
- public Map<Long, Container> getContainerMap() {
+ @VisibleForTesting
+ public Map<Long, Container> getContainerMapCopy() {
return ImmutableMap.copyOf(containerMap);
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/TestBlockDeletingService.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/TestBlockDeletingService.java
index e8ae266..27fe4ff 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/TestBlockDeletingService.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/TestBlockDeletingService.java
@@ -204,7 +204,7 @@ public class TestBlockDeletingService {
MetadataStore meta = BlockUtils.getDB(
(KeyValueContainerData) containerData.get(0), conf);
- Map<Long, Container> containerMap = containerSet.getContainerMap();
+ Map<Long, Container> containerMap = containerSet.getContainerMapCopy();
// NOTE: this test assumes that all the container is KetValueContainer and
// have DeleteTransactionId in KetValueContainerData. If other
// types is going to be added, this test should be checked.
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerDeletionChoosingPolicy.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerDeletionChoosingPolicy.java
index 745f730..f4b089b 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerDeletionChoosingPolicy.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerDeletionChoosingPolicy.java
@@ -78,7 +78,7 @@ public class TestContainerDeletionChoosingPolicy {
KeyValueContainer container = new KeyValueContainer(data, conf);
containerSet.addContainer(container);
Assert.assertTrue(
- containerSet.getContainerMap().containsKey(data.getContainerID()));
+
containerSet.getContainerMapCopy().containsKey(data.getContainerID()));
}
ContainerDeletionChoosingPolicy deletionPolicy =
@@ -138,7 +138,7 @@ public class TestContainerDeletionChoosingPolicy {
KeyValueContainer container = new KeyValueContainer(data, conf);
containerSet.addContainer(container);
Assert.assertTrue(
- containerSet.getContainerMap().containsKey(containerId));
+ containerSet.getContainerMapCopy().containsKey(containerId));
}
ContainerDeletionChoosingPolicy deletionPolicy =
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
index 8bc73d4..f2e44cb 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
@@ -177,7 +177,7 @@ public class TestContainerPersistence {
public void testCreateContainer() throws Exception {
long testContainerID = getTestContainerID();
addContainer(containerSet, testContainerID);
- Assert.assertTrue(containerSet.getContainerMap()
+ Assert.assertTrue(containerSet.getContainerMapCopy()
.containsKey(testContainerID));
KeyValueContainerData kvData =
(KeyValueContainerData) containerSet.getContainer(testContainerID)
@@ -226,14 +226,14 @@ public class TestContainerPersistence {
Container container2 = addContainer(containerSet, testContainerID2);
- Assert.assertTrue(containerSet.getContainerMap()
+ Assert.assertTrue(containerSet.getContainerMapCopy()
.containsKey(testContainerID1));
- Assert.assertTrue(containerSet.getContainerMap()
+ Assert.assertTrue(containerSet.getContainerMapCopy()
.containsKey(testContainerID2));
container1.delete();
containerSet.removeContainer(testContainerID1);
- Assert.assertFalse(containerSet.getContainerMap()
+ Assert.assertFalse(containerSet.getContainerMapCopy()
.containsKey(testContainerID1));
// Adding block to a deleted container should fail.
@@ -254,7 +254,7 @@ public class TestContainerPersistence {
exception.expectMessage(
"Container cannot be deleted because it is not empty.");
container2.delete();
- Assert.assertTrue(containerSet.getContainerMap()
+ Assert.assertTrue(containerSet.getContainerMapCopy()
.containsKey(testContainerID1));
}
@@ -762,8 +762,8 @@ public class TestContainerPersistence {
container.update(newMetadata, false);
- Assert.assertEquals(1, containerSet.getContainerMap().size());
- Assert.assertTrue(containerSet.getContainerMap()
+ Assert.assertEquals(1, containerSet.getContainerMapCopy().size());
+ Assert.assertTrue(containerSet.getContainerMapCopy()
.containsKey(testContainerID));
// Verify in-memory map
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
