Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1efc828f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1efc828f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1efc828f Branch: refs/heads/master Commit: 1efc828f32c4a4546b5130cd5bf8e2d4455e2243 Parents: 6302a85 8668c7f Author: Dave Marion <[email protected]> Authored: Wed Jan 25 16:42:26 2017 -0500 Committer: Dave Marion <[email protected]> Committed: Wed Jan 25 16:42:26 2017 -0500 ---------------------------------------------------------------------- .../balancer/HostRegexTableLoadBalancer.java | 84 +++++++++----------- .../BaseHostRegexTableLoadBalancerTest.java | 14 +++- ...gexTableLoadBalancerReconfigurationTest.java | 5 +- .../HostRegexTableLoadBalancerTest.java | 6 +- 4 files changed, 52 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1efc828f/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java ---------------------------------------------------------------------- diff --cc server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java index a7e2a93,33494a7..af7a5da --- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java +++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java @@@ -57,9 -57,9 +57,6 @@@ import org.slf4j.LoggerFactory * If this occurs then the offending tablets will be reassigned. This would cover the case where the configuration is changed and the master is restarted while * the tablet servers are up. To change the out of bounds check time period, set the following property:<br> * <b>table.custom.balancer.host.regex.oob.period=5m</b><br> - * Periodically (default 1m) this balancer will regroup the set of current tablet servers into pools based on regexes applied to the tserver host names. This - * would cover the case of tservers dying or coming online. To change the host pool check time period, set the following property: <br> - * <b>table.custom.balancer.host.regex.pool.check=5m</b><br> - * (Deprecated) Periodically (default 1m) this balancer will regroup the set of current tablet servers into pools based on regexes applied to the tserver host - * names. This would cover the case of tservers dying or coming online. To change the host pool check time period, set the following property: <br> - * <b>table.custom.balancer.host.regex.pool.check=5m (Deprecated)</b><br> * Regex matching can be based on either the host name (default) or host ip address. To set this balancer to match the regular expressions to the tablet server * IP address, then set the following property:<br> * <b>table.custom.balancer.host.regex.is.ip=true</b><br> @@@ -74,8 -74,10 +71,6 @@@ public class HostRegexTableLoadBalance public static final String HOST_BALANCER_PREFIX = Property.TABLE_ARBITRARY_PROP_PREFIX.getKey() + "balancer.host.regex."; public static final String HOST_BALANCER_OOB_CHECK_KEY = Property.TABLE_ARBITRARY_PROP_PREFIX.getKey() + "balancer.host.regex.oob.period"; private static final String HOST_BALANCER_OOB_DEFAULT = "5m"; - @Deprecated -- public static final String HOST_BALANCER_POOL_RECHECK_KEY = Property.TABLE_ARBITRARY_PROP_PREFIX.getKey() + "balancer.host.regex.pool.check"; - @Deprecated -- private static final String HOST_BALANCER_POOL_RECHECK_DEFAULT = "1m"; public static final String HOST_BALANCER_REGEX_USING_IPS_KEY = Property.TABLE_ARBITRARY_PROP_PREFIX.getKey() + "balancer.host.regex.is.ip"; public static final String HOST_BALANCER_REGEX_MAX_MIGRATIONS_KEY = Property.TABLE_ARBITRARY_PROP_PREFIX.getKey() + "balancer.host.regex.concurrent.migrations"; @@@ -242,10 -240,11 +233,6 @@@ return oobCheckMillis; } - @Deprecated -- public long getPoolRecheckMillis() { - return poolRecheckMillis; - return 0; -- } -- public boolean isIpBasedRegex() { return isIpBasedRegex; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/1efc828f/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java ---------------------------------------------------------------------- diff --cc server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java index 9360c82,a1730cb..2c0d20e --- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java @@@ -24,8 -24,9 +24,10 @@@ import java.util.List import java.util.Map; import java.util.Map.Entry; import java.util.SortedMap; + import java.util.SortedSet; import java.util.TreeMap; + import java.util.TreeSet; +import java.util.function.Predicate; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; http://git-wip-us.apache.org/repos/asf/accumulo/blob/1efc828f/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java ---------------------------------------------------------------------- diff --cc server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java index 79561c4,6ac4096..fb5fc1a --- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java +++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java @@@ -49,8 -50,8 +49,7 @@@ public class HostRegexTableLoadBalancer @Test public void testInit() { init(factory); - Assert.assertEquals("OOB check interval value is incorrect", 10000, this.getOobCheckMillis()); - Assert.assertEquals("Pool check interval value is incorrect", 30000, this.getPoolRecheckMillis()); + Assert.assertEquals("OOB check interval value is incorrect", 2000, this.getOobCheckMillis()); - Assert.assertEquals("Pool check interval value is incorrect", 0, this.getPoolRecheckMillis()); Assert.assertFalse(isIpBasedRegex()); Map<String,Pattern> patterns = this.getPoolNameToRegexPattern(); Assert.assertEquals(2, patterns.size());
