Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-24884 BulkLoadHFilesTool/LoadIncrementalHFiles should accept -D options from command line parameters (#2260) 

Signed-off-by: Peter Somogyi <psomogyi@apache.org>
This commit is contained in:
Toshihiro Suzuki 2020-08-19 13:36:17 +09:00 committed by GitHub
parent 1231ac0784
commit 1164531d5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hbase-server/src/main/java/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.java
View File

@ -129,14 +129,14 @@ public class BulkLoadHFilesTool extends Configured implements BulkLoadHFiles, To
// above. It is invalid family name.
static final String TMP_DIR = ".tmp";
private final int maxFilesPerRegionPerFamily;
private final boolean assignSeqIds;
private int maxFilesPerRegionPerFamily;
private boolean assignSeqIds;
private boolean bulkLoadByFamily;
// Source delegation token
private final FsDelegationToken fsDelegationToken;
private final UserProvider userProvider;
private final int nrThreads;
private FsDelegationToken fsDelegationToken;
private UserProvider userProvider;
private int nrThreads;
private final AtomicInteger numRetries = new AtomicInteger(0);
private String bulkToken;
@ -146,6 +146,11 @@ public class BulkLoadHFilesTool extends Configured implements BulkLoadHFiles, To
public BulkLoadHFilesTool(Configuration conf) {
// make a copy, just to be sure we're not overriding someone else's config
super(new Configuration(conf));
initialize();
}
public void initialize() {
Configuration conf = getConf();
// disable blockcache for tool invocation, see HBASE-10500
conf.setFloat(HConstants.HFILE_BLOCK_CACHE_SIZE_KEY, 0);
userProvider = UserProvider.instantiate(conf);
@ -1073,6 +1078,8 @@ public class BulkLoadHFilesTool extends Configured implements BulkLoadHFiles, To
usage();
return -1;
}
// Re-initialize to apply -D options from the command line parameters
initialize();
Path dirPath = new Path(args[0]);
TableName tableName = TableName.valueOf(args[1]);
if (args.length == 2) {