Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CachingCostBalancerStrategyFactory's constructor (#4974) 

* Fix CachingCostBalancerStrategyFactory's constructor

* Fix CachingCostBalancerStrategyFactory not registered in Lifecycle
This commit is contained in:
Roman Leventov 2017-10-18 16:21:54 -05:00 committed by GitHub
parent 5fc6891404
commit 26b87c9f8e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/src/main/java/io/druid/server/coordinator/CachingCostBalancerStrategyFactory.java
View File

@ -19,16 +19,17 @@
package io.druid.server.coordinator; package io.druid.server.coordinator;
import com.fasterxml.jackson.annotation.JacksonInject;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.inject.Inject;
import com.metamx.emitter.EmittingLogger; import com.metamx.emitter.EmittingLogger;
import io.druid.client.ServerInventoryView; import io.druid.client.ServerInventoryView;
import io.druid.client.ServerView; import io.druid.client.ServerView;
import io.druid.java.util.common.concurrent.Execs; import io.druid.java.util.common.concurrent.Execs;
import io.druid.concurrent.LifecycleLock; import io.druid.concurrent.LifecycleLock;
import io.druid.guice.ManageLifecycle;
import io.druid.java.util.common.ISE; import io.druid.java.util.common.ISE;
import io.druid.java.util.common.lifecycle.Lifecycle;
import io.druid.java.util.common.lifecycle.LifecycleStart; import io.druid.java.util.common.lifecycle.LifecycleStart;
import io.druid.java.util.common.lifecycle.LifecycleStop; import io.druid.java.util.common.lifecycle.LifecycleStop;
import io.druid.server.coordination.DruidServerMetadata; import io.druid.server.coordination.DruidServerMetadata;
@ -43,7 +44,6 @@ import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
@ManageLifecycle
public class CachingCostBalancerStrategyFactory implements BalancerStrategyFactory public class CachingCostBalancerStrategyFactory implements BalancerStrategyFactory
{ {
private static final EmittingLogger LOG = new EmittingLogger(CachingCostBalancerStrategyFactory.class); private static final EmittingLogger LOG = new EmittingLogger(CachingCostBalancerStrategyFactory.class);
@ -55,10 +55,16 @@ public class CachingCostBalancerStrategyFactory implements BalancerStrategyFacto
private final ClusterCostCache.Builder clusterCostCacheBuilder = ClusterCostCache.builder(); private final ClusterCostCache.Builder clusterCostCacheBuilder = ClusterCostCache.builder();
private volatile boolean initialized = false; private volatile boolean initialized = false;
@Inject @JsonCreator
public CachingCostBalancerStrategyFactory(ServerInventoryView serverInventoryView) public CachingCostBalancerStrategyFactory(
@JacksonInject ServerInventoryView serverInventoryView,
@JacksonInject Lifecycle lifecycle
) throws Exception
{ {
this.serverInventoryView = Preconditions.checkNotNull(serverInventoryView); this.serverInventoryView = Preconditions.checkNotNull(serverInventoryView);
// Adding to lifecycle dynamically because couldn't use @ManageLifecycle on the class,
// see https://github.com/druid-io/druid/issues/4980
lifecycle.addMaybeStartManagedInstance(this);
} }
@LifecycleStart @LifecycleStart
@ -123,7 +129,7 @@ public class CachingCostBalancerStrategyFactory implements BalancerStrategyFacto
@Override @Override
public BalancerStrategy createBalancerStrategy(final ListeningExecutorService exec) public BalancerStrategy createBalancerStrategy(final ListeningExecutorService exec)
{ {
if (!lifecycleLock.awaitStarted()) { if (!lifecycleLock.awaitStarted(1, TimeUnit.MINUTES)) {
throw new ISE("CachingCostBalancerStrategyFactory is not started"); throw new ISE("CachingCostBalancerStrategyFactory is not started");
} }
if (initialized) { if (initialized) {