From e9339aa3761295fe65bb786e01938c7c177cd6e7 Mon Sep 17 00:00:00 2001
From: Gergely Pollak <shuzirra@cloudera.com>
Date: Tue, 1 Jun 2021 15:57:22 +0200
Subject: [PATCH] YARN-10797. Logging parameter issues in scheduler package.
 Contributed by Szilard Nemeth

---
 .../scheduler/capacity/QueueConfigurationAutoRefreshPolicy.java | 2 +-
 .../resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/QueueConfigurationAutoRefreshPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/QueueConfigurationAutoRefreshPolicy.java
index 0ae0777e801..21c81a671d6 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/QueueConfigurationAutoRefreshPolicy.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/QueueConfigurationAutoRefreshPolicy.java
@@ -140,7 +140,7 @@ public class QueueConfigurationAutoRefreshPolicy
           LOG.error("Can't refresh queue: " + e);
           if (!lastReloadAttemptFailed) {
             LOG.error("Failed to reload capacity scheduler config file - " +
-                "will use existing conf.", e.getMessage());
+                "will use existing conf. Message: {}", e.getMessage());
           }
           lastReloadAttempt = clock.getTime();
           lastReloadAttemptFailed = true;
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
index 6507259f10c..dc109291332 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
@@ -1200,7 +1200,7 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt {
           targetNode.reserveResource(this,
               reservedContainer.getReservedSchedulerKey(), reservedContainer);
         } catch (IllegalStateException e) {
-          LOG.debug("Reserve on target node failed, e={}", e);
+          LOG.debug("Reserve on target node failed", e);
           return false;
         }