Repository: hbase Updated Branches: refs/heads/branch-1 531598d67 -> 759d63b15
HBASE-17773 VerifyReplication tool wrongly emits Invalid arguments error (Tom Tsuruhara) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/759d63b1 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/759d63b1 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/759d63b1 Branch: refs/heads/branch-1 Commit: 759d63b15ca63464dd51d1eeff0f6b7763ab6e01 Parents: 531598d Author: Guanghao Zhang <zg...@apache.org> Authored: Mon Mar 13 17:53:43 2017 +0800 Committer: Guanghao Zhang <zg...@apache.org> Committed: Mon Mar 13 17:53:43 2017 +0800 ---------------------------------------------------------------------- .../hbase/mapreduce/replication/VerifyReplication.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/759d63b1/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 ee0984c..3652110 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 @@ -452,10 +452,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()); @@ -467,11 +463,16 @@ public class VerifyReplication extends Configured implements Tool { sleepMsBeforeReCompare = Integer.parseInt(cmd.substring(sleepToReCompareKey.length())); continue; } + final String verboseKey = "--verbose"; if (cmd.startsWith(verboseKey)) { verbose = true; continue; - } + } + + if (cmd.startsWith("--")) { + printUsage("Invalid argument '" + cmd + "'"); + } if (i == args.length-2) { peerId = cmd;
