Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-13847. KMSWebApp should close KeyProviderCryptoExtension. Contributed by John Zhuge. 

(cherry picked from commit 291df5c7fb)
This commit is contained in:
Xiao Chen 2016-12-05 09:34:39 -08:00
parent b36af9b76c
commit 7e58eec620
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/KeyProviderCryptoExtension.java
View File

@ -427,8 +427,9 @@ public static KeyProviderCryptoExtension createKeyProviderCryptoExtension(
@Override @Override
public void close() throws IOException { public void close() throws IOException {
if (getKeyProvider() != null) { KeyProvider provider = getKeyProvider();
getKeyProvider().close(); if (provider != null && provider != this) {
provider.close();
} }
} }

7
hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
View File

@ -40,9 +40,9 @@
import javax.servlet.ServletContextListener; import javax.servlet.ServletContextListener;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.net.URL; import java.net.URL;
import java.util.List;
@InterfaceAudience.Private @InterfaceAudience.Private
public class KMSWebApp implements ServletContextListener { public class KMSWebApp implements ServletContextListener {
@ -215,6 +215,11 @@ public void contextInitialized(ServletContextEvent sce) {
@Override @Override
public void contextDestroyed(ServletContextEvent sce) { public void contextDestroyed(ServletContextEvent sce) {
try {
keyProviderCryptoExtension.close();
} catch (IOException ioe) {
LOG.error("Error closing KeyProviderCryptoExtension", ioe);
}
kmsAudit.shutdown(); kmsAudit.shutdown();
kmsAcls.stopReloader(); kmsAcls.stopReloader();
jmxReporter.stop(); jmxReporter.stop();