From dcf2c8b3c88408303511e51ff93e8ce2b68750ba Mon Sep 17 00:00:00 2001 From: Steve Loughran Date: Mon, 1 Feb 2016 16:01:22 +0000 Subject: [PATCH] HDFS-9708. FSNamesystem.initAuditLoggers() doesn't trim classnames (Mingliang Liu via stevel) --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 + .../hdfs/server/namenode/FSNamesystem.java | 3 +- .../server/namenode/TestFSNamesystem.java | 78 +++++++++++++++++++ 3 files changed, 83 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index a1c5794da85..89c9e96c9bd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1687,6 +1687,9 @@ Release 2.8.0 - UNRELEASED HDFS-9566. Remove expensive 'BlocksMap#getStorages(Block b, final DatanodeStorage.State state)' method (Daryn Sharp via vinayakumarb) + HDFS-9708. FSNamesystem.initAuditLoggers() doesn't trim classnames + (Mingliang Liu via stevel) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java index e00a9894c12..1ecb2866a6e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -900,7 +900,8 @@ static RetryCache initRetryCache(Configuration conf) { private List initAuditLoggers(Configuration conf) { // Initialize the custom access loggers if configured. - Collection alClasses = conf.getStringCollection(DFS_NAMENODE_AUDIT_LOGGERS_KEY); + Collection alClasses = + conf.getTrimmedStringCollection(DFS_NAMENODE_AUDIT_LOGGERS_KEY); List auditLoggers = Lists.newArrayList(); if (alClasses != null && !alClasses.isEmpty()) { for (String className : alClasses) { diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java index 15fc40e4fe7..124225b12db 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java @@ -20,14 +20,18 @@ import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_EDITS_DIR_KEY; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_NAME_DIR_KEY; +import static org.hamcrest.CoreMatchers.either; +import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.*; import java.io.File; import java.io.IOException; +import java.net.InetAddress; import java.net.URI; import java.util.Collection; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.hdfs.DFSTestUtil; @@ -39,6 +43,7 @@ import org.apache.hadoop.hdfs.server.namenode.ha.HAContext; import org.apache.hadoop.hdfs.server.namenode.ha.HAState; import org.apache.hadoop.hdfs.server.namenode.snapshot.Snapshot; +import org.apache.hadoop.hdfs.server.namenode.top.TopAuditLogger; import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.test.GenericTestUtils.LogCapturer; import org.apache.log4j.Level; @@ -48,6 +53,7 @@ import org.mockito.Mockito; import org.mockito.internal.util.reflection.Whitebox; +import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -335,4 +341,76 @@ public void testSafemodeReplicationConf() throws IOException { SafeModeInfo safemodeInfo = fsn.getSafeModeInfoForTests(); assertTrue(safemodeInfo.toString().contains("Minimal replication = 2")); } + + @Test(timeout = 30000) + public void testInitAuditLoggers() throws IOException { + Configuration conf = new Configuration(); + FSImage fsImage = Mockito.mock(FSImage.class); + FSEditLog fsEditLog = Mockito.mock(FSEditLog.class); + Mockito.when(fsImage.getEditLog()).thenReturn(fsEditLog); + FSNamesystem fsn; + List auditLoggers; + + // Not to specify any audit loggers in config + conf.set(DFSConfigKeys.DFS_NAMENODE_AUDIT_LOGGERS_KEY, ""); + // Disable top logger + conf.setBoolean(DFSConfigKeys.NNTOP_ENABLED_KEY, false); + fsn = new FSNamesystem(conf, fsImage); + auditLoggers = fsn.getAuditLoggers(); + assertTrue(auditLoggers.size() == 1); + assertTrue(auditLoggers.get(0) instanceof FSNamesystem.DefaultAuditLogger); + + // Not to specify any audit loggers in config + conf.set(DFSConfigKeys.DFS_NAMENODE_AUDIT_LOGGERS_KEY, ""); + // Enable top logger + conf.setBoolean(DFSConfigKeys.NNTOP_ENABLED_KEY, true); + fsn = new FSNamesystem(conf, fsImage); + auditLoggers = fsn.getAuditLoggers(); + assertTrue(auditLoggers.size() == 2); + // the audit loggers order is not defined + for (AuditLogger auditLogger : auditLoggers) { + assertThat(auditLogger, + either(instanceOf(FSNamesystem.DefaultAuditLogger.class)) + .or(instanceOf(TopAuditLogger.class))); + } + + // Configure default audit loggers in config + conf.set(DFSConfigKeys.DFS_NAMENODE_AUDIT_LOGGERS_KEY, "default"); + // Enable top logger + conf.setBoolean(DFSConfigKeys.NNTOP_ENABLED_KEY, true); + fsn = new FSNamesystem(conf, fsImage); + auditLoggers = fsn.getAuditLoggers(); + assertTrue(auditLoggers.size() == 2); + for (AuditLogger auditLogger : auditLoggers) { + assertThat(auditLogger, + either(instanceOf(FSNamesystem.DefaultAuditLogger.class)) + .or(instanceOf(TopAuditLogger.class))); + } + + // Configure default and customized audit loggers in config with whitespaces + conf.set(DFSConfigKeys.DFS_NAMENODE_AUDIT_LOGGERS_KEY, + " default, org.apache.hadoop.hdfs.server.namenode.TestFSNamesystem$DummyAuditLogger "); + // Enable top logger + conf.setBoolean(DFSConfigKeys.NNTOP_ENABLED_KEY, true); + fsn = new FSNamesystem(conf, fsImage); + auditLoggers = fsn.getAuditLoggers(); + assertTrue(auditLoggers.size() == 3); + for (AuditLogger auditLogger : auditLoggers) { + assertThat(auditLogger, + either(instanceOf(FSNamesystem.DefaultAuditLogger.class)) + .or(instanceOf(TopAuditLogger.class)) + .or(instanceOf(DummyAuditLogger.class))); + } + } + + static class DummyAuditLogger implements AuditLogger { + @Override + public void initialize(Configuration conf) { + } + + @Override + public void logAuditEvent(boolean succeeded, String userName, + InetAddress addr, String cmd, String src, String dst, FileStatus stat) { + } + } }