From 53c8ebcd0285ca91f7d758084cd91df93af0ffb3 Mon Sep 17 00:00:00 2001 From: Anu Engineer Date: Sat, 12 May 2018 10:18:53 -0700 Subject: [PATCH] HDDS-32. Fix TestContainerDeletionChoosingPolicy#testTopNOrderedChoosingPolicy. Contributed by Mukul Kumar Singh. --- .../impl/TestContainerDeletionChoosingPolicy.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 331db40af650d..4344419e64aaa 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 @@ -28,6 +28,7 @@ import java.util.Random; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.RandomUtils; import org.apache.hadoop.hdds.scm.TestUtils; import org.apache.hadoop.hdfs.DFSUtil; import org.apache.hadoop.hdfs.server.datanode.StorageLocation; @@ -138,14 +139,14 @@ public void testTopNOrderedChoosingPolicy() throws IOException { int numContainers = 10; Random random = new Random(); - Map name2Count = new HashMap<>(); + Map name2Count = new HashMap<>(); // create [numContainers + 1] containers for (int i = 0; i <= numContainers; i++) { - String containerName = OzoneUtils.getRequestID(); - ContainerData data = new ContainerData(new Long(i), conf); + long containerId = RandomUtils.nextLong(); + ContainerData data = new ContainerData(containerId, conf); containerManager.createContainer(data); Assert.assertTrue( - containerManager.getContainerMap().containsKey(containerName)); + containerManager.getContainerMap().containsKey(containerId)); // don't create deletion blocks in the last container. if (i == numContainers) { @@ -155,7 +156,7 @@ public void testTopNOrderedChoosingPolicy() throws IOException { // create random number of deletion blocks and write to container db int deletionBlocks = random.nextInt(numContainers) + 1; // record value - name2Count.put(containerName, deletionBlocks); + name2Count.put(containerId, deletionBlocks); for (int j = 0; j <= deletionBlocks; j++) { MetadataStore metadata = KeyUtils.getDB(data, conf); String blk = "blk" + i + "-" + j;