Skip to content

HADOOP-17608. Fix NPE in TestKMS #2828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoyuyao merged 3 commits into from
Mar 31, 2021
Merged

HADOOP-17608. Fix NPE in TestKMS #2828

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c18b72
HADOOP-17608. Fix NPE in TestKMS
aajisaka Mar 29, 2021
e20f7ea
Use ThreadUtils#findThreadsByName instead of ThreadGroup#enumarate
aajisaka Mar 30, 2021
650eb20
Verify that the active reloader threads is reduced by 1
aajisaka Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions ...mon-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
package org.apache.hadoop.crypto.key.kms.server;

import java.util.function.Supplier;

import org.apache.commons.lang3.ThreadUtils;
import org.apache.hadoop.thirdparty.com.google.common.cache.LoadingCache;
import org.apache.curator.test.TestingServer;
import org.apache.hadoop.conf.Configuration;
Expand Down Expand Up @@ -525,6 +527,7 @@ public void testStartStop(final boolean ssl, final boolean kerberos)
if (ssl) {
sslFactory = new SSLFactory(SSLFactory.Mode.CLIENT, conf);
try {
// the first reloader thread is created here
sslFactory.init();
} catch (GeneralSecurityException ex) {
throw new IOException(ex);
Expand All @@ -541,28 +544,23 @@ public Void call() throws Exception {
final URI uri = createKMSUri(getKMSUrl());

if (ssl) {
// the second reloader thread is created here
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
Collection<Thread> reloaderThreads =
ThreadUtils.findThreadsByName(SSL_RELOADER_THREAD_NAME);
// now there are two active reloader threads
assertEquals(2, reloaderThreads.size());
// Explicitly close the provider so we can verify
// the second reloader thread is shutdown
testKp.close();
boolean reloaderStillAlive = true;
for (int i = 0; i < 10; i++) {
reloaderStillAlive = reloaderThread.isAlive();
if (!reloaderStillAlive) break;
for (Thread thread : reloaderThreads) {
if (!thread.isAlive()) {
reloaderStillAlive = false;
break;
}
}
Thread.sleep(1000);
}
Assert.assertFalse("Reloader is still alive", reloaderStillAlive);
Expand Down