Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-3349. Treat all exceptions as failure in TestFSRMStateStore#testFSRMStateStoreClientRetry. Contributed by Zhihai Xu.

This commit is contained in:
Tsuyoshi Ozawa 2015-03-17 08:09:55 +09:00
parent 2681ed9698
commit 7522a643fa
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -772,6 +772,9 @@ Release 2.7.0 - UNRELEASED
YARN-1453. [JDK8] Fix Javadoc errors caused by incorrect or illegal tags in YARN-1453. [JDK8] Fix Javadoc errors caused by incorrect or illegal tags in
doc comments. (Akira AJISAKA, Andrew Purtell, and Allen Wittenauer via ozawa) 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 Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

11
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestFSRMStateStore.java
View File

@ -100,11 +100,11 @@ public class TestFSRMStateStore extends RMStateStoreTestBase {
workingDirPathURI.toString()); workingDirPathURI.toString());
conf.set(YarnConfiguration.FS_RM_STATE_STORE_RETRY_POLICY_SPEC, conf.set(YarnConfiguration.FS_RM_STATE_STORE_RETRY_POLICY_SPEC,
"100,6000"); "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, conf.setLong(YarnConfiguration.FS_RM_STATE_STORE_RETRY_INTERVAL_MS,
900L); 900L);
this.store = new TestFileSystemRMStore(conf); this.store = new TestFileSystemRMStore(conf);
Assert.assertEquals(store.getNumRetries(), 5); Assert.assertEquals(store.getNumRetries(), 8);
Assert.assertEquals(store.getRetryInterval(), 900L); Assert.assertEquals(store.getRetryInterval(), 900L);
return store; return store;
} }
@ -277,12 +277,7 @@ public class TestFSRMStateStore extends RMStateStoreTestBase {
ApplicationStateData.newInstance(111, 111, "user", null, ApplicationStateData.newInstance(111, 111, "user", null,
RMAppState.ACCEPTED, "diagnostics", 333)); RMAppState.ACCEPTED, "diagnostics", 333));
} catch (Exception e) { } catch (Exception e) {
// TODO 0 datanode exception will not be retried by dfs client, fix assertionFailedInThread.set(true);
// that separately.
if (!e.getMessage().contains("could only be replicated" +
" to 0 nodes instead of minReplication (=1)")) {
assertionFailedInThread.set(true);
}
e.printStackTrace(); e.printStackTrace();
} }
} }