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

HBASE-24174 Fix findbugs warning on ServiceAuthorizationManager for master branch (#1537) 

Signed-off-by: binlijin <binlijin@gmail.com>
Signed-off-by: Viraj Jasani <vjasani@apache.org>
This commit is contained in:
Reid Chan 2020-04-18 01:24:31 +08:00 committed by GitHub
parent 9f5a8bc3e4
commit db36cf71c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
View File

@ -122,8 +122,6 @@ public abstract class RpcServer implements RpcServerInterface,
protected SecretManager<TokenIdentifier> secretManager;
protected final Map<String, String> saslProps;
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value="IS2_INCONSISTENT_SYNC",
justification="Start is synchronized so authManager creation is single-threaded")
protected ServiceAuthorizationManager authManager;
/** This is set to Call object before Handler invokes an RPC and ybdie
@ -315,14 +313,9 @@ public abstract class RpcServer implements RpcServerInterface,
if (scheduler instanceof ConfigurationObserver) {
((ConfigurationObserver) scheduler).onConfigurationChange(newConf);
}
// Make sure authManager will read hbase-policy file
System.setProperty("hadoop.policy.file", "hbase-policy.xml");
synchronized (authManager) {
authManager.refresh(newConf, new HBasePolicyProvider());
if (authorize) {
refreshAuthManager(newConf, new HBasePolicyProvider());
}
LOG.info("Refreshed hbase-policy.xml successfully");
ProxyUsers.refreshSuperUserGroupsConfiguration(newConf);
LOG.info("Refreshed super and proxy users successfully");
}
protected void initReconfigurable(Configuration confToLoad) {
@ -349,12 +342,14 @@ public abstract class RpcServer implements RpcServerInterface,
}
@Override
public void refreshAuthManager(PolicyProvider pp) {
public synchronized void refreshAuthManager(Configuration conf, PolicyProvider pp) {
// Ignore warnings that this should be accessed in a static way instead of via an instance;
// it'll break if you go via static route.
synchronized (authManager) {
authManager.refresh(this.conf, pp);
}
System.setProperty("hadoop.policy.file", "hbase-policy.xml");
this.authManager.refresh(conf, pp);
LOG.info("Refreshed hbase-policy.xml successfully");
ProxyUsers.refreshSuperUserGroupsConfiguration(conf);
LOG.info("Refreshed super and proxy users successfully");
}
protected AuthenticationTokenSecretManager createSecretManager() {
@ -597,13 +592,11 @@ public abstract class RpcServer implements RpcServerInterface,
* @param addr InetAddress of incoming connection
* @throws AuthorizationException when the client isn't authorized to talk the protocol
*/
public void authorize(UserGroupInformation user, ConnectionHeader connection,
public synchronized void authorize(UserGroupInformation user, ConnectionHeader connection,
InetAddress addr) throws AuthorizationException {
if (authorize) {
Class<?> c = getServiceInterface(services, connection.getServiceName());
synchronized (authManager) {
authManager.authorize(user, c, getConf(), addr);
}
authManager.authorize(user, c, getConf(), addr);
}
}

3
hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServerInterface.java
View File

@ -22,6 +22,7 @@ package org.apache.hadoop.hbase.ipc;
import java.io.IOException;
import java.net.InetSocketAddress;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.CellScanner;
import org.apache.hadoop.hbase.io.ByteBuffAllocator;
import org.apache.hadoop.hbase.monitoring.MonitoredRPCHandler;
@ -86,7 +87,7 @@ public interface RpcServerInterface {
* @param pp
*/
@VisibleForTesting
void refreshAuthManager(PolicyProvider pp);
void refreshAuthManager(Configuration conf, PolicyProvider pp);
RpcScheduler getScheduler();

2
hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java
View File

@ -403,7 +403,7 @@ public class TestTokenAuthentication {
while (!server.isStarted() && !server.isStopped()) {
Thread.sleep(10);
}
server.rpcServer.refreshAuthManager(new PolicyProvider() {
server.rpcServer.refreshAuthManager(conf, new PolicyProvider() {
@Override
public Service[] getServices() {
return new Service [] {