Repository: hadoop Updated Branches: refs/heads/branch-2 215a3d800 -> 73478e3bb
YARN-7508. NPE in FiCaSchedulerApp when debug log enabled in async-scheduling mode. Contributed by Tao Yang. (cherry picked from commit b26e30ab1655a8cdf369862a5512db5c2a88ec46) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/73478e3b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/73478e3b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/73478e3b Branch: refs/heads/branch-2 Commit: 73478e3bbe3f09d9ee5334696acca8bdb2c5437e Parents: 215a3d8 Author: bibinchundatt <[email protected]> Authored: Tue Jan 9 17:57:01 2018 +0530 Committer: bibinchundatt <[email protected]> Committed: Wed Jan 10 10:31:46 2018 +0530 ---------------------------------------------------------------------- .../resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/73478e3b/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 ---------------------------------------------------------------------- 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 1d91316..38b7213 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 @@ -438,9 +438,9 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt { if (LOG.isDebugEnabled()) { LOG.debug("Try to re-reserve a container, but node " + schedulerContainer.getSchedulerNode() - + " is already reserved by another container" + + " is already reserved by another container=" + schedulerContainer.getSchedulerNode() - .getReservedContainer().getContainerId()); + .getReservedContainer()); } return false; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
