Repository: hadoop Updated Branches: refs/heads/branch-2 88e179903 -> 05c008256
YARN-6420. RM startup failure due to wrong order in nodelabel editlog (Bibin A Chundatt via Varun Saxena) (cherry picked from commit 19b89c4c7be0236aafded560b7bcad7e39d1c4ed) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/05c00825 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/05c00825 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/05c00825 Branch: refs/heads/branch-2 Commit: 05c008256aab839e639a3433e4b95cda545edec3 Parents: 88e1799 Author: Varun Saxena <[email protected]> Authored: Wed Apr 5 09:16:35 2017 +0530 Committer: Varun Saxena <[email protected]> Committed: Wed Apr 5 09:40:09 2017 +0530 ---------------------------------------------------------------------- .../resourcemanager/nodelabels/RMNodeLabelsManager.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/05c00825/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMNodeLabelsManager.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/nodelabels/RMNodeLabelsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMNodeLabelsManager.java index effe422..79b25ed 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMNodeLabelsManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/nodelabels/RMNodeLabelsManager.java @@ -34,6 +34,7 @@ import java.util.concurrent.ConcurrentMap; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.yarn.api.records.NodeId; +import org.apache.hadoop.yarn.api.records.NodeLabel; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.nodelabels.CommonNodeLabelsManager; import org.apache.hadoop.yarn.nodelabels.RMNodeLabel; @@ -134,6 +135,17 @@ public class RMNodeLabelsManager extends CommonNodeLabelsManager { } @Override + public void addToCluserNodeLabels(Collection<NodeLabel> labels) + throws IOException { + try { + writeLock.lock(); + super.addToCluserNodeLabels(labels); + } finally { + writeLock.unlock(); + } + } + + @Override public void removeLabelsFromNode(Map<NodeId, Set<String>> removeLabelsFromNode) throws IOException { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
