Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id ABF2F200CBC for ; Tue, 20 Jun 2017 14:50:49 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AA829160BEF; Tue, 20 Jun 2017 12:50:49 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id F0E04160BD3 for ; Tue, 20 Jun 2017 14:50:48 +0200 (CEST) Received: (qmail 57053 invoked by uid 500); 20 Jun 2017 12:50:48 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 57037 invoked by uid 99); 20 Jun 2017 12:50:48 -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; Tue, 20 Jun 2017 12:50:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 09CB0DFF9F; Tue, 20 Jun 2017 12:50:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brahma@apache.org To: common-commits@hadoop.apache.org Date: Tue, 20 Jun 2017 12:50:49 -0000 Message-Id: In-Reply-To: <564ef62cbd784ca5a77fc1846b1de65d@git.apache.org> References: <564ef62cbd784ca5a77fc1846b1de65d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] hadoop git commit: HADOOP-14533. Size of args cannot be less than zero in TraceAdmin#run as its linkedlist. Contributed by Weisen Han. archived-at: Tue, 20 Jun 2017 12:50:49 -0000 HADOOP-14533. Size of args cannot be less than zero in TraceAdmin#run as its linkedlist. Contributed by Weisen Han. (cherry picked from commit 2e9daa2e27536484846d9c5f020c6afaf27932ce) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a526c3b0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a526c3b0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a526c3b0 Branch: refs/heads/branch-2.8 Commit: a526c3b0bfe42e340a21ea06d36f52a1c6231abd Parents: f16524e Author: Brahma Reddy Battula Authored: Tue Jun 20 20:44:31 2017 +0800 Committer: Brahma Reddy Battula Committed: Tue Jun 20 20:46:21 2017 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/tracing/TraceAdmin.java | 2 +- .../test/java/org/apache/hadoop/tracing/TestTraceAdmin.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a526c3b0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tracing/TraceAdmin.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tracing/TraceAdmin.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tracing/TraceAdmin.java index 038435c..766fb0a 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tracing/TraceAdmin.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tracing/TraceAdmin.java @@ -166,7 +166,7 @@ public class TraceAdmin extends Configured implements Tool { System.err.println("You must specify a host with -host."); return 1; } - if (args.size() < 0) { + if (args.isEmpty()) { System.err.println("You must specify an operation."); return 1; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/a526c3b0/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java index d6d0550..ee9494b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tracing/TestTraceAdmin.java @@ -78,6 +78,14 @@ public class TestTraceAdmin extends SaslDataTransferTestCase { } @Test + public void testNoOperator() throws Exception { + TraceAdmin trace = new TraceAdmin(); + trace.setConf(new Configuration()); + Assert.assertEquals("ret:1, You must specify an operation." + NEWLINE, + runTraceCommand(trace, "-host", "127.0.0.1:12346")); + } + + @Test public void testCreateAndDestroySpanReceiver() throws Exception { Configuration conf = new Configuration(); conf = new Configuration(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org