commit acc74c795fb30f9f3f97fba32db9921752de0c12
author Mike Miller <mmiller@apache.org> Fri Mar 16 14:48:08 2018 -0400
committer GitHub <noreply@github.com> Fri Mar 16 14:48:08 2018 -0400
tree a02758610c0184f94c57fefeb12ff2a250029383
parent db200c7e9926851d9c2a3724a2c9576b685783df

Fix ChaoticBalancerIT (#401)

server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java

diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
index 0720f83..b85749a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
@@ -32,10 +32,8 @@
 import org.apache.accumulo.core.metadata.MetadataTable;
 import org.apache.accumulo.core.tabletserver.thrift.TabletStats;
 import org.apache.accumulo.server.conf.ServerConfiguration;
-import org.apache.accumulo.server.conf.ServerConfigurationFactory;
 import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.accumulo.server.master.state.TabletMigration;
-import org.apache.commons.lang.NotImplementedException;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -167,10 +165,7 @@
   @Deprecated
   @Override
   public void init(ServerConfiguration conf) {
-    throw new NotImplementedException();
+    throw new UnsupportedOperationException();
   }
 
-  @Override
-  public void init(ServerConfigurationFactory conf) {}
-
 }

test/src/test/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java

diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
index 635eec6..770317c 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
@@ -42,6 +42,8 @@
     Map<String,String> siteConfig = cfg.getSiteConfig();
     siteConfig.put(Property.TSERV_MAXMEM.getKey(), "10K");
     siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "0");
+    // ChaoticLoadBalancer balances across all tables
+    siteConfig.put(Property.TABLE_LOAD_BALANCER.getKey(), ChaoticLoadBalancer.class.getName());
     cfg.setSiteConfig(siteConfig);
   }
 
@@ -56,7 +58,6 @@
     String[] names = getUniqueNames(2);
     String tableName = names[0], unused = names[1];
     c.tableOperations().create(tableName);
-    c.tableOperations().setProperty(tableName, Property.TABLE_LOAD_BALANCER.getKey(), ChaoticLoadBalancer.class.getName());
     c.tableOperations().setProperty(tableName, Property.TABLE_SPLIT_THRESHOLD.getKey(), "10K");
     SortedSet<Text> splits = new TreeSet<>();
     for (int i = 0; i < 100; i++) {