diff --git src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java index 0f476d0..a382708 100644 --- src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java +++ src/main/java/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.java @@ -106,21 +106,29 @@ public class LoadIncrementalHFiles extends Configured implements Tool { private boolean hasForwardedToken; private Token userToken; private String bulkToken; - private final boolean assignSeqIds; + private boolean assignSeqIds; private UserProvider userProvider; + private LoadIncrementalHFiles() {} + public LoadIncrementalHFiles(Configuration conf) throws Exception { this(conf, false); } public LoadIncrementalHFiles(Configuration conf, boolean useSecureHBaseOverride) throws Exception { super(conf); - this.cfg = conf; - this.hbAdmin = new HBaseAdmin(conf); - //added simple for testing - this.userProvider = UserProvider.instantiate(conf); - this.useSecure = useSecureHBaseOverride || userProvider.isHBaseSecurityEnabled(); - this.assignSeqIds = conf.getBoolean(ASSIGN_SEQ_IDS, false); + initialize(useSecureHBaseOverride); + } + + private void initialize(boolean useSecureHBaseOverride) throws Exception { + if (hbAdmin == null) { + Configuration conf = getConf(); + this.cfg = conf; + this.hbAdmin = new HBaseAdmin(conf); + this.userProvider = UserProvider.instantiate(conf); + this.useSecure = useSecureHBaseOverride || userProvider.isHBaseSecurityEnabled(); + assignSeqIds = conf.getBoolean(ASSIGN_SEQ_IDS, false); + } } private void usage() { @@ -815,6 +823,8 @@ public class LoadIncrementalHFiles extends Configured implements Tool { return -1; } + initialize(false); + String dirPath = args[0]; String tableName = args[1]; @@ -829,7 +839,8 @@ public class LoadIncrementalHFiles extends Configured implements Tool { } public static void main(String[] args) throws Exception { - int ret = ToolRunner.run(new LoadIncrementalHFiles(HBaseConfiguration.create()), args); + Configuration conf = HBaseConfiguration.create(); + int ret = ToolRunner.run(conf, new LoadIncrementalHFiles(), args); System.exit(ret); }