Repository: hbase Updated Branches: refs/heads/branch-2 b9f1f5a17 -> b2f9b7bc1
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 <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b2f9b7bc Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b2f9b7bc Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b2f9b7bc Branch: refs/heads/branch-2 Commit: b2f9b7bc194a9ab93ae25f103220a92396bc43ad Parents: b9f1f5a Author: TAK LON WU <[email protected]> Authored: Fri Dec 1 15:25:59 2017 -0800 Committer: tedyu <[email protected]> Committed: Wed Dec 6 09:04:02 2017 -0800 ---------------------------------------------------------------------- .../hbase/mapred/RowCounter_Counters.properties | 21 ++++++++++++++++++++ .../mapreduce/RowCounter_Counters.properties | 21 ++++++++++++++++++++ .../hbase/mapred/RowCounter_Counters.properties | 21 -------------------- .../mapreduce/RowCounter_Counters.properties | 21 -------------------- src/main/asciidoc/_chapters/mapreduce.adoc | 8 ++++---- src/main/asciidoc/_chapters/ops_mgt.adoc | 4 ++-- .../asciidoc/_chapters/troubleshooting.adoc | 2 +- 7 files changed, 49 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b2f9b7bc/hbase-mapreduce/src/main/resources/org/apache/hadoop/hbase/mapred/RowCounter_Counters.properties ---------------------------------------------------------------------- diff --git a/hbase-mapreduce/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 new file mode 100644 index 0000000..661e56d --- /dev/null +++ b/hbase-mapreduce/src/main/resources/org/apache/hadoop/hbase/mapred/RowCounter_Counters.properties @@ -0,0 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# ResourceBundle properties file for RowCounter MR job + +CounterGroupName= RowCounter + +ROWS.name= Rows http://git-wip-us.apache.org/repos/asf/hbase/blob/b2f9b7bc/hbase-mapreduce/src/main/resources/org/apache/hadoop/hbase/mapreduce/RowCounter_Counters.properties ---------------------------------------------------------------------- diff --git a/hbase-mapreduce/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 new file mode 100644 index 0000000..661e56d --- /dev/null +++ b/hbase-mapreduce/src/main/resources/org/apache/hadoop/hbase/mapreduce/RowCounter_Counters.properties @@ -0,0 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# ResourceBundle properties file for RowCounter MR job + +CounterGroupName= RowCounter + +ROWS.name= Rows http://git-wip-us.apache.org/repos/asf/hbase/blob/b2f9b7bc/hbase-server/src/main/resources/org/apache/hadoop/hbase/mapred/RowCounter_Counters.properties ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/org/apache/hadoop/hbase/mapred/RowCounter_Counters.properties b/hbase-server/src/main/resources/org/apache/hadoop/hbase/mapred/RowCounter_Counters.properties deleted file mode 100644 index 661e56d..0000000 --- a/hbase-server/src/main/resources/org/apache/hadoop/hbase/mapred/RowCounter_Counters.properties +++ /dev/null @@ -1,21 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# ResourceBundle properties file for RowCounter MR job - -CounterGroupName= RowCounter - -ROWS.name= Rows http://git-wip-us.apache.org/repos/asf/hbase/blob/b2f9b7bc/hbase-server/src/main/resources/org/apache/hadoop/hbase/mapreduce/RowCounter_Counters.properties ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/org/apache/hadoop/hbase/mapreduce/RowCounter_Counters.properties b/hbase-server/src/main/resources/org/apache/hadoop/hbase/mapreduce/RowCounter_Counters.properties deleted file mode 100644 index 661e56d..0000000 --- a/hbase-server/src/main/resources/org/apache/hadoop/hbase/mapreduce/RowCounter_Counters.properties +++ /dev/null @@ -1,21 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# ResourceBundle properties file for RowCounter MR job - -CounterGroupName= RowCounter - -ROWS.name= Rows http://git-wip-us.apache.org/repos/asf/hbase/blob/b2f9b7bc/src/main/asciidoc/_chapters/mapreduce.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/_chapters/mapreduce.adoc b/src/main/asciidoc/_chapters/mapreduce.adoc index dfa843a..9bafe61 100644 --- a/src/main/asciidoc/_chapters/mapreduce.adoc +++ b/src/main/asciidoc/_chapters/mapreduce.adoc @@ -70,7 +70,7 @@ This example assumes you use a BASH-compatible shell. [source,bash] ---- -$ HADOOP_CLASSPATH=`${HBASE_HOME}/bin/hbase classpath` ${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/lib/hbase-server-VERSION.jar rowcounter usertable +$ HADOOP_CLASSPATH=`${HBASE_HOME}/bin/hbase classpath` ${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/lib/hbase-mapreduce-VERSION.jar rowcounter usertable ---- When the command runs, internally, the HBase JAR finds the dependencies it needs and adds them to the MapReduce job configuration. @@ -98,7 +98,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 ---- ==== @@ -194,7 +194,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 @@ -210,7 +210,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 http://git-wip-us.apache.org/repos/asf/hbase/blob/b2f9b7bc/src/main/asciidoc/_chapters/ops_mgt.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/_chapters/ops_mgt.adoc b/src/main/asciidoc/_chapters/ops_mgt.adoc index 66f8d27..bcf71b6 100644 --- a/src/main/asciidoc/_chapters/ops_mgt.adoc +++ b/src/main/asciidoc/_chapters/ops_mgt.adoc @@ -551,7 +551,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. @@ -1432,7 +1432,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=<timestamp> --endtime=<timestamp> --families=<myFam> <ID> <tableName> +$ HADOOP_CLASSPATH=`${HBASE_HOME}/bin/hbase classpath` "${HADOOP_HOME}/bin/hadoop" jar "${HBASE_HOME}/hbase-mapreduce-VERSION.jar" verifyrep --starttime=<timestamp> --endtime=<timestamp> --families=<myFam> <ID> <tableName> ---- + The `VerifyReplication` command prints out `GOODROWS` and `BADROWS` counters to indicate rows that did and did not replicate correctly. http://git-wip-us.apache.org/repos/asf/hbase/blob/b2f9b7bc/src/main/asciidoc/_chapters/troubleshooting.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/_chapters/troubleshooting.adoc b/src/main/asciidoc/_chapters/troubleshooting.adoc index 1cf93d6..9657151 100644 --- a/src/main/asciidoc/_chapters/troubleshooting.adoc +++ b/src/main/asciidoc/_chapters/troubleshooting.adoc @@ -755,7 +755,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 http://hbase.apache.org/apidocs/org/apache/hadoop/hbase/mapreduce/package-summary.html#classpathfor more information on HBase MapReduce jobs and classpaths.
