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 D56E7191E6 for ; Mon, 25 Apr 2016 16:41:59 +0000 (UTC) Received: (qmail 92720 invoked by uid 500); 25 Apr 2016 16:41:59 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 92654 invoked by uid 500); 25 Apr 2016 16:41:59 -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 92639 invoked by uid 99); 25 Apr 2016 16:41:59 -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, 25 Apr 2016 16:41:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3C8C1DFE60; Mon, 25 Apr 2016 16:41:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kihwal@apache.org To: common-commits@hadoop.apache.org Message-Id: <7e038956cbe04df09b8d4cbe9ad8dc61@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-10318. TestJMXGet hides the real error in case of test failure. Contributed by Andras Bokor. Date: Mon, 25 Apr 2016 16:41:59 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 5bceaa968 -> f6bd9e07d HDFS-10318. TestJMXGet hides the real error in case of test failure. Contributed by Andras Bokor. (cherry picked from commit 10f0f7851a3255caab775777e8fb6c2781d97062) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f6bd9e07 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f6bd9e07 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f6bd9e07 Branch: refs/heads/branch-2 Commit: f6bd9e07d2d238e692657ad8612f58a54d799a87 Parents: 5bceaa9 Author: Kihwal Lee Authored: Mon Apr 25 11:41:40 2016 -0500 Committer: Kihwal Lee Committed: Mon Apr 25 11:41:40 2016 -0500 ---------------------------------------------------------------------- .../java/org/apache/hadoop/tools/TestJMXGet.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f6bd9e07/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestJMXGet.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestJMXGet.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestJMXGet.java index f64ee9d..36fdac4 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestJMXGet.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestJMXGet.java @@ -31,6 +31,7 @@ import java.io.PrintStream; import java.lang.management.ManagementFactory; import java.util.Random; import java.util.Set; +import java.util.concurrent.TimeoutException; import javax.management.MBeanServerConnection; import javax.management.ObjectName; @@ -55,6 +56,7 @@ import org.junit.Test; * */ public class TestJMXGet { + public static final String WRONG_METRIC_VALUE_ERROR_MSG = "Unable to get the correct value for %s."; private Configuration config; private MiniDFSCluster cluster; @@ -118,9 +120,12 @@ public class TestJMXGet { assertTrue("error printAllValues", checkPrintAllValues(jmx)); //get some data from different source - DFSTestUtil.waitForMetric(jmx, "NumLiveDataNodes", numDatanodes); - assertEquals(numDatanodes, Integer.parseInt( + try { + DFSTestUtil.waitForMetric(jmx, "NumLiveDataNodes", numDatanodes); + } catch (TimeoutException e) { + assertEquals(String.format(WRONG_METRIC_VALUE_ERROR_MSG, "NumLiveDataNodes"),numDatanodes, Integer.parseInt( jmx.getValue("NumLiveDataNodes"))); + } assertGauge("CorruptBlocks", Long.parseLong(jmx.getValue("CorruptBlocks")), getMetrics("FSNamesystem")); @@ -169,8 +174,11 @@ public class TestJMXGet { String serviceName = "DataNode"; jmx.setService(serviceName); jmx.init(); - DFSTestUtil.waitForMetric(jmx, "BytesWritten", fileSize); - assertEquals(fileSize, Integer.parseInt(jmx.getValue("BytesWritten"))); + try { + DFSTestUtil.waitForMetric(jmx, "BytesWritten", fileSize); + } catch (TimeoutException e) { + assertEquals(String.format(WRONG_METRIC_VALUE_ERROR_MSG, "BytesWritten"), fileSize, Integer.parseInt(jmx.getValue("BytesWritten"))); + } cluster.shutdown(); MBeanServerConnection mbsc = ManagementFactory.getPlatformMBeanServer();