hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-13969 AuthenticationTokenSecretManager is never stopped in RPCServer (Pankaj Kumar)
Date Fri, 26 Jun 2015 00:42:41 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 d476b56c4 -> 139cb4e97


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/139cb4e9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/139cb4e9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/139cb4e9

Branch: refs/heads/branch-1.2
Commit: 139cb4e979d2b7f19072bfd0873cb9f206a2038e
Parents: d476b56
Author: tedyu <yuzhihong@gmail.com>
Authored: Thu Jun 25 17:42:44 2015 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Thu Jun 25 17:42:44 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/139cb4e9/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();


Mime
View raw message