HADOOP-15313. TestKMS should close providers.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c22d62b3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c22d62b3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c22d62b3 Branch: refs/heads/HDFS-12943 Commit: c22d62b338cb16d93c4576a9c634041e3610a116 Parents: 27d60a1 Author: Xiao Chen <x...@apache.org> Authored: Mon Mar 26 15:59:17 2018 -0700 Committer: Xiao Chen <x...@apache.org> Committed: Mon Mar 26 15:59:32 2018 -0700 ---------------------------------------------------------------------- .../apache/hadoop/io/MultipleIOException.java | 10 ++++++ .../hadoop/crypto/key/kms/server/TestKMS.java | 38 ++++++++++++++++---- 2 files changed, 41 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c22d62b3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/MultipleIOException.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/MultipleIOException.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/MultipleIOException.java index 66c1ab1..c9d7ade 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/MultipleIOException.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/MultipleIOException.java @@ -76,5 +76,15 @@ public class MultipleIOException extends IOException { public IOException build() { return createIOException(exceptions); } + + /** + * @return whether any exception was added. + */ + public boolean isEmpty() { + if (exceptions == null) { + return true; + } + return exceptions.isEmpty(); + } } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/c22d62b3/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 1189fbf..1517b04 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 @@ -35,6 +35,7 @@ import org.apache.hadoop.crypto.key.kms.LoadBalancingKMSClientProvider; import org.apache.hadoop.crypto.key.kms.ValueQueue; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.io.MultipleIOException; import org.apache.hadoop.minikdc.MiniKdc; import org.apache.hadoop.security.Credentials; import org.apache.hadoop.security.SecurityUtil; @@ -84,6 +85,7 @@ import java.util.Collection; import java.util.Date; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Properties; @@ -111,6 +113,10 @@ public class TestKMS { private SSLFactory sslFactory; + // Keep track of all key providers created during a test case, so they can be + // closed at test tearDown. + private List<KeyProvider> providersCreated = new LinkedList<>(); + @Rule public final Timeout testTimeout = new Timeout(180000); @@ -144,13 +150,17 @@ public class TestKMS { protected KeyProvider createProvider(URI uri, Configuration conf) throws IOException { - return new LoadBalancingKMSClientProvider( - new KMSClientProvider[] { new KMSClientProvider(uri, conf) }, conf); + final KeyProvider ret = new LoadBalancingKMSClientProvider( + new KMSClientProvider[] {new KMSClientProvider(uri, conf)}, conf); + providersCreated.add(ret); + return ret; } private KMSClientProvider createKMSClientProvider(URI uri, Configuration conf) throws IOException { - return new KMSClientProvider(uri, conf); + final KMSClientProvider ret = new KMSClientProvider(uri, conf); + providersCreated.add(ret); + return ret; } protected <T> T runServer(String keystore, String password, File confDir, @@ -311,13 +321,28 @@ public class TestKMS { } @After - public void tearDownMiniKdc() throws Exception { + public void tearDown() throws Exception { if (kdc != null) { kdc.stop(); kdc = null; } UserGroupInformation.setShouldRenewImmediatelyForTests(false); UserGroupInformation.reset(); + if (!providersCreated.isEmpty()) { + final MultipleIOException.Builder b = new MultipleIOException.Builder(); + for (KeyProvider kp : providersCreated) { + try { + kp.close(); + } catch (IOException e) { + LOG.error("Failed to close key provider.", e); + b.add(e); + } + } + providersCreated.clear(); + if (!b.isEmpty()) { + throw b.build(); + } + } } private <T> T doAs(String user, final PrivilegedExceptionAction<T> action) @@ -449,6 +474,8 @@ public class TestKMS { } } Assert.assertTrue("Reloader is not alive", reloaderThread.isAlive()); + // Explicitly close the provider so we can verify the internal thread + // is shutdown testKp.close(); boolean reloaderStillAlive = true; for (int i = 0; i < 10; i++) { @@ -476,7 +503,6 @@ public class TestKMS { .addDelegationTokens("myuser", new Credentials()); Assert.assertEquals(1, tokens.length); Assert.assertEquals("kms-dt", tokens[0].getKind().toString()); - kp.close(); return null; } }); @@ -494,7 +520,6 @@ public class TestKMS { .addDelegationTokens("myuser", new Credentials()); Assert.assertEquals(1, tokens.length); Assert.assertEquals("kms-dt", tokens[0].getKind().toString()); - kp.close(); } return null; } @@ -2533,7 +2558,6 @@ public class TestKMS { @Test public void testTGTRenewal() throws Exception { - tearDownMiniKdc(); Properties kdcConf = MiniKdc.createConf(); kdcConf.setProperty(MiniKdc.MAX_TICKET_LIFETIME, "3"); kdcConf.setProperty(MiniKdc.MIN_TICKET_LIFETIME, "3"); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
