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

HADOOP-11815. HttpServer2 should destroy SignerSecretProvider when it stops. Contributed by Rohith.

This commit is contained in:
Haohui Mai 2015-04-09 10:58:12 -07:00
parent 9a111fcd1d
commit d665d11f99
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -729,7 +729,10 @@ Release 2.7.0 - UNRELEASED
HADOOP-11796. Skip TestShellBasedIdMapping.testStaticMapUpdate on Windows. HADOOP-11796. Skip TestShellBasedIdMapping.testStaticMapUpdate on Windows.
(Xiaoyu Yao via cnauroth) (Xiaoyu Yao via cnauroth)
HADOOP-11815. HttpServer2 should destroy SignerSecretProvider when it
stops. (Rohith via wheat9)
Release 2.6.1 - UNRELEASED Release 2.6.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

5
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
View File

@ -140,6 +140,7 @@ public final class HttpServer2 implements FilterContainer {
protected final List<String> filterNames = new ArrayList<>(); protected final List<String> filterNames = new ArrayList<>();
static final String STATE_DESCRIPTION_ALIVE = " - alive"; static final String STATE_DESCRIPTION_ALIVE = " - alive";
static final String STATE_DESCRIPTION_NOT_LIVE = " - not live"; static final String STATE_DESCRIPTION_NOT_LIVE = " - not live";
private final SignerSecretProvider secretProvider;
/** /**
* Class to construct instances of HTTP server with specific options. * Class to construct instances of HTTP server with specific options.
@ -335,7 +336,7 @@ public final class HttpServer2 implements FilterContainer {
this.adminsAcl = b.adminsAcl; this.adminsAcl = b.adminsAcl;
this.webAppContext = createWebAppContext(b.name, b.conf, adminsAcl, appDir); this.webAppContext = createWebAppContext(b.name, b.conf, adminsAcl, appDir);
try { try {
SignerSecretProvider secretProvider = this.secretProvider =
constructSecretProvider(b, webAppContext.getServletContext()); constructSecretProvider(b, webAppContext.getServletContext());
this.webAppContext.getServletContext().setAttribute this.webAppContext.getServletContext().setAttribute
(AuthenticationFilter.SIGNER_SECRET_PROVIDER_ATTRIBUTE, (AuthenticationFilter.SIGNER_SECRET_PROVIDER_ATTRIBUTE,
@ -945,6 +946,8 @@ public final class HttpServer2 implements FilterContainer {
} }
try { try {
// explicitly destroy the secrete provider
secretProvider.destroy();
// clear & stop webAppContext attributes to avoid memory leaks. // clear & stop webAppContext attributes to avoid memory leaks.
webAppContext.clearAttributes(); webAppContext.clearAttributes();
webAppContext.stop(); webAppContext.stop();