Repository: hbase Updated Branches: refs/heads/0.98 358067eac -> 4cdd0adfb
HBASE-16409 Row key for bad row should be properly delimited in VerifyReplication Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e05e70c2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e05e70c2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e05e70c2 Branch: refs/heads/0.98 Commit: e05e70c24551f62fce0be3ad7d4f5bc5a26fd51d Parents: 358067e Author: tedyu <[email protected]> Authored: Sat Aug 20 17:18:27 2016 -0700 Committer: Andrew Purtell <[email protected]> Committed: Thu Dec 1 16:43:26 2016 -0800 ---------------------------------------------------------------------- .../hbase/mapreduce/replication/VerifyReplication.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/e05e70c2/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 a5d1ddd..6c1e490 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 @@ -80,6 +80,7 @@ public class VerifyReplication extends Configured implements Tool { static int versions = -1; static String tableName = null; static String families = null; + static String delimiter = null; static String peerId = null; static String rowPrefixes = null; @@ -182,7 +183,8 @@ public class VerifyReplication extends Configured implements Tool { private void logFailRowAndIncreaseCounter(Context context, Counters counter, Result row) { context.getCounter(counter).increment(1); context.getCounter(Counters.BADROWS).increment(1); - LOG.error(counter.toString() + ", rowkey=" + Bytes.toString(row.getRow())); + LOG.error(counter.toString() + ", rowkey=" + delimiter + Bytes.toString(row.getRow()) + + delimiter); } @Override @@ -387,6 +389,12 @@ public class VerifyReplication extends Configured implements Tool { printUsage("Invalid argument '" + cmd + "'"); } + final String delimiterArgKey = "--delimiter="; + if (cmd.startsWith(delimiterArgKey)) { + delimiter = cmd.substring(delimiterArgKey.length()); + continue; + } + if (i == args.length-2) { peerId = cmd; } @@ -422,7 +430,7 @@ public class VerifyReplication extends Configured implements Tool { System.err.println("ERROR: " + errorMsg); } System.err.println("Usage: verifyrep [--starttime=X]" + - " [--endtime=Y] [--families=A] [--row-prefixes=B] <peerid> <tablename>"); + " [--endtime=Y] [--families=A] [--row-prefixes=B] [--delimiter=] <peerid> <tablename>"); System.err.println(); System.err.println("Options:"); System.err.println(" starttime beginning of the time range"); @@ -431,6 +439,7 @@ public class VerifyReplication extends Configured implements Tool { System.err.println(" versions number of cell versions to verify"); System.err.println(" families comma-separated list of families to copy"); System.err.println(" row-prefixes comma-separated list of row key prefixes to filter on "); + System.err.println(" delimiter the delimiter used in display around rowkey"); System.err.println(); System.err.println("Args:"); System.err.println(" peerid Id of the peer used for verification, must match the one given for replication");
