From 9b860661a5754e829bd8c34ef092757421589bbe Mon Sep 17 00:00:00 2001 From: Jian He Date: Fri, 14 Nov 2014 17:24:09 -0800 Subject: [PATCH] YARN-2432. RMStateStore should process the pending events before close. Contributed by Varun Saxena --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../yarn/server/resourcemanager/recovery/RMStateStore.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index cfd9459bcd9..9d3179b31eb 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -93,6 +93,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 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 beac4032e2f..8948b54ed62 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 @@ protected void serviceStart() throws Exception { @Override protected void serviceStop() throws Exception { - closeInternal(); dispatcher.stop(); + closeInternal(); } /**