Author: jdcryans
Date: Tue Feb 14 01:13:22 2012
New Revision: 1243758
URL: http://svn.apache.org/viewvc?rev=1243758&view=rev
Log:
HBASE-5395 CopyTable needs to use GenericOptionsParser
Modified:
hbase/branches/0.92/CHANGES.txt
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/mapreduce/CopyTable.java
Modified: hbase/branches/0.92/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1243758&r1=1243757&r2=1243758&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Tue Feb 14 01:13:22 2012
@@ -22,6 +22,7 @@ Release 0.92.1 - Unreleased
IMPROVEMENTS
HBASE-5197 [replication] Handle socket timeouts in ReplicationSource
to prevent DDOS
+ HBASE-5395 CopyTable needs to use GenericOptionsParser
TESTS
HBASE-5223 TestMetaReaderEditor is missing call to CatalogTracker.stop()
Modified:
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/mapreduce/CopyTable.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/mapreduce/CopyTable.java?rev=1243758&r1=1243757&r2=1243758&view=diff
==============================================================================
---
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/mapreduce/CopyTable.java
(original)
+++
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/mapreduce/CopyTable.java
Tue Feb 14 01:13:22 2012
@@ -25,6 +25,7 @@ import org.apache.hadoop.hbase.HConstant
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.mapreduce.Job;
+import org.apache.hadoop.util.GenericOptionsParser;
import java.io.IOException;
import java.util.HashMap;
@@ -213,7 +214,9 @@ public class CopyTable {
*/
public static void main(String[] args) throws Exception {
Configuration conf = HBaseConfiguration.create();
- Job job = createSubmittableJob(conf, args);
+ String[] otherArgs =
+ new GenericOptionsParser(conf, args).getRemainingArgs();
+ Job job = createSubmittableJob(conf, otherArgs);
if (job != null) {
System.exit(job.waitForCompletion(true) ? 0 : 1);
}