You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by in...@apache.org on 2021/02/01 17:40:24 UTC
[hadoop] branch trunk updated: HADOOP-17482: Remove Commons Logger
from FileSystem Class (#2633)
This is an automated email from the ASF dual-hosted git repository.
inigoiri 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 21a3fc3 HADOOP-17482: Remove Commons Logger from FileSystem Class (#2633)
21a3fc3 is described below
commit 21a3fc3d2d773d000724dfccf8c7666fbfdefc8a
Author: belugabehr <12...@users.noreply.github.com>
AuthorDate: Mon Feb 1 12:40:01 2021 -0500
HADOOP-17482: Remove Commons Logger from FileSystem Class (#2633)
---
.../java/org/apache/hadoop/fs/DelegationTokenRenewer.java | 6 ++----
.../src/main/java/org/apache/hadoop/fs/FileSystem.java | 14 ++------------
.../main/java/org/apache/hadoop/fs/RawLocalFileSystem.java | 2 +-
.../main/java/org/apache/hadoop/fs/viewfs/InodeTree.java | 7 +++----
.../java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java | 13 ++++---------
.../java/org/apache/hadoop/fs/TestFilterFileSystem.java | 4 ++--
.../src/test/java/org/apache/hadoop/fs/TestFilterFs.java | 4 ++--
.../test/java/org/apache/hadoop/fs/TestFcHdfsSetUMask.java | 13 -------------
.../java/org/apache/hadoop/hdfs/TestListFilesInDFS.java | 7 -------
.../org/apache/hadoop/hdfs/TestListFilesInFileContext.java | 6 ------
.../server/nodemanager/WindowsSecureContainerExecutor.java | 2 +-
11 files changed, 17 insertions(+), 61 deletions(-)
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java
index 193c52c..19c29cf 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java
@@ -223,7 +223,7 @@ public class DelegationTokenRenewer
if (action.token != null) {
queue.add(action);
} else {
- fs.LOG.error("does not have a token for renewal");
+ FileSystem.LOG.error("does not have a token for renewal");
}
return action;
}
@@ -247,7 +247,6 @@ public class DelegationTokenRenewer
}
}
- @SuppressWarnings("static-access")
@Override
public void run() {
for(;;) {
@@ -260,8 +259,7 @@ public class DelegationTokenRenewer
} catch (InterruptedException ie) {
return;
} catch (Exception ie) {
- action.weakFs.get().LOG.warn("Failed to renew token, action=" + action,
- ie);
+ FileSystem.LOG.warn("Failed to renew token, action=" + action, ie);
}
}
}
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
index 6cb0109..c6cf941 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
@@ -48,8 +48,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
@@ -183,7 +181,7 @@ public abstract class FileSystem extends Configured
* so must be considered something to only be changed with care.
*/
@InterfaceAudience.Private
- public static final Log LOG = LogFactory.getLog(FileSystem.class);
+ public static final Logger LOG = LoggerFactory.getLogger(FileSystem.class);
/**
* The SLF4J logger to use in logging within the FileSystem class itself.
@@ -3391,15 +3389,7 @@ public abstract class FileSystem extends Configured
LOGGER.info("Full exception loading: {}", fs, e);
}
} catch (ServiceConfigurationError ee) {
- LOG.warn("Cannot load filesystem: " + ee);
- Throwable cause = ee.getCause();
- // print all the nested exception messages
- while (cause != null) {
- LOG.warn(cause.toString());
- cause = cause.getCause();
- }
- // and at debug: the full stack
- LOG.debug("Stack Trace", ee);
+ LOGGER.warn("Cannot load filesystem", ee);
}
}
FILE_SYSTEMS_LOADED = true;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
index 2aeb17b..4480253 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
@@ -318,7 +318,7 @@ public class RawLocalFileSystem extends FileSystem {
success = true;
} finally {
if (!success) {
- IOUtils.cleanup(LOG, this.fos);
+ IOUtils.cleanupWithLogger(LOG, this.fos);
}
}
}
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java
index fd7b561..79c323a 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/InodeTree.java
@@ -630,10 +630,9 @@ abstract class InodeTree<T> {
.append(theUri.getScheme()).append("://").append(mountTableName)
.append("/").toString());
}
- StringBuilder msg =
- new StringBuilder("Empty mount table detected for ").append(theUri)
- .append(" and considering itself as a linkFallback.");
- FileSystem.LOG.info(msg.toString());
+ FileSystem.LOG
+ .info("Empty mount table detected for {} and considering itself "
+ + "as a linkFallback.", theUri);
rootFallbackLink =
new INodeLink<T>(mountTableName, ugi, getTargetFileSystem(theUri),
theUri);
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
index 473b514..708d361 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
@@ -1289,10 +1289,8 @@ public class ViewFileSystem extends FileSystem {
.create(fileToCreate, permission, overwrite, bufferSize,
replication, blockSize, progress);
} catch (IOException e) {
- StringBuilder msg =
- new StringBuilder("Failed to create file:").append(fileToCreate)
- .append(" at fallback : ").append(linkedFallbackFs.getUri());
- LOG.error(msg.toString(), e);
+ LOG.error("Failed to create file: {} at fallback: {}", fileToCreate,
+ linkedFallbackFs.getUri(), e);
throw e;
}
}
@@ -1523,11 +1521,8 @@ public class ViewFileSystem extends FileSystem {
return linkedFallbackFs.mkdirs(dirToCreate, permission);
} catch (IOException e) {
if (LOG.isDebugEnabled()) {
- StringBuilder msg =
- new StringBuilder("Failed to create ").append(dirToCreate)
- .append(" at fallback : ")
- .append(linkedFallbackFs.getUri());
- LOG.debug(msg.toString(), e);
+ LOG.debug("Failed to create: {} at fallback: {}", dirToCreate,
+ linkedFallbackFs.getUri(), e);
}
throw e;
}
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java
index 6cd4506..5ed4d9b 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java
@@ -28,7 +28,6 @@ import java.net.URI;
import java.util.EnumSet;
import java.util.Iterator;
-import org.apache.commons.logging.Log;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.fs.Options.CreateOpts;
@@ -39,10 +38,11 @@ import org.apache.hadoop.security.token.DelegationTokenIssuer;
import org.apache.hadoop.util.Progressable;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
public class TestFilterFileSystem {
- private static final Log LOG = FileSystem.LOG;
+ private static final Logger LOG = FileSystem.LOG;
private static final Configuration conf = new Configuration();
@BeforeClass
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFs.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFs.java
index 5ed743f..3969248 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFs.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFs.java
@@ -23,14 +23,14 @@ import java.lang.reflect.Modifier;
import java.net.URI;
import java.util.Iterator;
-import org.apache.commons.logging.Log;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.viewfs.ConfigUtil;
import org.junit.Test;
+import org.slf4j.Logger;
public class TestFilterFs {
- private static final Log LOG = FileSystem.LOG;
+ private static final Logger LOG = FileSystem.LOG;
public static class DontCheck {
public void checkScheme(URI uri, String supportedScheme) { }
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsSetUMask.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsSetUMask.java
index 0916347..eef2235 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsSetUMask.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsSetUMask.java
@@ -29,10 +29,7 @@ import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.hadoop.hdfs.HdfsConfiguration;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.hadoop.test.GenericTestUtils;
-import org.apache.hadoop.util.StringUtils;
import static org.apache.hadoop.fs.FileContextTestHelper.*;
-import org.apache.log4j.Level;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -100,16 +97,6 @@ public class TestFcHdfsSetUMask {
cluster.shutdown();
}
}
-
- {
- try {
- GenericTestUtils.setLogLevel(FileSystem.LOG, Level.DEBUG);
- }
- catch(Exception e) {
- System.out.println("Cannot change log level\n"
- + StringUtils.stringifyException(e));
- }
- }
@Before
public void setUp() throws Exception {
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInDFS.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInDFS.java
index 53b21d0..7bb624e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInDFS.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInDFS.java
@@ -17,11 +17,8 @@
*/
package org.apache.hadoop.hdfs;
-import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.TestListFiles;
-import org.apache.hadoop.test.GenericTestUtils;
-import org.apache.log4j.Level;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -29,10 +26,6 @@ import org.junit.BeforeClass;
* This class tests the FileStatus API.
*/
public class TestListFilesInDFS extends TestListFiles {
- {
- GenericTestUtils.setLogLevel(FileSystem.LOG, Level.ALL);
- }
-
private static MiniDFSCluster cluster;
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInFileContext.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInFileContext.java
index 1e42417..2f73a39 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInFileContext.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInFileContext.java
@@ -29,14 +29,11 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CreateFlag;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileContext;
-import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.LocatedFileStatus;
import org.apache.hadoop.fs.Options;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.RemoteIterator;
import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.test.GenericTestUtils;
-import org.apache.log4j.Level;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -46,9 +43,6 @@ import org.junit.Test;
* This class tests the FileStatus API.
*/
public class TestListFilesInFileContext {
- {
- GenericTestUtils.setLogLevel(FileSystem.LOG, Level.ALL);
- }
static final long seed = 0xDEADBEEFL;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/WindowsSecureContainerExecutor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/WindowsSecureContainerExecutor.java
index c4d6918..c13efad 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/WindowsSecureContainerExecutor.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/WindowsSecureContainerExecutor.java
@@ -374,7 +374,7 @@ public class WindowsSecureContainerExecutor extends DefaultContainerExecutor {
return os;
} finally {
if (!success) {
- IOUtils.cleanup(LOG, os);
+ IOUtils.cleanupWithLogger(LOG, os);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org