HADOOP-14949. TestKMS#testACLs fails intermittently.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b7ff624c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b7ff624c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b7ff624c Branch: refs/heads/YARN-1011 Commit: b7ff624c767f76ca007d695afdc7a3815fceb04c Parents: 1fcbe7c Author: Xiao Chen <x...@apache.org> Authored: Mon Oct 16 13:53:31 2017 -0700 Committer: Xiao Chen <x...@apache.org> Committed: Mon Oct 16 14:19:31 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/crypto/key/kms/server/KMSACLs.java | 4 ++++ .../apache/hadoop/crypto/key/kms/server/KMSConfiguration.java | 6 ++++++ .../java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java | 6 +++--- 3 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b7ff624c/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSACLs.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSACLs.java b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSACLs.java index 096f756..b02f34e 100644 --- a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSACLs.java +++ b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSACLs.java @@ -326,4 +326,8 @@ public class KMSACLs implements Runnable, KeyACLs { || whitelistKeyAcls.containsKey(opType)); } + @VisibleForTesting + void forceNextReloadForTesting() { + lastReload = 0; + } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/b7ff624c/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java index cf02dd1..df17ef5 100644 --- a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java +++ b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSConfiguration.java @@ -20,6 +20,8 @@ package org.apache.hadoop.crypto.key.kms.server; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.net.MalformedURLException; @@ -31,6 +33,8 @@ import java.net.URL; @InterfaceAudience.Private public class KMSConfiguration { + static final Logger LOG = LoggerFactory.getLogger(KMSConfiguration.class); + public static final String KMS_CONFIG_DIR = "kms.config.dir"; public static final String KMS_DEFAULT_XML = "kms-default.xml"; public static final String KMS_SITE_XML = "kms-site.xml"; @@ -138,6 +142,8 @@ public class KMSConfiguration { "' must be an absolute path: " + confDir); } File f = new File(confDir, KMS_ACLS_XML); + LOG.trace("Checking file {}, modification time is {}, last reload time is" + + " {}", f.getPath(), f.lastModified(), time); // at least 100ms newer than time, we do this to ensure the file // has been properly closed/flushed newer = f.lastModified() - time > 100; http://git-wip-us.apache.org/repos/asf/hadoop/blob/b7ff624c/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java b/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java index 45546f2..30e84eb 100644 --- a/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java +++ b/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java @@ -54,6 +54,7 @@ import org.junit.Test; import org.junit.rules.Timeout; import org.mockito.Mockito; import org.mockito.internal.util.reflection.Whitebox; +import org.slf4j.event.Level; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1637,13 +1638,12 @@ public class TestKMS { //stop the reloader, to avoid running while we are writing the new file KMSWebApp.getACLs().stopReloader(); + GenericTestUtils.setLogLevel(KMSConfiguration.LOG, Level.TRACE); // test ACL reloading - Thread.sleep(10); // to ensure the ACLs file modifiedTime is newer conf.set(KMSACLs.Type.CREATE.getAclConfigKey(), "foo"); conf.set(KMSACLs.Type.GENERATE_EEK.getAclConfigKey(), "foo"); writeConf(testDir, conf); - Thread.sleep(1000); - + KMSWebApp.getACLs().forceNextReloadForTesting(); KMSWebApp.getACLs().run(); // forcing a reload by hand. // should not be able to create a key now --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
