From eabad8a91ccb73eba83b99f83a937e29a9a4c6fa Mon Sep 17 00:00:00 2001 From: TAK LON WU Date: Fri, 1 Dec 2017 15:25:59 -0800 Subject: [PATCH] HBASE-19023 Replace hbase-server with hbase-mapreduce for HBase and MapReduce chapter RowCounter and other related HBase's MapReduce classes have been moved to hbase-mapreduce component by HBASE-18640, related chapter was out-of-date and this fix replaced hbase-server with hbase-mapreduce to correct those commands Also this change moved RowCounter_Counters.properties to hbase-mapreduce package as well JIRA https://issues.apache.org/jira/browse/HBASE-19023 Signed-off-by: tedyu --- .../hadoop/hbase/mapred/RowCounter_Counters.properties | 0 .../hadoop/hbase/mapreduce/RowCounter_Counters.properties | 0 src/main/asciidoc/_chapters/mapreduce.adoc | 6 +++--- src/main/asciidoc/_chapters/ops_mgt.adoc | 4 ++-- src/main/asciidoc/_chapters/troubleshooting.adoc | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename {hbase-server => hbase-mapreduce}/src/main/resources/org/apache/hadoop/hbase/mapred/RowCounter_Counters.properties (100%) rename {hbase-server => hbase-mapreduce}/src/main/resources/org/apache/hadoop/hbase/mapreduce/RowCounter_Counters.properties (100%) diff --git a/hbase-server/src/main/resources/org/apache/hadoop/hbase/mapred/RowCounter_Counters.properties b/hbase-mapreduce/src/main/resources/org/apache/hadoop/hbase/mapred/RowCounter_Counters.properties similarity index 100% rename from hbase-server/src/main/resources/org/apache/hadoop/hbase/mapred/RowCounter_Counters.properties rename to hbase-mapreduce/src/main/resources/org/apache/hadoop/hbase/mapred/RowCounter_Counters.properties diff --git a/hbase-server/src/main/resources/org/apache/hadoop/hbase/mapreduce/RowCounter_Counters.properties b/hbase-mapreduce/src/main/resources/org/apache/hadoop/hbase/mapreduce/RowCounter_Counters.properties similarity index 100% rename from hbase-server/src/main/resources/org/apache/hadoop/hbase/mapreduce/RowCounter_Counters.properties rename to hbase-mapreduce/src/main/resources/org/apache/hadoop/hbase/mapreduce/RowCounter_Counters.properties diff --git a/src/main/asciidoc/_chapters/mapreduce.adoc b/src/main/asciidoc/_chapters/mapreduce.adoc index cc9dce45075..61cff86993f 100644 --- a/src/main/asciidoc/_chapters/mapreduce.adoc +++ b/src/main/asciidoc/_chapters/mapreduce.adoc @@ -142,7 +142,7 @@ If this occurs, try modifying the command as follows, so that it uses the HBase [source,bash] ---- -$ HADOOP_CLASSPATH=${HBASE_BUILD_HOME}/hbase-server/target/hbase-server-VERSION-SNAPSHOT.jar:`${HBASE_BUILD_HOME}/bin/hbase classpath` ${HADOOP_HOME}/bin/hadoop jar ${HBASE_BUILD_HOME}/hbase-server/target/hbase-server-VERSION-SNAPSHOT.jar rowcounter usertable +$ HADOOP_CLASSPATH=${HBASE_BUILD_HOME}/hbase-mapreduce/target/hbase-mapreduce-VERSION-SNAPSHOT.jar:`${HBASE_BUILD_HOME}/bin/hbase classpath` ${HADOOP_HOME}/bin/hadoop jar ${HBASE_BUILD_HOME}/hbase-mapreduce/target/hbase-mapreduce-VERSION-SNAPSHOT.jar rowcounter usertable ---- ==== @@ -238,7 +238,7 @@ To learn about the bundled MapReduce jobs, run the following command. [source,bash] ---- -$ ${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/hbase-server-VERSION.jar +$ ${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/hbase-mapreduce-VERSION.jar An example program must be given as the first argument. Valid program names are: copytable: Export a table from local cluster to peer cluster @@ -254,7 +254,7 @@ To run one of the jobs, model your command after the following example. [source,bash] ---- -$ ${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/hbase-server-VERSION.jar rowcounter myTable +$ ${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/hbase-mapreduce-VERSION.jar rowcounter myTable ---- == HBase as a MapReduce Job Data Source and Data Sink diff --git a/src/main/asciidoc/_chapters/ops_mgt.adoc b/src/main/asciidoc/_chapters/ops_mgt.adoc index d4478fa4b28..7b0f89b47d8 100644 --- a/src/main/asciidoc/_chapters/ops_mgt.adoc +++ b/src/main/asciidoc/_chapters/ops_mgt.adoc @@ -595,7 +595,7 @@ For ImportTsv to use this input file, the command line needs to look like this: ---- - HADOOP_CLASSPATH=`${HBASE_HOME}/bin/hbase classpath` ${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/hbase-server-VERSION.jar importtsv -Dimporttsv.columns=HBASE_ROW_KEY,d:c1,d:c2 -Dimporttsv.bulk.output=hdfs://storefileoutput datatsv hdfs://inputfile + HADOOP_CLASSPATH=`${HBASE_HOME}/bin/hbase classpath` ${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/hbase-mapreduce-VERSION.jar importtsv -Dimporttsv.columns=HBASE_ROW_KEY,d:c1,d:c2 -Dimporttsv.bulk.output=hdfs://storefileoutput datatsv hdfs://inputfile ---- \... and in this example the first column is the rowkey, which is why the HBASE_ROW_KEY is used. @@ -1476,7 +1476,7 @@ The `VerifyReplication` MapReduce job, which is included in HBase, performs a sy + [source,bash] ---- -$ HADOOP_CLASSPATH=`${HBASE_HOME}/bin/hbase classpath` "${HADOOP_HOME}/bin/hadoop" jar "${HBASE_HOME}/hbase-server-VERSION.jar" verifyrep --starttime= --endtime= --families= +$ HADOOP_CLASSPATH=`${HBASE_HOME}/bin/hbase classpath` "${HADOOP_HOME}/bin/hadoop" jar "${HBASE_HOME}/hbase-mapreduce-VERSION.jar" verifyrep --starttime= --endtime= --families= ---- + The `VerifyReplication` command prints out `GOODROWS` and `BADROWS` counters to indicate rows that did and did not replicate correctly. diff --git a/src/main/asciidoc/_chapters/troubleshooting.adoc b/src/main/asciidoc/_chapters/troubleshooting.adoc index ec0a34d0684..741e1ec8199 100644 --- a/src/main/asciidoc/_chapters/troubleshooting.adoc +++ b/src/main/asciidoc/_chapters/troubleshooting.adoc @@ -758,7 +758,7 @@ For example (substitute VERSION with your HBase version): [source,bourne] ---- -HADOOP_CLASSPATH=`hbase classpath` hadoop jar $HBASE_HOME/hbase-server-VERSION.jar rowcounter usertable +HADOOP_CLASSPATH=`hbase classpath` hadoop jar $HBASE_HOME/hbase-mapreduce-VERSION.jar rowcounter usertable ---- See <> for more information on HBase MapReduce jobs and classpaths.