From 39978b80abc56ef7d2580c3511a6cf9e044e4581 Mon Sep 17 00:00:00 2001 From: Andrew Purtell Date: Tue, 11 Oct 2022 10:19:07 -0700 Subject: [PATCH] HBASE-27339 Improve sasl connection failure log message to include server (#4823) Include the remote server name in the logged exception message when the connection setup fails in BlockingRpcConnection. Add an equivalent log line in NettyRpcConnection. Signed-off-by: Viraj Jasani Conflicts: hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcConnection.java --- .../org/apache/hadoop/hbase/ipc/BlockingRpcConnection.java | 6 ++++-- .../org/apache/hadoop/hbase/ipc/NettyRpcConnection.java | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/BlockingRpcConnection.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/BlockingRpcConnection.java index da032cbeb9d..d63d14940e7 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/BlockingRpcConnection.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/BlockingRpcConnection.java @@ -395,7 +395,8 @@ class BlockingRpcConnection extends RpcConnection implements Runnable { // A provider which failed authentication, but doesn't have the ability to relogin with // some external system (e.g. username/password, the password either works or it doesn't) if (!provider.canRetry()) { - LOG.warn("Exception encountered while connecting to the server : " + ex); + LOG.warn("Exception encountered while connecting to the server " + remoteId.getAddress(), + ex); if (ex instanceof RemoteException) { throw (RemoteException) ex; } @@ -410,7 +411,8 @@ class BlockingRpcConnection extends RpcConnection implements Runnable { // Other providers, like kerberos, could request a new ticket from a keytab. Let // them try again. if (currRetries < maxRetries) { - LOG.debug("Exception encountered while connecting to the server", ex); + LOG.debug("Exception encountered while connecting to the server " + remoteId.getAddress(), + ex); // Invoke the provider to perform the relogin provider.relogin(); diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcConnection.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcConnection.java index 7a0a1543560..701aad0add5 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcConnection.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/NettyRpcConnection.java @@ -296,7 +296,10 @@ class NettyRpcConnection extends RpcConnection { public void operationComplete(ChannelFuture future) throws Exception { Channel ch = future.channel(); if (!future.isSuccess()) { - failInit(ch, toIOE(future.cause())); + IOException ex = toIOE(future.cause()); + LOG.warn( + "Exception encountered while connecting to the server " + remoteId.getAddress(), ex); + failInit(ch, ex); rpcClient.failedServers.addToFailedServers(remoteId.getAddress(), future.cause()); return; }