Repository: hadoop Updated Branches: refs/heads/branch-2 87bb3c51d -> 6b47a7fb8
YARN-5920. Fix deadlock in TestRMHA.testTransitionedToStandbyShouldNotHang. Contributed by Varun Saxena. (cherry picked from commit e15c20edba1e9a23475ee6a4dfbadbdb8c1f668a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6b47a7fb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6b47a7fb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6b47a7fb Branch: refs/heads/branch-2 Commit: 6b47a7fb8eaf0659c4ca478d72f4019912942e5d Parents: 87bb3c5 Author: Rohith Sharma K S <[email protected]> Authored: Thu Nov 24 12:18:38 2016 +0530 Committer: Rohith Sharma K S <[email protected]> Committed: Thu Nov 24 12:19:19 2016 +0530 ---------------------------------------------------------------------- .../org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6b47a7fb/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java index 905a42c..df1cdb5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java @@ -463,8 +463,7 @@ public class TestRMHA { MemoryRMStateStore memStore = new MemoryRMStateStore() { @Override - public synchronized void updateApplicationState( - ApplicationStateData appState) { + public void updateApplicationState(ApplicationStateData appState) { notifyStoreOperationFailed(new StoreFencedException()); } }; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
