hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jia...@apache.org
Subject hadoop git commit: YARN-3604. Fixed ZKRMStateStore#removeApplication to also disable watch. Contributed Zhihai Xu (cherry picked from commit d0b73287c26983f32b0efe01862150e9fd28086f)
Date Fri, 08 May 2015 22:13:54 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 8d0711626 -> 5a1c2fed3


YARN-3604. Fixed ZKRMStateStore#removeApplication to also disable watch. Contributed Zhihai
Xu
(cherry picked from commit d0b73287c26983f32b0efe01862150e9fd28086f)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5a1c2fed
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5a1c2fed
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5a1c2fed

Branch: refs/heads/branch-2
Commit: 5a1c2fed349fd3e8a53300f574a952f0c3f622b6
Parents: 8d07116
Author: Jian He <jianhe@apache.org>
Authored: Fri May 8 15:10:38 2015 -0700
Committer: Jian He <jianhe@apache.org>
Committed: Fri May 8 15:13:43 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/5a1c2fed/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 4e577e9..af02168 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -323,6 +323,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/5a1c2fed/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);
     }
   }
 


Mime
View raw message