[hbase] 05/05: Revert "HBASE-25875 RegionServer failed to start with IllegalThreadStateException due to race condition in AuthenticationTokenSecretManager (#3250)"

[apurtell]

This is an automated email from the ASF dual-hosted git repository.

apurtell pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit bf518cff5684bd0c4ba77206298e6f3885e98a51
Author: Andrew Purtell <apurt...@apache.org>
AuthorDate: Wed May 19 12:29:24 2021 -0700

    Revert "HBASE-25875 RegionServer failed to start with 
IllegalThreadStateException due to race condition in 
AuthenticationTokenSecretManager (#3250)"
    
    This reverts commit 21c1dc7e6c5adfe80b2a452e0b534eac6a2d86c9.
---
 dev-support/spotbugs-exclude.xml                      | 19 -------------------
 .../org/apache/hadoop/hbase/ipc/NettyRpcServer.java   |  8 ++------
 .../org/apache/hadoop/hbase/ipc/SimpleRpcServer.java  |  8 ++------
 3 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/dev-support/spotbugs-exclude.xml b/dev-support/spotbugs-exclude.xml
index 2f0684e..1137f5f 100644
--- a/dev-support/spotbugs-exclude.xml
+++ b/dev-support/spotbugs-exclude.xml
@@ -252,23 +252,4 @@
     <Bug pattern="SC_START_IN_CTOR"/>
   </Match>
 
-  <Match>
-    <!--
-      False positives, NettyRpcServer#start & SimpleRpcServer#start are 
already synchronized and
-      there is check to ensure single initialization of authTokenSecretMgr 
field.
-      Ignore the warning, see HBASE-25875.
-    !-->
-    <Or>
-      <And>
-        <Class name="org.apache.hadoop.hbase.ipc.NettyRpcServer"/>
-        <Method name="start"/>
-      </And>
-      <And>
-        <Class name="org.apache.hadoop.hbase.ipc.SimpleRpcServer"/>
-        <Method name="start"/>
-      </And>
-    </Or>
-    <Bug pattern="ML_SYNC_ON_UPDATED_FIELD"/>
-  </Match>
-
 </FindBugsFilter>
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServer.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServer.java
index de958b8..f34cad5 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcServer.java
@@ -136,12 +136,8 @@ public class NettyRpcServer extends RpcServer {
     }
     authTokenSecretMgr = createSecretManager();
     if (authTokenSecretMgr != null) {
-      // Start AuthenticationTokenSecretManager in synchronized way to avoid 
race conditions in
-      // LeaderElector start. See HBASE-25875
-      synchronized (authTokenSecretMgr) {
-        setSecretManager(authTokenSecretMgr);
-        authTokenSecretMgr.start();
-      }
+      setSecretManager(authTokenSecretMgr);
+      authTokenSecretMgr.start();
     }
     this.authManager = new ServiceAuthorizationManager();
     HBasePolicyProvider.init(conf, authManager);
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcServer.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcServer.java
index 7818572..cbcbc9a 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcServer.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcServer.java
@@ -423,12 +423,8 @@ public class SimpleRpcServer extends RpcServer {
     }
     authTokenSecretMgr = createSecretManager();
     if (authTokenSecretMgr != null) {
-      // Start AuthenticationTokenSecretManager in synchronized way to avoid 
race conditions in
-      // LeaderElector start. See HBASE-25875
-      synchronized (authTokenSecretMgr) {
-        setSecretManager(authTokenSecretMgr);
-        authTokenSecretMgr.start();
-      }
+      setSecretManager(authTokenSecretMgr);
+      authTokenSecretMgr.start();
     }
     this.authManager = new ServiceAuthorizationManager();
     HBasePolicyProvider.init(conf, authManager);