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 ji...@apache.org on 2014/11/15 02:25:30 UTC
hadoop git commit: YARN-2432. RMStateStore should process the pending
events before close. Contributed by Varun Saxena (cherry picked from commit
9b860661a5754e829bd8c34ef092757421589bbe)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 72207f65a -> 21054c5d1
YARN-2432. RMStateStore should process the pending events before close. Contributed by Varun Saxena
(cherry picked from commit 9b860661a5754e829bd8c34ef092757421589bbe)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/21054c5d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/21054c5d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/21054c5d
Branch: refs/heads/branch-2
Commit: 21054c5d149ae56ee998e42a11cafd80b7aaa279
Parents: 72207f6
Author: Jian He <ji...@apache.org>
Authored: Fri Nov 14 17:24:09 2014 -0800
Committer: Jian He <ji...@apache.org>
Committed: Fri Nov 14 17:25:21 2014 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/21054c5d/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 0a60f5c..9a5d1c4 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -66,6 +66,9 @@ Release 2.7.0 - UNRELEASED
YARN-2816. NM fail to start with NPE during container recovery (Zhihai Xu
via jlowe)
+ YARN-2432. RMStateStore should process the pending events before close.
+ (Varun Saxena via jianhe)
+
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/21054c5d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.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/RMStateStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java
index beac403..8948b54 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java
@@ -492,8 +492,8 @@ public abstract class RMStateStore extends AbstractService {
@Override
protected void serviceStop() throws Exception {
- closeInternal();
dispatcher.stop();
+ closeInternal();
}
/**