YARN-6844. AMRMClientImpl.checkNodeLabelExpression() has wrong error message (Contributed by Manikandan R via Daniel Templeton)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4c40cd45 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4c40cd45 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4c40cd45 Branch: refs/heads/HDFS-10467 Commit: 4c40cd451cbdbce5d2b94ad0e7e3cc991c3439c5 Parents: 24853bf Author: Daniel Templeton <templ...@apache.org> Authored: Mon Jul 24 12:03:02 2017 -0700 Committer: Daniel Templeton <templ...@apache.org> Committed: Mon Jul 24 12:03:02 2017 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c40cd45/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java index 7da91de..7a21bc6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java @@ -772,10 +772,10 @@ public class AMRMClientImpl<T extends ContainerRequest> extends AMRMClient<T> { return; } - // Don't support specifying >= 2 node labels in a node label expression now + // Don't support specifying > 1 node labels in a node label expression now if (exp.contains("&&") || exp.contains("||")) { throw new InvalidContainerRequestException( - "Cannot specify more than two node labels" + "Cannot specify more than one node label" + " in a single node label expression"); } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org