You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/10/14 19:59:05 UTC
[3/3] accumulo git commit: ACCUMULO-4028 use known information to
pick a random server, merge to master
ACCUMULO-4028 use known information to pick a random server, merge to master
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/10cafac9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/10cafac9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/10cafac9
Branch: refs/heads/master
Commit: 10cafac9476eb8890df585da7901d02592b26640
Parents: c30e558 78e2c65
Author: Eric C. Newton <er...@gmail.com>
Authored: Wed Oct 14 13:58:26 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Wed Oct 14 13:58:26 2015 -0400
----------------------------------------------------------------------
.../accumulo/master/tableOps/BulkImport.java | 1 +
.../accumulo/master/tableOps/LoadFiles.java | 22 ++++++++++++--------
2 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/10cafac9/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/10cafac9/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
----------------------------------------------------------------------
diff --cc server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
index 48cbaa5,a80e1ff..75b66da
--- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
@@@ -31,20 -31,17 +32,18 @@@ import java.util.concurrent.Callable
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import org.apache.accumulo.core.client.impl.AcceptableThriftTableOperationException;
- import org.apache.accumulo.core.client.impl.ServerClient;
import org.apache.accumulo.core.client.impl.thrift.ClientService;
- import org.apache.accumulo.core.client.impl.thrift.ClientService.Client;
import org.apache.accumulo.core.client.impl.thrift.TableOperation;
import org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType;
-import org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.master.thrift.BulkImportState;
+ import org.apache.accumulo.core.rpc.ThriftUtil;
import org.apache.accumulo.core.trace.Tracer;
- import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.SimpleThreadPool;
-import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.fate.Repo;
import org.apache.accumulo.master.Master;
import org.apache.accumulo.server.fs.VolumeManager;