[hbase] branch branch-2 updated: HBASE-27339 Improve sasl connection failure log message to include server (#4823)

[ap...@apache.org]

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

apurtell 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 dfaa63890a0 HBASE-27339 Improve sasl connection failure log message to include server (#4823)
dfaa63890a0 is described below

commit dfaa63890a0f4428a6cb32bf37b601eb47e9d462
Author: Andrew Purtell <ap...@apache.org>
AuthorDate: Tue Oct 11 10:19:07 2022 -0700

    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 <vj...@apache.org>
---
 .../java/org/apache/hadoop/hbase/ipc/BlockingRpcConnection.java     | 6 ++++--
 .../main/java/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 1938e2d7bf9..fb978afbbfa 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
@@ -315,7 +315,10 @@ class NettyRpcConnection extends RpcConnection {
         }
 
         private void fail(Channel ch, Throwable error) {
-          failInit(ch, toIOE(error));
+          IOException ex = toIOE(error);
+          LOG.warn("Exception encountered while connecting to the server " + remoteId.getAddress(),
+            ex);
+          failInit(ch, ex);
           rpcClient.failedServers.addToFailedServers(remoteId.getAddress(), error);
         }