From cfba6ac9512b180d598a7a477a1ee0ea251e7b41 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Mon, 7 Oct 2019 13:08:14 +0200 Subject: [PATCH] HDDS-2264. Improve output of TestOzoneContainer Signed-off-by: Anu Engineer --- .../ozoneimpl/TestOzoneContainer.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java index b0d3a0f3b7b..2d679a1cb45 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java @@ -41,12 +41,15 @@ import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainer; import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainerData; import org.apache.hadoop.ozone.container.keyvalue.helpers.BlockUtils; +import org.apache.hadoop.test.LambdaTestUtils; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.mockito.Mockito; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Random; import java.util.UUID; @@ -62,6 +65,9 @@ */ public class TestOzoneContainer { + private static final Logger LOG = + LoggerFactory.getLogger(TestOzoneContainer.class); + @Rule public TemporaryFolder folder = new TemporaryFolder(); @@ -148,7 +154,6 @@ public void testBuildContainerMap() throws Exception { @Test public void testContainerCreateDiskFull() throws Exception { long containerSize = (long) StorageUnit.MB.toBytes(100); - boolean diskSpaceException = false; // Format the volumes for (HddsVolume volume : volumeSet.getVolumesList()) { @@ -164,16 +169,14 @@ public void testContainerCreateDiskFull() throws Exception { keyValueContainer = new KeyValueContainer(keyValueContainerData, conf); // we expect an out of space Exception - try { - keyValueContainer.create(volumeSet, volumeChoosingPolicy, scmId); - } catch (StorageContainerException e) { - if (e.getResult() == DISK_OUT_OF_SPACE) { - diskSpaceException = true; - } + StorageContainerException e = LambdaTestUtils.intercept( + StorageContainerException.class, + () -> keyValueContainer.create(volumeSet, volumeChoosingPolicy, scmId) + ); + if (!DISK_OUT_OF_SPACE.equals(e.getResult())) { + LOG.info("Unexpected error during container creation", e); } - - // Test failed if there was no exception - assertEquals(true, diskSpaceException); + assertEquals(DISK_OUT_OF_SPACE, e.getResult()); } //verify committed space on each volume