Repository: hadoop Updated Branches: refs/heads/trunk c0e034336 -> 7e3b5e6f5
YARN-2721. Suppress NodeExist exception thrown by ZKRMStateStore when it retries creating znode. Contributed by Jian He. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7e3b5e6f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7e3b5e6f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7e3b5e6f Branch: refs/heads/trunk Commit: 7e3b5e6f5cb4945b4fab27e8a83d04280df50e17 Parents: c0e0343 Author: Zhijie Shen <[email protected]> Authored: Tue Oct 21 21:49:17 2014 -0700 Committer: Zhijie Shen <[email protected]> Committed: Tue Oct 21 21:49:17 2014 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../yarn/server/resourcemanager/recovery/ZKRMStateStore.java | 4 ++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e3b5e6f/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index b638ab0..4a71b6b 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -717,6 +717,9 @@ Release 2.6.0 - UNRELEASED YARN-2720. Windows: Wildcard classpath variables not expanded against resources contained in archives. (Craig Welch via cnauroth) + YARN-2721. Suppress NodeExist exception thrown by ZKRMStateStore when it + retries creating znode. (Jian He via zjshen) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e3b5e6f/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 87c8cbe..fdbf125 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 @@ -1094,6 +1094,10 @@ public class ZKRMStateStore extends RMStateStore { throw new StoreFencedException(); } } catch (KeeperException ke) { + if (ke.code() == Code.NODEEXISTS) { + LOG.info("znode already exists!"); + return null; + } LOG.info("Exception while executing a ZK operation.", ke); if (shouldRetry(ke.code()) && ++retry < numRetries) { LOG.info("Retrying operation on ZK. Retry no. " + retry);
