From 5899b2f5a67034420a2ad8cfc42390fe374cfe94 Mon Sep 17 00:00:00 2001 From: slfan1989 Date: Tue, 2 Aug 2022 16:30:01 -0700 Subject: [PATCH 1/3] HADOOP-18387. Fix incorrect placeholder in hadoop-module. --- .../java/org/apache/hadoop/fs/DelegationTokenRenewer.java | 4 ++-- .../hadoop/registry/server/services/RegistryAdminService.java | 2 +- .../hadoop/yarn/appcatalog/application/YarnServiceClient.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java index 6f6e30410659c..75814352acf90 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java @@ -256,9 +256,9 @@ public void removeRenewAction( try { action.cancel(); } catch (InterruptedException ie) { - LOG.error("Interrupted while canceling token for " + fs.getUri() + LOG.error("Interrupted while canceling token for {} filesystem." + fs.getUri() + "filesystem"); - LOG.debug("Exception in removeRenewAction: {}", ie); + LOG.debug("Exception in removeRenewAction.", ie); } } } diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/RegistryAdminService.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/RegistryAdminService.java index 7fe6f2d0afdd7..bea99f3501f23 100644 --- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/RegistryAdminService.java +++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/RegistryAdminService.java @@ -224,7 +224,7 @@ protected void serviceStart() throws Exception { bindingDiagnosticDetails(), dumpRegistryRobustly(true)); - LOG.error(" Failure {}", e, e); + LOG.error(" Failure {}", e.getMessage(), e); LOG.error(message); // TODO: this is something temporary to deal with the problem diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/YarnServiceClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/YarnServiceClient.java index 3a6c67d73700f..79838a9e4fb61 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/YarnServiceClient.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/main/java/org/apache/hadoop/yarn/appcatalog/application/YarnServiceClient.java @@ -61,7 +61,7 @@ public YarnServiceClient() { try { asc = new ApiServiceClient(conf); } catch (Exception e) { - LOG.error("Error initialize YARN Service Client: {}", e); + LOG.error("Error initialize YARN Service Client.", e); } } From 820aaee3b4bdd9b5f9e65e65c229630950720fb5 Mon Sep 17 00:00:00 2001 From: zhujiang02 Date: Wed, 3 Aug 2022 17:59:05 +0800 Subject: [PATCH 2/3] HADOOP-18387. Fix incorrect placeholder in hadoop-module. --- .../main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java | 3 +-- .../hadoop/registry/server/services/RegistryAdminService.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java index 75814352acf90..736ff43824476 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java @@ -256,8 +256,7 @@ public void removeRenewAction( try { action.cancel(); } catch (InterruptedException ie) { - LOG.error("Interrupted while canceling token for {} filesystem." + fs.getUri() - + "filesystem"); + LOG.error("Interrupted while canceling token for {} filesystem." , fs.getUri()); LOG.debug("Exception in removeRenewAction.", ie); } } diff --git a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/RegistryAdminService.java b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/RegistryAdminService.java index bea99f3501f23..7fe6f2d0afdd7 100644 --- a/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/RegistryAdminService.java +++ b/hadoop-common-project/hadoop-registry/src/main/java/org/apache/hadoop/registry/server/services/RegistryAdminService.java @@ -224,7 +224,7 @@ protected void serviceStart() throws Exception { bindingDiagnosticDetails(), dumpRegistryRobustly(true)); - LOG.error(" Failure {}", e.getMessage(), e); + LOG.error(" Failure {}", e, e); LOG.error(message); // TODO: this is something temporary to deal with the problem From dc5fad24c74e6d4b8d95c253613113161023c887 Mon Sep 17 00:00:00 2001 From: zhujiang02 Date: Wed, 3 Aug 2022 18:05:47 +0800 Subject: [PATCH 3/3] HADOOP-18387. Fix CheckStyle. --- .../main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java index 736ff43824476..794855508c63f 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java @@ -256,7 +256,7 @@ public void removeRenewAction( try { action.cancel(); } catch (InterruptedException ie) { - LOG.error("Interrupted while canceling token for {} filesystem." , fs.getUri()); + LOG.error("Interrupted while canceling token for {} filesystem.", fs.getUri()); LOG.debug("Exception in removeRenewAction.", ie); } }