Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D94F017EB6 for ; Mon, 16 Mar 2015 23:11:49 +0000 (UTC) Received: (qmail 64861 invoked by uid 500); 16 Mar 2015 23:11:49 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 64787 invoked by uid 500); 16 Mar 2015 23:11:49 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 64777 invoked by uid 99); 16 Mar 2015 23:11:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Mar 2015 23:11:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 37E68E1104; Mon, 16 Mar 2015 23:11:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ozawa@apache.org To: common-commits@hadoop.apache.org Message-Id: <43d26a16201e4e10ac55040cd0b7c19c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-3349. Treat all exceptions as failure in TestFSRMStateStore#testFSRMStateStoreClientRetry. Contributed by Zhihai Xu. Date: Mon, 16 Mar 2015 23:11:49 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2.7 3718207e4 -> f15a2b23c 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/f15a2b23 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f15a2b23 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f15a2b23 Branch: refs/heads/branch-2.7 Commit: f15a2b23ca46ff12b3f588d20f8738621451ca95 Parents: 3718207 Author: Tsuyoshi Ozawa Authored: Tue Mar 17 08:09:55 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Tue Mar 17 08:10:57 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/f15a2b23/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 66f36e3..1c46d0d 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -715,6 +715,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/f15a2b23/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(); } }