From 788bfa0359c1789fa48f21724a8117fe3fd9e532 Mon Sep 17 00:00:00 2001 From: Wangda Tan Date: Thu, 28 May 2015 16:34:18 -0700 Subject: [PATCH] YARN-3716. Node-label-expression should be included by ResourceRequestPBImpl.toString. (Xianyin Xin via wangda) --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index e074f7f14e5..c1f1044bb07 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -461,6 +461,9 @@ Release 2.8.0 - UNRELEASED YARN-3632. Ordering policy should be allowed to reorder an application when demand changes. (Craig Welch via jianhe) + YARN-3716. Node-label-expression should be included by + ResourceRequestPBImpl.toString. (Xianyin Xin via wangda) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java index 791e6a3d60f..fc09cef3b78 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourceRequestPBImpl.java @@ -184,7 +184,8 @@ public class ResourceRequestPBImpl extends ResourceRequest { return "{Priority: " + getPriority() + ", Capability: " + getCapability() + ", # Containers: " + getNumContainers() + ", Location: " + getResourceName() - + ", Relax Locality: " + getRelaxLocality() + "}"; + + ", Relax Locality: " + getRelaxLocality() + + ", Node Label Expression: " + getNodeLabelExpression() + "}"; } @Override