accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [7/7] accumulo git commit: ACCUMULO-4549 Remove extra init in TabletBalancer
Date Wed, 11 Jan 2017 22:42:20 GMT
ACCUMULO-4549 Remove extra init in TabletBalancer


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fd0a4ebf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fd0a4ebf
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fd0a4ebf

Branch: refs/heads/master
Commit: fd0a4ebf12cba9c7ee9be99fe0b1b30872294e71
Parents: 7f83134
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed Jan 11 17:37:24 2017 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed Jan 11 17:37:24 2017 -0500

----------------------------------------------------------------------
 .../server/master/balancer/ChaoticLoadBalancer.java         | 8 --------
 .../accumulo/server/master/balancer/TabletBalancer.java     | 9 ---------
 2 files changed, 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd0a4ebf/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 995ccba..4d1126d 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
@@ -31,11 +31,9 @@ import org.apache.accumulo.core.master.thrift.TableInfo;
 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;
@@ -164,12 +162,6 @@ public class ChaoticLoadBalancer extends TabletBalancer {
     return 100;
   }
 
-  @Deprecated
-  @Override
-  public void init(ServerConfiguration conf) {
-    throw new NotImplementedException();
-  }
-
   @Override
   public void init(ServerConfigurationFactory conf) {}
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fd0a4ebf/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
index b508433..ac0819b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
@@ -32,7 +32,6 @@ import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
 import org.apache.accumulo.core.tabletserver.thrift.TabletStats;
 import org.apache.accumulo.core.trace.Tracer;
 import org.apache.accumulo.server.AccumuloServerContext;
-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;
@@ -60,14 +59,6 @@ public abstract class TabletBalancer {
   }
 
   /**
-   * @deprecated since 1.7.3 and 1.8.1; overriding this has no effect; subclasses should
override {@link #init(ServerConfigurationFactory)} instead.
-   */
-  @Deprecated
-  public void init(ServerConfiguration conf) {
-    init((ServerConfigurationFactory) conf);
-  }
-
-  /**
    * Assign tablets to tablet servers. This method is called whenever the master finds tablets
that are unassigned.
    *
    * @param current


Mime
View raw message