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 zj...@apache.org on 2015/05/09 02:42:34 UTC
[40/50] hadoop git commit: YARN-3604. Fixed
ZKRMStateStore#removeApplication to also disable watch. Contributed Zhihai Xu
YARN-3604. Fixed ZKRMStateStore#removeApplication to also disable watch. Contributed Zhihai Xu
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/db6de0ca
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/db6de0ca
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/db6de0ca
Branch: refs/heads/YARN-2928
Commit: db6de0ca7b2c2d30daa136d77e509b1638bf5ec0
Parents: d6b89cb
Author: Jian He <ji...@apache.org>
Authored: Fri May 8 15:10:38 2015 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Fri May 8 17:40:23 2015 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../yarn/server/resourcemanager/recovery/ZKRMStateStore.java | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/db6de0ca/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index c54e9ad..3acb9d7 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -438,6 +438,9 @@ Release 2.8.0 - UNRELEASED
YARN-3600. AM container link is broken (Naganarasimha G R via tgraves)
+ YARN-3604. Fixed ZKRMStateStore#removeApplication to also disable watch.
+ (zhihai xu via jianhe)
+
Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/db6de0ca/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.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/recovery/ZKRMStateStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
index 364c970..15ac971 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
@@ -827,8 +827,8 @@ public class ZKRMStateStore extends RMStateStore {
public synchronized void removeApplication(ApplicationId removeAppId)
throws Exception {
String appIdRemovePath = getNodePath(rmAppRoot, removeAppId.toString());
- if (existsWithRetries(appIdRemovePath, true) != null) {
- deleteWithRetries(appIdRemovePath, true);
+ if (existsWithRetries(appIdRemovePath, false) != null) {
+ deleteWithRetries(appIdRemovePath, false);
}
}