You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by in...@apache.org on 2017/04/17 17:58:26 UTC
[29/50] [abbrv] hadoop git commit: YARN-6420. RM startup failure due
to wrong order in nodelabel editlog (Bibin A Chundatt via Varun Saxena)
YARN-6420. RM startup failure due to wrong order in nodelabel editlog (Bibin A Chundatt via Varun Saxena)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/11406a44
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/11406a44
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/11406a44
Branch: refs/heads/HDFS-10467
Commit: 11406a44b3e40e4d20bd4628d392afafee126e3c
Parents: 8c69f5a
Author: Varun Saxena <va...@apache.org>
Authored: Wed Apr 5 09:16:35 2017 +0530
Committer: Inigo <in...@apache.org>
Committed: Thu Apr 6 18:58:22 2017 -0700
----------------------------------------------------------------------
.../resourcemanager/nodelabels/RMNodeLabelsManager.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/11406a44/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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org