milleruntime closed pull request #401: Fix ChaoticBalancerIT
URL: https://github.com/apache/accumulo/pull/401
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 0720f832f2..b85749a42a 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 @@ public long
balance(SortedMap<TServerInstance,TabletServerStatus> current, Set<K
@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 635eec663c..770317c5a0 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 void configureMiniCluster(MiniAccumuloConfigImpl cfg,
Configuration hadoo
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 void test() throws Exception {
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++) {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
