This is an automated email from the ASF dual-hosted git repository.
liuml07 pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new f3fa4af5dc3 HADOOP-18592. Sasl connection failure should log remote
address. (#5294)
f3fa4af5dc3 is described below
commit f3fa4af5dc30f30784f507d1122b75ebeea50b46
Author: Viraj Jasani <vjas...@apache.org>
AuthorDate: Wed Feb 1 10:15:20 2023 -0800
HADOOP-18592. Sasl connection failure should log remote address. (#5294)
Contributed by Viraj Jasani <vjas...@apache.org>
Signed-off-by: Chris Nauroth <cnaur...@apache.org>
Signed-off-by: Steve Loughran <ste...@apache.org>
Signed-off-by: Mingliang Liu <lium...@apache.org>
---
.../src/main/java/org/apache/hadoop/ipc/Client.java | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
index 57f0b7c2149..7327d884bc7 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
@@ -687,7 +687,7 @@ public class Client implements AutoCloseable {
* handle that, a relogin is attempted.
*/
private synchronized void handleSaslConnectionFailure(
- final int currRetries, final int maxRetries, final Exception ex,
+ final int currRetries, final int maxRetries, final IOException ex,
final Random rand, final UserGroupInformation ugi) throws IOException,
InterruptedException {
ugi.doAs(new PrivilegedExceptionAction<Object>() {
@@ -698,10 +698,7 @@ public class Client implements AutoCloseable {
disposeSasl();
if (shouldAuthenticateOverKrb()) {
if (currRetries < maxRetries) {
- if(LOG.isDebugEnabled()) {
- LOG.debug("Exception encountered while connecting to "
- + "the server : " + ex);
- }
+ LOG.debug("Exception encountered while connecting to the server
{}", remoteId, ex);
// try re-login
if (UserGroupInformation.isLoginKeytabBased()) {
UserGroupInformation.getLoginUser().reloginFromKeytab();
@@ -719,7 +716,11 @@ public class Client implements AutoCloseable {
+ UserGroupInformation.getLoginUser().getUserName() + " to "
+ remoteId;
LOG.warn(msg, ex);
- throw (IOException) new IOException(msg).initCause(ex);
+ throw NetUtils.wrapException(remoteId.getAddress().getHostName(),
+ remoteId.getAddress().getPort(),
+ NetUtils.getHostname(),
+ 0,
+ ex);
}
} else {
// With RequestHedgingProxyProvider, one rpc call will send
multiple
@@ -727,11 +728,9 @@ public class Client implements AutoCloseable {
// all other requests will be interrupted. It's not a big problem,
// and should not print a warning log.
if (ex instanceof InterruptedIOException) {
- LOG.debug("Exception encountered while connecting to the server",
- ex);
+ LOG.debug("Exception encountered while connecting to the server
{}", remoteId, ex);
} else {
- LOG.warn("Exception encountered while connecting to the server ",
- ex);
+ LOG.warn("Exception encountered while connecting to the server
{}", remoteId, ex);
}
}
if (ex instanceof RemoteException)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
