accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmil...@apache.org
Subject [accumulo] branch 1.7 updated: Fix ChaoticBalancerIT (#401)
Date Fri, 16 Mar 2018 18:48:10 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/1.7 by this push:
     new acc74c7  Fix ChaoticBalancerIT (#401)
acc74c7 is described below

commit acc74c795fb30f9f3f97fba32db9921752de0c12
Author: Mike Miller <mmiller@apache.org>
AuthorDate: Fri Mar 16 14:48:08 2018 -0400

    Fix ChaoticBalancerIT (#401)
---
 .../accumulo/server/master/balancer/ChaoticLoadBalancer.java       | 7 +------
 .../org/apache/accumulo/test/functional/ChaoticBalancerIT.java     | 3 ++-
 2 files changed, 3 insertions(+), 7 deletions(-)

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.master.thrift.TabletServerStatus;
 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 @@ public class ChaoticLoadBalancer extends TabletBalancer {
   @Deprecated
   @Override
   public void init(ServerConfiguration conf) {
-    throw new NotImplementedException();
+    throw new UnsupportedOperationException();
   }
 
-  @Override
-  public void init(ServerConfigurationFactory conf) {}
-
 }
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 @@ public class ChaoticBalancerIT extends AccumuloClusterIT {
     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 @@ public class ChaoticBalancerIT extends AccumuloClusterIT {
     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++) {

-- 
To stop receiving notification emails like this one, please contact
mmiller@apache.org.

Mime
View raw message