You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2015/06/26 02:41:47 UTC
hbase git commit: HBASE-13969 AuthenticationTokenSecretManager is
never stopped in RPCServer (Pankaj Kumar)
Repository: hbase
Updated Branches:
refs/heads/branch-1 be599ddf8 -> 6e9a30280
HBASE-13969 AuthenticationTokenSecretManager is never stopped in RPCServer (Pankaj Kumar)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6e9a3028
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6e9a3028
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6e9a3028
Branch: refs/heads/branch-1
Commit: 6e9a30280871987c35dbb67c5d3217915f105d01
Parents: be599dd
Author: tedyu <yu...@gmail.com>
Authored: Thu Jun 25 17:41:54 2015 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Thu Jun 25 17:41:54 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/ipc/RpcServer.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/6e9a3028/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
index 07a3033..1460926 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
@@ -251,6 +251,7 @@ public class RpcServer implements RpcServerInterface {
//of client connections
private Listener listener = null;
protected Responder responder = null;
+ protected AuthenticationTokenSecretManager authTokenSecretMgr = null;
protected int numConnections = 0;
protected HBaseRPCErrorHandler errorHandler = null;
@@ -2054,10 +2055,10 @@ public class RpcServer implements RpcServerInterface {
@Override
public synchronized void start() {
if (started) return;
- AuthenticationTokenSecretManager mgr = createSecretManager();
- if (mgr != null) {
- setSecretManager(mgr);
- mgr.start();
+ authTokenSecretMgr = createSecretManager();
+ if (authTokenSecretMgr != null) {
+ setSecretManager(authTokenSecretMgr);
+ authTokenSecretMgr.start();
}
this.authManager = new ServiceAuthorizationManager();
HBasePolicyProvider.init(conf, authManager);
@@ -2218,6 +2219,10 @@ public class RpcServer implements RpcServerInterface {
public synchronized void stop() {
LOG.info("Stopping server on " + port);
running = false;
+ if (authTokenSecretMgr != null) {
+ authTokenSecretMgr.stop();
+ authTokenSecretMgr = null;
+ }
listener.interrupt();
listener.doStop();
responder.interrupt();