Repository: hbase
Updated Branches:
  refs/heads/master 31bc94ae6 -> fee67bcf1


HBASE-17773 VerifyReplication tool wrongly emits Invalid arguments error

Signed-off-by: Guanghao Zhang <zg...@apache.org>


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

Branch: refs/heads/master
Commit: fee67bcf1432cd16720fb97a0135bd67b0d2b064
Parents: 31bc94a
Author: Tom Tsuruhara <tomu.tsuruh...@linecorp.com>
Authored: Sat Mar 11 18:20:06 2017 +0900
Committer: Guanghao Zhang <zg...@apache.org>
Committed: Mon Mar 13 17:46:58 2017 +0800

----------------------------------------------------------------------
 .../hbase/mapreduce/replication/VerifyReplication.java      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/fee67bcf/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java
----------------------------------------------------------------------
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java
index 145fede..ba5966b 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/replication/VerifyReplication.java
@@ -463,10 +463,6 @@ public class VerifyReplication extends Configured 
implements Tool {
           continue;
         }
 
-        if (cmd.startsWith("--")) {
-          printUsage("Invalid argument '" + cmd + "'");
-        }
-
         final String delimiterArgKey = "--delimiter=";
         if (cmd.startsWith(delimiterArgKey)) {
           delimiter = cmd.substring(delimiterArgKey.length());
@@ -483,6 +479,11 @@ public class VerifyReplication extends Configured 
implements Tool {
           verbose = true;
           continue;
         }        
+
+        if (cmd.startsWith("--")) {
+          printUsage("Invalid argument '" + cmd + "'");
+        }
+
         if (i == args.length-2) {
           peerId = cmd;
         }

Reply via email to