From 9e7f82aef336a1093b3af753b0d7baa52137363b Mon Sep 17 00:00:00 2001 From: Prabhu Joseph Date: Sun, 11 Aug 2019 16:39:33 +0530 Subject: [PATCH] YARN-9722. Fix PlacementRule logs ObjectID in place of queue name. --- .../resourcemanager/placement/AppNameMappingPlacementRule.java | 6 +++--- .../resourcemanager/placement/UserGroupMappingPlacementRule.java | 6 +++--- 2 files changed, 6 insertions(+), 6 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/placement/AppNameMappingPlacementRule.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/AppNameMappingPlacementRule.java index 13eee91..a4bc53d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/AppNameMappingPlacementRule.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/AppNameMappingPlacementRule.java @@ -190,9 +190,9 @@ public ApplicationPlacementContext getPlacementForApp( //queueName will be same as mapped queue name in case of recovery || queueName.equals(mappedQueue.getQueue()) || overrideWithQueueMappings) { - LOG.info("Application " + applicationName - + " mapping [" + queueName + "] to [" + mappedQueue - + "] override " + overrideWithQueueMappings); + LOG.info("Application {} mapping [{}] to [{}] override {}", + applicationName, queueName, mappedQueue.getQueue(), + overrideWithQueueMappings); return mappedQueue; } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java index 4ffb7db..43a3043 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/placement/UserGroupMappingPlacementRule.java @@ -200,9 +200,9 @@ public ApplicationPlacementContext getPlacementForApp( //queueName will be same as mapped queue name in case of recovery || queueName.equals(mappedQueue.getQueue()) || overrideWithQueueMappings) { - LOG.info("Application " + applicationId + " user " + user - + " mapping [" + queueName + "] to [" + mappedQueue - + "] override " + overrideWithQueueMappings); + LOG.info("Application {} user {} mapping [{}] to [{}] override {}", + applicationId, user, queueName, mappedQueue.getQueue(), + overrideWithQueueMappings); return mappedQueue; } } -- 2.7.4 (Apple Git-66)