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 we...@apache.org on 2021/04/20 13:12:35 UTC
[hadoop] branch branch-3.1 updated: HADOOP-17608. Fix TestKMS
failure (#2880) (#2929)
This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new cd8ecd4 HADOOP-17608. Fix TestKMS failure (#2880) (#2929)
cd8ecd4 is described below
commit cd8ecd490c638d863edd7bfbd18db852ead7f921
Author: Wei-Chiu Chuang <we...@apache.org>
AuthorDate: Sun Apr 18 22:13:24 2021 -0700
HADOOP-17608. Fix TestKMS failure (#2880) (#2929)
Reviewed-by: Masatake Iwasaki <iw...@apache.org>
(cherry picked from commit 2bd810a5075e6b9c15fde22e43ac9bcf2a6c22f9)
(cherry picked from commit 77315abe474ad3a17507bfc67956b85327f487e6)
Conflicts:
hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java
Co-authored-by: Akira Ajisaka <aa...@apache.org>
(cherry picked from commit 289c7d91b4ac42e49533b22bb1d604bcd503753a)
---
.../hadoop/crypto/key/kms/server/TestKMS.java | 52 +---------------------
1 file changed, 1 insertion(+), 51 deletions(-)
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 d0be3ad..e839a8a 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
@@ -17,7 +17,6 @@
*/
package org.apache.hadoop.crypto.key.kms.server;
-import java.util.function.Supplier;
import com.google.common.cache.LoadingCache;
import org.apache.curator.test.TestingServer;
import org.apache.hadoop.conf.Configuration;
@@ -91,7 +90,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import java.util.Set;
import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.LinkedBlockingQueue;
@@ -112,9 +110,6 @@ import static org.mockito.Mockito.when;
public class TestKMS {
private static final Logger LOG = LoggerFactory.getLogger(TestKMS.class);
- private static final String SSL_RELOADER_THREAD_NAME =
- "Truststore reloader thread";
-
private SSLFactory sslFactory;
// Keep track of all key providers created during a test case, so they can be
@@ -539,34 +534,6 @@ public class TestKMS {
url.getProtocol().equals("https"));
final URI uri = createKMSUri(getKMSUrl());
- if (ssl) {
- KeyProvider testKp = createProvider(uri, conf);
- ThreadGroup threadGroup = Thread.currentThread().getThreadGroup();
- while (threadGroup.getParent() != null) {
- threadGroup = threadGroup.getParent();
- }
- Thread[] threads = new Thread[threadGroup.activeCount()];
- threadGroup.enumerate(threads);
- Thread reloaderThread = null;
- for (Thread thread : threads) {
- if ((thread.getName() != null)
- && (thread.getName().contains(SSL_RELOADER_THREAD_NAME))) {
- reloaderThread = thread;
- }
- }
- 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++) {
- reloaderStillAlive = reloaderThread.isAlive();
- if (!reloaderStillAlive) break;
- Thread.sleep(1000);
- }
- Assert.assertFalse("Reloader is still alive", reloaderStillAlive);
- }
-
if (kerberos) {
for (String user : new String[]{"client", "client/host"}) {
doAs(user, new PrivilegedExceptionAction<Void>() {
@@ -2362,8 +2329,7 @@ public class TestKMS {
return null;
}
});
- // Close the client provider. We will verify all providers'
- // Truststore reloader threads are closed later.
+ // Close the client provider.
kp.close();
return null;
} finally {
@@ -2374,22 +2340,6 @@ public class TestKMS {
return null;
}
});
-
- // verify that providers created by KMSTokenRenewer are closed.
- if (ssl) {
- GenericTestUtils.waitFor(new Supplier<Boolean>() {
- @Override
- public Boolean get() {
- final Set<Thread> threadSet = Thread.getAllStackTraces().keySet();
- for (Thread t : threadSet) {
- if (t.getName().contains(SSL_RELOADER_THREAD_NAME)) {
- return false;
- }
- }
- return true;
- }
- }, 1000, 10000);
- }
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org