You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by wc...@apache.org on 2020/03/06 10:17:59 UTC
[hbase] branch branch-2 updated: HBASE-23939 Remove unused
variables from HBaseSaslRpcServer (#1239)
This is an automated email from the ASF dual-hosted git repository.
wchevreuil pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 389d75a HBASE-23939 Remove unused variables from HBaseSaslRpcServer (#1239)
389d75a is described below
commit 389d75a66eb25bb1e63941f42efdef5a48599804
Author: Wellington Ramos Chevreuil <wc...@apache.org>
AuthorDate: Fri Mar 6 10:05:04 2020 +0000
HBASE-23939 Remove unused variables from HBaseSaslRpcServer (#1239)
Signed-off-by: Josh Elser <el...@apache.org>
Signed-off-by: Jan Hentschel <ja...@apache.org>
Signed-off-by: Peter Somogyi <ps...@apache.org>
---
.../main/java/org/apache/hadoop/hbase/ipc/ServerRpcConnection.java | 3 +--
.../java/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java | 7 +------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ServerRpcConnection.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ServerRpcConnection.java
index b16b95e..d49a904 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ServerRpcConnection.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ServerRpcConnection.java
@@ -349,8 +349,7 @@ abstract class ServerRpcConnection implements Closeable {
try {
if (saslServer == null) {
saslServer =
- new HBaseSaslRpcServer(
- rpcServer.getConf(), provider, rpcServer.saslProps, rpcServer.secretManager);
+ new HBaseSaslRpcServer(provider, rpcServer.saslProps, rpcServer.secretManager);
RpcServer.LOG.debug("Created SASL server with mechanism={}",
provider.getSaslAuthMethod().getAuthMethod());
}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java
index 7ee24c7..071fef5 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java
@@ -27,7 +27,6 @@ import javax.security.sasl.Sasl;
import javax.security.sasl.SaslException;
import javax.security.sasl.SaslServer;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.security.provider.AttemptingUserProvidingSaslServer;
import org.apache.hadoop.hbase.security.provider.SaslServerAuthenticationProvider;
import org.apache.hadoop.security.UserGroupInformation;
@@ -35,8 +34,6 @@ import org.apache.hadoop.security.token.SecretManager;
import org.apache.hadoop.security.token.SecretManager.InvalidToken;
import org.apache.hadoop.security.token.TokenIdentifier;
import org.apache.yetus.audience.InterfaceAudience;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A utility class that encapsulates SASL logic for RPC server. Copied from
@@ -45,12 +42,10 @@ import org.slf4j.LoggerFactory;
@InterfaceAudience.Private
public class HBaseSaslRpcServer {
- private static final Logger LOG = LoggerFactory.getLogger(HBaseSaslRpcServer.class);
-
private final AttemptingUserProvidingSaslServer serverWithProvider;
private final SaslServer saslServer;
- public HBaseSaslRpcServer(Configuration conf, SaslServerAuthenticationProvider provider,
+ public HBaseSaslRpcServer(SaslServerAuthenticationProvider provider,
Map<String, String> saslProps, SecretManager<TokenIdentifier> secretManager)
throws IOException {
serverWithProvider = provider.createServer(secretManager, saslProps);