Merge branch '1.6.1-SNAPSHOT'
Conflicts:
server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7b385fed
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7b385fed
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7b385fed
Branch: refs/heads/master
Commit: 7b385fed5ff15d1bbd8a5e9510913b20664c2f24
Parents: 3c11090 533983f
Author: Sean Busbey <[email protected]>
Authored: Sun Aug 3 00:33:48 2014 -0500
Committer: Sean Busbey <[email protected]>
Committed: Sun Aug 3 00:33:48 2014 -0500
----------------------------------------------------------------------
.../core/client/AccumuloSecurityException.java | 8 +
.../impl/MiniAccumuloClusterImpl.java | 32 ++++
.../impl/MiniAccumuloClusterImplTest.java | 37 +++++
minicluster/src/test/resources/log4j.properties | 22 ++-
.../master/balancer/ChaoticLoadBalancer.java | 12 +-
.../master/balancer/DefaultLoadBalancer.java | 12 +-
.../server/master/balancer/TabletBalancer.java | 91 +++++++++++
.../server/security/SystemCredentials.java | 21 ++-
.../java/org/apache/accumulo/master/Master.java | 34 ++++-
test/pom.xml | 5 +
.../BalanceInPresenceOfOfflineTableIT.java | 152 +++++++++++++++++++
11 files changed, 411 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b385fed/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
diff --cc
minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index a037859,deb04d9..392894c
---
a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@@ -59,8 -61,11 +61,10 @@@ import org.apache.accumulo.core.client.
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.master.thrift.MasterGoalState;
+ import org.apache.accumulo.core.master.thrift.MasterClientService;
+ import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
import org.apache.accumulo.core.util.Daemon;
import org.apache.accumulo.core.util.Pair;
-import org.apache.accumulo.core.util.StringUtil;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.gc.SimpleGarbageCollector;
import org.apache.accumulo.master.Master;
@@@ -81,9 -88,9 +87,10 @@@ import org.apache.hadoop.fs.FileSystem
import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.log4j.Logger;
+ import org.apache.thrift.TException;
import org.apache.zookeeper.server.ZooKeeperServerMain;
+import com.google.common.base.Joiner;
import com.google.common.base.Predicate;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b385fed/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b385fed/server/base/src/main/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b385fed/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b385fed/server/base/src/main/java/org/apache/accumulo/server/security/SystemCredentials.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b385fed/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b385fed/test/pom.xml
----------------------------------------------------------------------
