From d0b73287c26983f32b0efe01862150e9fd28086f Mon Sep 17 00:00:00 2001 From: Jian He Date: Fri, 8 May 2015 15:10:38 -0700 Subject: [PATCH] YARN-3604. Fixed ZKRMStateStore#removeApplication to also disable watch. Contributed Zhihai Xu --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../yarn/server/resourcemanager/recovery/ZKRMStateStore.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 2183d3f9bf..6d547c1c33 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -368,6 +368,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 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 364c970c52..15ac9716be 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 synchronized void deleteStore() throws Exception { 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); } }