Repository: hadoop Updated Branches: refs/heads/branch-2 ef2a66b24 -> a20427d33
YARN-3349. Treat all exceptions as failure in TestFSRMStateStore#testFSRMStateStoreClientRetry. Contributed by Zhihai Xu. (cherry picked from commit 7522a643faeea2d8a8e2c7409ae60e0973e7cf38) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a20427d3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a20427d3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a20427d3 Branch: refs/heads/branch-2 Commit: a20427d33998fbc477b35d1b33fb55968b3080e4 Parents: ef2a66b Author: Tsuyoshi Ozawa <[email protected]> Authored: Tue Mar 17 08:09:55 2015 +0900 Committer: Tsuyoshi Ozawa <[email protected]> Committed: Tue Mar 17 08:10:12 2015 +0900 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../resourcemanager/recovery/TestFSRMStateStore.java | 11 +++-------- 2 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a20427d3/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index ab414ca..9d3be99 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -727,6 +727,9 @@ Release 2.7.0 - UNRELEASED YARN-1453. [JDK8] Fix Javadoc errors caused by incorrect or illegal tags in doc comments. (Akira AJISAKA, Andrew Purtell, and Allen Wittenauer via ozawa) + YARN-3349. Treat all exceptions as failure in + TestFSRMStateStore#testFSRMStateStoreClientRetry. (Zhihai Xu via ozawa) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/a20427d3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestFSRMStateStore.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/recovery/TestFSRMStateStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestFSRMStateStore.java index 675d73c..d2eddd6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestFSRMStateStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestFSRMStateStore.java @@ -100,11 +100,11 @@ public class TestFSRMStateStore extends RMStateStoreTestBase { workingDirPathURI.toString()); conf.set(YarnConfiguration.FS_RM_STATE_STORE_RETRY_POLICY_SPEC, "100,6000"); - conf.setInt(YarnConfiguration.FS_RM_STATE_STORE_NUM_RETRIES, 5); + conf.setInt(YarnConfiguration.FS_RM_STATE_STORE_NUM_RETRIES, 8); conf.setLong(YarnConfiguration.FS_RM_STATE_STORE_RETRY_INTERVAL_MS, 900L); this.store = new TestFileSystemRMStore(conf); - Assert.assertEquals(store.getNumRetries(), 5); + Assert.assertEquals(store.getNumRetries(), 8); Assert.assertEquals(store.getRetryInterval(), 900L); return store; } @@ -277,12 +277,7 @@ public class TestFSRMStateStore extends RMStateStoreTestBase { ApplicationStateData.newInstance(111, 111, "user", null, RMAppState.ACCEPTED, "diagnostics", 333)); } catch (Exception e) { - // TODO 0 datanode exception will not be retried by dfs client, fix - // that separately. - if (!e.getMessage().contains("could only be replicated" + - " to 0 nodes instead of minReplication (=1)")) { - assertionFailedInThread.set(true); - } + assertionFailedInThread.set(true); e.printStackTrace(); } }
