You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xy...@apache.org on 2015/11/17 01:30:06 UTC

hadoop git commit: HDFS-9387. Fix namenodeUri parameter parsing in NNThroughputBenchmark. Contributed by Mingliang Liu.

Repository: hadoop
Updated Branches:
  refs/heads/trunk 02653add9 -> 2701f2d25


HDFS-9387. Fix namenodeUri parameter parsing in NNThroughputBenchmark. Contributed by Mingliang Liu.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2701f2d2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2701f2d2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2701f2d2

Branch: refs/heads/trunk
Commit: 2701f2d2558f3ade879539f3f7bedf749709f2f1
Parents: 02653ad
Author: Xiaoyu Yao <xy...@apache.org>
Authored: Mon Nov 16 16:29:47 2015 -0800
Committer: Xiaoyu Yao <xy...@apache.org>
Committed: Mon Nov 16 16:29:47 2015 -0800

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt               |  3 +++
 .../hdfs/server/namenode/NNThroughputBenchmark.java       | 10 ++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/2701f2d2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 8285a99..382671c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -2305,6 +2305,9 @@ Release 2.8.0 - UNRELEASED
     HDFS-9413. getContentSummary() on standby should throw StandbyException.
     (Brahma Reddy Battula via mingma)
 
+    HDFS-9387. Fix namenodeUri parameter parsing in NNThroughputBenchmark.
+    (Mingliang Liu via xyao)
+
 Release 2.7.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/2701f2d2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java
index 6d27315..5410877 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java
@@ -382,10 +382,12 @@ public class NNThroughputBenchmark implements Tool {
         args.remove(ugrcIndex);
       }
 
-      try {
-        namenodeUri = StringUtils.popOptionWithArgument("-namenode", args);
-      } catch (IllegalArgumentException iae) {
-        printUsage();
+      if (args.indexOf("-namenode") >= 0) {
+        try {
+          namenodeUri = StringUtils.popOptionWithArgument("-namenode", args);
+        } catch (IllegalArgumentException iae) {
+          printUsage();
+        }
       }
 
       String type = args.get(1);