From 31869ec3edfa1b3de498469e20bf00d98dca1b96 Mon Sep 17 00:00:00 2001 From: slfan1989 Date: Tue, 2 Aug 2022 15:21:06 -0700 Subject: [PATCH 1/3] YARN-11240. Fix incorrect placeholder in yarn-module. --- .../java/org/apache/hadoop/yarn/service/ServiceScheduler.java | 2 +- .../test/java/org/apache/hadoop/yarn/service/TestServiceAM.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java index 6d143a3bd4aa0..d8bbebccf31ac 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java @@ -1139,7 +1139,7 @@ public void syncSysFs(Service yarnApp) { LOG.info("YARN sysfs synchronized."); } } catch (IOException | URISyntaxException | InterruptedException e) { - LOG.error("Fail to sync service spec: {}", e); + LOG.error("Fail to sync service spec: {}", e.getMessage()); } } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceAM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceAM.java index c9886584bf27b..90ab88a6c9b16 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceAM.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceAM.java @@ -553,7 +553,7 @@ public void testSyncSysFS() { am.stop(); am.close(); } catch (Exception e) { - LOG.error("Fail to sync sysfs: {}", e); + LOG.error("Fail to sync sysfs: {}", e.getMessage()); Assert.fail("Fail to sync sysfs."); } } From ca537e832540218d06a877554df4ac155bc95021 Mon Sep 17 00:00:00 2001 From: slfan1989 Date: Fri, 19 Aug 2022 16:49:53 +0800 Subject: [PATCH 2/3] YARN-11240. Fix CodeStyle. --- .../java/org/apache/hadoop/yarn/service/ServiceScheduler.java | 2 +- .../test/java/org/apache/hadoop/yarn/service/TestServiceAM.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java index d8bbebccf31ac..bd68b6359b7bc 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java @@ -1139,7 +1139,7 @@ public void syncSysFs(Service yarnApp) { LOG.info("YARN sysfs synchronized."); } } catch (IOException | URISyntaxException | InterruptedException e) { - LOG.error("Fail to sync service spec: {}", e.getMessage()); + LOG.error("Fail to sync service spec: {}", e.getMessage(), e); } } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceAM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceAM.java index 90ab88a6c9b16..257aecc8c49f2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceAM.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceAM.java @@ -553,7 +553,7 @@ public void testSyncSysFS() { am.stop(); am.close(); } catch (Exception e) { - LOG.error("Fail to sync sysfs: {}", e.getMessage()); + LOG.error("Fail to sync sysfs: {}", e.getMessage(), e); Assert.fail("Fail to sync sysfs."); } } From 5820a0ad1dd5709ec243ffa471da6177d76d44eb Mon Sep 17 00:00:00 2001 From: slfan1989 Date: Mon, 22 Aug 2022 10:33:11 +0800 Subject: [PATCH 3/3] YARN-11240. Fix CodeStyle. --- .../java/org/apache/hadoop/yarn/service/ServiceScheduler.java | 2 +- .../test/java/org/apache/hadoop/yarn/service/TestServiceAM.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java index bd68b6359b7bc..9da8f31fe4b8b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ServiceScheduler.java @@ -1139,7 +1139,7 @@ public void syncSysFs(Service yarnApp) { LOG.info("YARN sysfs synchronized."); } } catch (IOException | URISyntaxException | InterruptedException e) { - LOG.error("Fail to sync service spec: {}", e.getMessage(), e); + LOG.error("Fail to sync service spec.", e); } } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceAM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceAM.java index 257aecc8c49f2..69c0c2cee57f9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceAM.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestServiceAM.java @@ -553,7 +553,7 @@ public void testSyncSysFS() { am.stop(); am.close(); } catch (Exception e) { - LOG.error("Fail to sync sysfs: {}", e.getMessage(), e); + LOG.error("Fail to sync sysfs.", e); Assert.fail("Fail to sync sysfs."); } }