[accumulo] branch master updated: Use master.rename.threadpool.size for new bulk import

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new d5f0c8c  Use master.rename.threadpool.size for new bulk import
d5f0c8c is described below

commit d5f0c8ce36b6b5c8421320ed82903aae051d94f6
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Mar 26 14:10:41 2020 -0400

    Use master.rename.threadpool.size for new bulk import
    
    * Follow up work for #1464 - new bulk import also uses the old thread
    pool size property so this resolves to the new property
---
 .../apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java
 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java
index e93836a..37ec695 100644
--- 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/bulkVer2/BulkImportMove.java
@@ -31,6 +31,7 @@ import 
org.apache.accumulo.core.clientImpl.AcceptableThriftTableOperationExcepti
 import org.apache.accumulo.core.clientImpl.bulk.BulkSerialize;
 import org.apache.accumulo.core.clientImpl.thrift.TableOperation;
 import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType;
+import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.master.state.tables.TableState;
 import org.apache.accumulo.core.util.SimpleThreadPool;
@@ -108,7 +109,10 @@ class BulkImportMove extends MasterRepo {
     MetadataTableUtil.addBulkLoadInProgressFlag(master.getContext(),
         "/" + bulkDir.getParent().getName() + "/" + bulkDir.getName(), tid);
 
-    int workerCount = 
master.getConfiguration().getCount(Property.MASTER_BULK_RENAME_THREADS);
+    AccumuloConfiguration aConf = master.getConfiguration();
+    @SuppressWarnings("deprecation")
+    int workerCount = aConf.getCount(
+        aConf.resolve(Property.MASTER_RENAME_THREADS, 
Property.MASTER_BULK_RENAME_THREADS));
     SimpleThreadPool workers = new SimpleThreadPool(workerCount, "bulkDir 
move");
     List<Future<Boolean>> results = new ArrayList<>();