From 84d24475b9e92fce25439763cb62c32271c63844 Mon Sep 17 00:00:00 2001 From: Ethan Rose Date: Mon, 18 Jul 2022 11:29:44 -0700 Subject: [PATCH] Try out fixing test log scanning --- .../hadoop/ozone/container/common/volume/TestVolumeSet.java | 4 ++-- .../main/java/org/apache/ozone/test/GenericTestUtils.java | 5 ----- .../om/request/bucket/TestOMBucketSetPropertyRequest.java | 4 ++-- .../ozone/om/request/volume/TestOMVolumeSetQuotaRequest.java | 4 ++-- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java index f0869c9c6f9..485ee9952e5 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/volume/TestVolumeSet.java @@ -20,7 +20,7 @@ import java.io.IOException; import org.apache.commons.io.FileUtils; -import org.apache.commons.logging.LogFactory; +import org.slf4j.LoggerFactory; import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.hdds.DFSConfigKeysLegacy; import org.apache.hadoop.hdds.HddsConfigKeys; @@ -171,7 +171,7 @@ public void testRemoveVolume() throws Exception { // Attempting to remove a volume which does not exist in VolumeSet should // log a warning. LogCapturer logs = LogCapturer.captureLogs( - LogFactory.getLog(MutableVolumeSet.class)); + LoggerFactory.getLogger(MutableVolumeSet.class)); volumeSet.removeVolume(HddsVolumeUtil.getHddsRoot(volume1)); assertEquals(1, volumeSet.getVolumesList().size()); String expectedLogMessage = "Volume : " + diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java index 975f2c5f19b..ad0ca678775 100644 --- a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java +++ b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java @@ -252,11 +252,6 @@ public static final class LogCapturer { private WriterAppender appender; private Logger logger; - public static LogCapturer captureLogs(Log l) { - Logger logger = ((Log4JLogger) l).getLogger(); - return new LogCapturer(logger, getDefaultLayout()); - } - public static LogCapturer captureLogs(org.slf4j.Logger logger) { return new LogCapturer(toLog4j(logger), getDefaultLayout()); } diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketSetPropertyRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketSetPropertyRequest.java index e7cd95c469d..f2ed7db0da8 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketSetPropertyRequest.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketSetPropertyRequest.java @@ -21,7 +21,7 @@ import java.util.UUID; -import org.apache.commons.logging.LogFactory; +import org.slf4j.LoggerFactory; import org.apache.hadoop.ozone.om.helpers.BucketLayout; import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; import org.apache.hadoop.ozone.om.request.OMRequestTestUtils; @@ -184,7 +184,7 @@ public void testValidateAndUpdateCacheWithQuota() throws Exception { new OMBucketSetPropertyRequest(omRequest); GenericTestUtils.LogCapturer logs = GenericTestUtils.LogCapturer - .captureLogs(LogFactory.getLog(OMBucketSetPropertyRequest.class)); + .captureLogs(LoggerFactory.getLogger(OMBucketSetPropertyRequest.class)); OMClientResponse omClientResponse = omBucketSetPropertyRequest .validateAndUpdateCache(ozoneManager, 1, diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetQuotaRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetQuotaRequest.java index 6539f481cb3..4e74f3061f8 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetQuotaRequest.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/volume/TestOMVolumeSetQuotaRequest.java @@ -20,7 +20,7 @@ import java.util.UUID; -import org.apache.commons.logging.LogFactory; +import org.slf4j.LoggerFactory; import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs; import org.apache.hadoop.ozone.om.request.OMRequestTestUtils; import org.apache.hadoop.ozone.om.response.OMClientResponse; @@ -186,7 +186,7 @@ public void testValidateAndUpdateCacheWithQuota() throws Exception { new OMVolumeSetQuotaRequest(originalRequest); GenericTestUtils.LogCapturer logs = GenericTestUtils.LogCapturer - .captureLogs(LogFactory.getLog(OMVolumeSetQuotaRequest.class)); + .captureLogs(LoggerFactory.getLogger(OMVolumeSetQuotaRequest.class)); OMClientResponse omClientResponse = omVolumeSetQuotaRequest .validateAndUpdateCache(ozoneManager, 1,