You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ka...@apache.org on 2013/10/16 02:09:47 UTC
[4/4] git commit: [HELIX-209] Moving rebalancer code around, take 2
[HELIX-209] Moving rebalancer code around, take 2
Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/e032132a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/e032132a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/e032132a
Branch: refs/heads/helix-logical-model
Commit: e032132a6232bb9c66f00dc1d75f4cd61b6f91b1
Parents: 9f229c8
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Tue Oct 15 17:09:14 2013 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Tue Oct 15 17:09:14 2013 -0700
----------------------------------------------------------------------
.../java/org/apache/helix/api/Resource.java | 4 +-
.../api/accessor/AtomicResourceAccessor.java | 2 +-
.../helix/api/accessor/ClusterAccessor.java | 4 +-
.../helix/api/accessor/ParticipantAccessor.java | 4 +-
.../helix/api/accessor/ResourceAccessor.java | 10 +-
.../apache/helix/api/config/ResourceConfig.java | 4 +-
.../api/rebalancer/BasicRebalancerContext.java | 239 ------------
.../helix/api/rebalancer/ContextSerializer.java | 37 --
.../helix/api/rebalancer/CustomRebalancer.java | 123 ------
.../api/rebalancer/CustomRebalancerContext.java | 161 --------
.../rebalancer/DefaultContextSerializer.java | 83 -----
.../api/rebalancer/FullAutoRebalancer.java | 194 ----------
.../rebalancer/FullAutoRebalancerContext.java | 61 ---
.../PartitionedRebalancerContext.java | 372 ------------------
.../apache/helix/api/rebalancer/Rebalancer.java | 38 --
.../helix/api/rebalancer/RebalancerConfig.java | 177 ---------
.../helix/api/rebalancer/RebalancerContext.java | 93 -----
.../helix/api/rebalancer/RebalancerRef.java | 94 -----
.../rebalancer/ReplicatedRebalancerContext.java | 40 --
.../api/rebalancer/SemiAutoRebalancer.java | 81 ----
.../rebalancer/SemiAutoRebalancerContext.java | 176 ---------
.../util/ConstraintBasedAssignment.java | 244 ------------
.../controller/rebalancer/AutoRebalancer.java | 187 ----------
.../controller/rebalancer/CustomRebalancer.java | 142 ++++---
.../rebalancer/FullAutoRebalancer.java | 196 ++++++++++
.../helix/controller/rebalancer/Rebalancer.java | 41 +-
.../controller/rebalancer/RebalancerRef.java | 94 +++++
.../rebalancer/SemiAutoRebalancer.java | 94 ++---
.../context/BasicRebalancerContext.java | 240 ++++++++++++
.../rebalancer/context/ContextSerializer.java | 37 ++
.../context/CustomRebalancerContext.java | 163 ++++++++
.../context/DefaultContextSerializer.java | 83 +++++
.../context/FullAutoRebalancerContext.java | 63 ++++
.../context/PartitionedRebalancerContext.java | 373 +++++++++++++++++++
.../rebalancer/context/RebalancerConfig.java | 178 +++++++++
.../rebalancer/context/RebalancerContext.java | 94 +++++
.../context/ReplicatedRebalancerContext.java | 40 ++
.../context/SemiAutoRebalancerContext.java | 178 +++++++++
.../util/ConstraintBasedAssignment.java | 182 +++++----
.../stages/BestPossibleStateCalcStage.java | 8 +-
.../stages/ExternalViewComputeStage.java | 4 +-
.../stages/MessageGenerationStage.java | 2 +-
.../stages/MessageSelectionStage.java | 6 +-
.../stages/RebalanceIdealStateStage.java | 2 +-
.../stages/ResourceComputationStage.java | 6 +-
.../controller/rebalancer/AutoRebalancer.java | 187 ++++++++++
.../controller/rebalancer/CustomRebalancer.java | 135 +++++++
.../controller/rebalancer/Rebalancer.java | 58 +++
.../rebalancer/SemiAutoRebalancer.java | 83 +++++
.../util/ConstraintBasedAssignment.java | 194 ++++++++++
.../java/org/apache/helix/model/IdealState.java | 2 +-
.../org/apache/helix/tools/NewClusterSetup.java | 8 +-
.../org/apache/helix/api/TestNewStages.java | 2 +-
.../org/apache/helix/api/TestUpdateConfig.java | 4 +-
.../context/TestSerializeRebalancerContext.java | 3 -
.../helix/controller/stages/BaseStageTest.java | 4 +-
.../stages/TestResourceComputationStage.java | 2 +-
.../strategy/TestAutoRebalanceStrategy.java | 2 +-
.../strategy/TestNewAutoRebalanceStrategy.java | 2 +-
.../TestCustomizedIdealStateRebalancer.java | 6 +-
.../apache/helix/examples/NewModelExample.java | 2 +-
61 files changed, 2681 insertions(+), 2667 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/Resource.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/Resource.java b/helix-core/src/main/java/org/apache/helix/api/Resource.java
index a505aeb..79a1e09 100644
--- a/helix-core/src/main/java/org/apache/helix/api/Resource.java
+++ b/helix-core/src/main/java/org/apache/helix/api/Resource.java
@@ -30,8 +30,8 @@ import org.apache.helix.api.config.UserConfig;
import org.apache.helix.api.id.PartitionId;
import org.apache.helix.api.id.ResourceId;
import org.apache.helix.api.id.StateModelDefId;
-import org.apache.helix.api.rebalancer.RebalancerConfig;
-import org.apache.helix.api.rebalancer.RebalancerContext;
+import org.apache.helix.controller.rebalancer.context.RebalancerConfig;
+import org.apache.helix.controller.rebalancer.context.RebalancerContext;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.IdealState;
import org.apache.helix.model.Message;
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/accessor/AtomicResourceAccessor.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/accessor/AtomicResourceAccessor.java b/helix-core/src/main/java/org/apache/helix/api/accessor/AtomicResourceAccessor.java
index 74b6bdb..6d69981 100644
--- a/helix-core/src/main/java/org/apache/helix/api/accessor/AtomicResourceAccessor.java
+++ b/helix-core/src/main/java/org/apache/helix/api/accessor/AtomicResourceAccessor.java
@@ -6,7 +6,7 @@ import org.apache.helix.api.Scope;
import org.apache.helix.api.config.ResourceConfig;
import org.apache.helix.api.id.ClusterId;
import org.apache.helix.api.id.ResourceId;
-import org.apache.helix.api.rebalancer.RebalancerContext;
+import org.apache.helix.controller.rebalancer.context.RebalancerContext;
import org.apache.helix.lock.HelixLock;
import org.apache.helix.lock.HelixLockable;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/accessor/ClusterAccessor.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/accessor/ClusterAccessor.java b/helix-core/src/main/java/org/apache/helix/api/accessor/ClusterAccessor.java
index ed6c844..85b8432 100644
--- a/helix-core/src/main/java/org/apache/helix/api/accessor/ClusterAccessor.java
+++ b/helix-core/src/main/java/org/apache/helix/api/accessor/ClusterAccessor.java
@@ -51,8 +51,8 @@ import org.apache.helix.api.id.PartitionId;
import org.apache.helix.api.id.ResourceId;
import org.apache.helix.api.id.SessionId;
import org.apache.helix.api.id.StateModelDefId;
-import org.apache.helix.api.rebalancer.RebalancerConfig;
-import org.apache.helix.api.rebalancer.RebalancerContext;
+import org.apache.helix.controller.rebalancer.context.RebalancerConfig;
+import org.apache.helix.controller.rebalancer.context.RebalancerContext;
import org.apache.helix.model.Alerts;
import org.apache.helix.model.ClusterConfiguration;
import org.apache.helix.model.ClusterConstraints;
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/accessor/ParticipantAccessor.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/accessor/ParticipantAccessor.java b/helix-core/src/main/java/org/apache/helix/api/accessor/ParticipantAccessor.java
index ff24ee9..83dd53e 100644
--- a/helix-core/src/main/java/org/apache/helix/api/accessor/ParticipantAccessor.java
+++ b/helix-core/src/main/java/org/apache/helix/api/accessor/ParticipantAccessor.java
@@ -51,8 +51,8 @@ import org.apache.helix.api.id.PartitionId;
import org.apache.helix.api.id.ResourceId;
import org.apache.helix.api.id.SessionId;
import org.apache.helix.api.id.StateModelDefId;
-import org.apache.helix.api.rebalancer.PartitionedRebalancerContext;
-import org.apache.helix.api.rebalancer.RebalancerContext;
+import org.apache.helix.controller.rebalancer.context.PartitionedRebalancerContext;
+import org.apache.helix.controller.rebalancer.context.RebalancerContext;
import org.apache.helix.model.CurrentState;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.IdealState;
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/accessor/ResourceAccessor.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/accessor/ResourceAccessor.java b/helix-core/src/main/java/org/apache/helix/api/accessor/ResourceAccessor.java
index b959f17..517c8c4 100644
--- a/helix-core/src/main/java/org/apache/helix/api/accessor/ResourceAccessor.java
+++ b/helix-core/src/main/java/org/apache/helix/api/accessor/ResourceAccessor.java
@@ -38,11 +38,11 @@ import org.apache.helix.api.config.UserConfig;
import org.apache.helix.api.id.ParticipantId;
import org.apache.helix.api.id.PartitionId;
import org.apache.helix.api.id.ResourceId;
-import org.apache.helix.api.rebalancer.CustomRebalancerContext;
-import org.apache.helix.api.rebalancer.PartitionedRebalancerContext;
-import org.apache.helix.api.rebalancer.RebalancerConfig;
-import org.apache.helix.api.rebalancer.RebalancerContext;
-import org.apache.helix.api.rebalancer.SemiAutoRebalancerContext;
+import org.apache.helix.controller.rebalancer.context.CustomRebalancerContext;
+import org.apache.helix.controller.rebalancer.context.PartitionedRebalancerContext;
+import org.apache.helix.controller.rebalancer.context.RebalancerConfig;
+import org.apache.helix.controller.rebalancer.context.RebalancerContext;
+import org.apache.helix.controller.rebalancer.context.SemiAutoRebalancerContext;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.IdealState;
import org.apache.helix.model.IdealState.RebalanceMode;
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/config/ResourceConfig.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/config/ResourceConfig.java b/helix-core/src/main/java/org/apache/helix/api/config/ResourceConfig.java
index ec1d8f6..38d48ab 100644
--- a/helix-core/src/main/java/org/apache/helix/api/config/ResourceConfig.java
+++ b/helix-core/src/main/java/org/apache/helix/api/config/ResourceConfig.java
@@ -7,8 +7,8 @@ import org.apache.helix.api.Partition;
import org.apache.helix.api.Scope;
import org.apache.helix.api.id.PartitionId;
import org.apache.helix.api.id.ResourceId;
-import org.apache.helix.api.rebalancer.RebalancerConfig;
-import org.apache.helix.api.rebalancer.RebalancerContext;
+import org.apache.helix.controller.rebalancer.context.RebalancerConfig;
+import org.apache.helix.controller.rebalancer.context.RebalancerContext;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/rebalancer/BasicRebalancerContext.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/rebalancer/BasicRebalancerContext.java b/helix-core/src/main/java/org/apache/helix/api/rebalancer/BasicRebalancerContext.java
deleted file mode 100644
index b346cda..0000000
--- a/helix-core/src/main/java/org/apache/helix/api/rebalancer/BasicRebalancerContext.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package org.apache.helix.api.rebalancer;
-
-import java.util.Set;
-
-import org.apache.helix.api.Partition;
-import org.apache.helix.api.id.PartitionId;
-import org.apache.helix.api.id.ResourceId;
-import org.apache.helix.api.id.StateModelDefId;
-import org.apache.helix.api.id.StateModelFactoryId;
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Abstract RebalancerContext that functions for generic subunits. Use a subclass that more
- * concretely defines the subunits.
- */
-public abstract class BasicRebalancerContext implements RebalancerContext {
- private ResourceId _resourceId;
- private StateModelDefId _stateModelDefId;
- private StateModelFactoryId _stateModelFactoryId;
- private String _participantGroupTag;
- private Class<? extends ContextSerializer> _serializer;
- private RebalancerRef _rebalancerRef;
-
- /**
- * Instantiate a basic rebalancer context
- */
- public BasicRebalancerContext() {
- _serializer = DefaultContextSerializer.class;
- }
-
- @Override
- public ResourceId getResourceId() {
- return _resourceId;
- }
-
- /**
- * Set the resource to rebalance
- * @param resourceId resource id
- */
- public void setResourceId(ResourceId resourceId) {
- _resourceId = resourceId;
- }
-
- @Override
- public StateModelDefId getStateModelDefId() {
- return _stateModelDefId;
- }
-
- /**
- * Set the state model definition that the resource follows
- * @param stateModelDefId state model definition id
- */
- public void setStateModelDefId(StateModelDefId stateModelDefId) {
- _stateModelDefId = stateModelDefId;
- }
-
- @Override
- public StateModelFactoryId getStateModelFactoryId() {
- return _stateModelFactoryId;
- }
-
- /**
- * Set the state model factory that the resource uses
- * @param stateModelFactoryId state model factory id
- */
- public void setStateModelFactoryId(StateModelFactoryId stateModelFactoryId) {
- _stateModelFactoryId = stateModelFactoryId;
- }
-
- @Override
- public String getParticipantGroupTag() {
- return _participantGroupTag;
- }
-
- /**
- * Set a tag that participants must have in order to serve this resource
- * @param participantGroupTag string group tag
- */
- public void setParticipantGroupTag(String participantGroupTag) {
- _participantGroupTag = participantGroupTag;
- }
-
- /**
- * Get the serializer. If none is provided, {@link DefaultContextSerializer} is used
- */
- @Override
- public Class<? extends ContextSerializer> getSerializerClass() {
- return _serializer;
- }
-
- /**
- * Set the class that can serialize this context
- * @param serializer serializer class that implements ContextSerializer
- */
- public void setSerializerClass(Class<? extends ContextSerializer> serializer) {
- _serializer = serializer;
- }
-
- @Override
- @JsonIgnore
- public Set<? extends PartitionId> getSubUnitIdSet() {
- return getSubUnitMap().keySet();
- }
-
- @Override
- @JsonIgnore
- public Partition getSubUnit(PartitionId subUnitId) {
- return getSubUnitMap().get(subUnitId);
- }
-
- @Override
- public RebalancerRef getRebalancerRef() {
- return _rebalancerRef;
- }
-
- /**
- * Set the reference to the class used to rebalance this resource
- * @param rebalancerRef RebalancerRef instance
- */
- public void setRebalancerRef(RebalancerRef rebalancerRef) {
- _rebalancerRef = rebalancerRef;
- }
-
- /**
- * Abstract builder for the base rebalancer context
- */
- public static abstract class AbstractBuilder<T extends AbstractBuilder<T>> {
- private final ResourceId _resourceId;
- private StateModelDefId _stateModelDefId;
- private StateModelFactoryId _stateModelFactoryId;
- private String _participantGroupTag;
- private Class<? extends ContextSerializer> _serializerClass;
- private RebalancerRef _rebalancerRef;
-
- /**
- * Instantiate with a resource id
- * @param resourceId resource id
- */
- public AbstractBuilder(ResourceId resourceId) {
- _resourceId = resourceId;
- _serializerClass = DefaultContextSerializer.class;
- }
-
- /**
- * Set the state model definition that the resource should follow
- * @param stateModelDefId state model definition id
- * @return Builder
- */
- public T stateModelDefId(StateModelDefId stateModelDefId) {
- _stateModelDefId = stateModelDefId;
- return self();
- }
-
- /**
- * Set the state model factory that the resource should use
- * @param stateModelFactoryId state model factory id
- * @return Builder
- */
- public T stateModelFactoryId(StateModelFactoryId stateModelFactoryId) {
- _stateModelFactoryId = stateModelFactoryId;
- return self();
- }
-
- /**
- * Set the tag that all participants require in order to serve this resource
- * @param participantGroupTag the tag
- * @return Builder
- */
- public T participantGroupTag(String participantGroupTag) {
- _participantGroupTag = participantGroupTag;
- return self();
- }
-
- /**
- * Set the serializer class for this rebalancer context
- * @param serializerClass class that implements ContextSerializer
- * @return Builder
- */
- public T serializerClass(Class<? extends ContextSerializer> serializerClass) {
- _serializerClass = serializerClass;
- return self();
- }
-
- /**
- * Specify a custom class to use for rebalancing
- * @param rebalancerRef RebalancerRef instance
- * @return Builder
- */
- public T rebalancerRef(RebalancerRef rebalancerRef) {
- _rebalancerRef = rebalancerRef;
- return self();
- }
-
- /**
- * Update an existing context with base fields
- * @param context derived context
- */
- protected final void update(BasicRebalancerContext context) {
- context.setResourceId(_resourceId);
- context.setStateModelDefId(_stateModelDefId);
- context.setStateModelFactoryId(_stateModelFactoryId);
- context.setParticipantGroupTag(_participantGroupTag);
- context.setSerializerClass(_serializerClass);
- context.setRebalancerRef(_rebalancerRef);
- }
-
- /**
- * Get a typed reference to "this" class. Final derived classes should simply return the this
- * reference.
- * @return this for the most specific type
- */
- protected abstract T self();
-
- /**
- * Get the rebalancer context from the built fields
- * @return RebalancerContext
- */
- public abstract RebalancerContext build();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/rebalancer/ContextSerializer.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/rebalancer/ContextSerializer.java b/helix-core/src/main/java/org/apache/helix/api/rebalancer/ContextSerializer.java
deleted file mode 100644
index 10e3ba9..0000000
--- a/helix-core/src/main/java/org/apache/helix/api/rebalancer/ContextSerializer.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.apache.helix.api.rebalancer;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public interface ContextSerializer {
- /**
- * Convert a RebalancerContext object instance to a String
- * @param data instance of the rebalancer context type
- * @return String representing the object
- */
- public <T> String serialize(final T data);
-
- /**
- * Convert raw bytes to a generic object instance
- * @param clazz The class represented by the deserialized string
- * @param string String representing the object
- * @return instance of the generic type or null if the conversion failed
- */
- public <T> T deserialize(final Class<T> clazz, final String string);
-}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/rebalancer/CustomRebalancer.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/rebalancer/CustomRebalancer.java b/helix-core/src/main/java/org/apache/helix/api/rebalancer/CustomRebalancer.java
deleted file mode 100644
index c5e4e80..0000000
--- a/helix-core/src/main/java/org/apache/helix/api/rebalancer/CustomRebalancer.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.apache.helix.api.rebalancer;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.helix.HelixDefinedState;
-import org.apache.helix.HelixManager;
-import org.apache.helix.api.Cluster;
-import org.apache.helix.api.State;
-import org.apache.helix.api.id.ParticipantId;
-import org.apache.helix.api.id.PartitionId;
-import org.apache.helix.api.rebalancer.util.ConstraintBasedAssignment;
-import org.apache.helix.controller.stages.ResourceCurrentState;
-import org.apache.helix.model.ResourceAssignment;
-import org.apache.helix.model.StateModelDefinition;
-import org.apache.log4j.Logger;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public class CustomRebalancer implements Rebalancer {
-
- private static final Logger LOG = Logger.getLogger(CustomRebalancer.class);
-
- @Override
- public void init(HelixManager helixManager) {
- // do nothing
- }
-
- @Override
- public ResourceAssignment computeResourceMapping(RebalancerConfig rebalancerConfig,
- Cluster cluster, ResourceCurrentState currentState) {
- CustomRebalancerContext config =
- rebalancerConfig.getRebalancerContext(CustomRebalancerContext.class);
- StateModelDefinition stateModelDef =
- cluster.getStateModelMap().get(config.getStateModelDefId());
- if (LOG.isDebugEnabled()) {
- LOG.debug("Processing resource:" + config.getResourceId());
- }
- ResourceAssignment partitionMapping = new ResourceAssignment(config.getResourceId());
- for (PartitionId partition : config.getPartitionSet()) {
- Map<ParticipantId, State> currentStateMap =
- currentState.getCurrentStateMap(config.getResourceId(), partition);
- Set<ParticipantId> disabledInstancesForPartition =
- ConstraintBasedAssignment.getDisabledParticipants(cluster.getParticipantMap(),
- partition);
- Map<ParticipantId, State> bestStateForPartition =
- computeCustomizedBestStateForPartition(cluster.getLiveParticipantMap().keySet(),
- stateModelDef, config.getPreferenceMap(partition), currentStateMap,
- disabledInstancesForPartition);
- partitionMapping.addReplicaMap(partition, bestStateForPartition);
- }
- return partitionMapping;
- }
-
- /**
- * compute best state for resource in CUSTOMIZED rebalancer mode
- * @param liveParticipantMap
- * @param stateModelDef
- * @param preferenceMap
- * @param currentStateMap
- * @param disabledParticipantsForPartition
- * @return
- */
- private Map<ParticipantId, State> computeCustomizedBestStateForPartition(
- Set<ParticipantId> liveParticipantSet, StateModelDefinition stateModelDef,
- Map<ParticipantId, State> preferenceMap, Map<ParticipantId, State> currentStateMap,
- Set<ParticipantId> disabledParticipantsForPartition) {
- Map<ParticipantId, State> participantStateMap = new HashMap<ParticipantId, State>();
-
- // if the resource is deleted, idealStateMap will be null/empty and
- // we should drop all resources.
- if (currentStateMap != null) {
- for (ParticipantId participantId : currentStateMap.keySet()) {
- if ((preferenceMap == null || !preferenceMap.containsKey(participantId))
- && !disabledParticipantsForPartition.contains(participantId)) {
- // if dropped and not disabled, transit to DROPPED
- participantStateMap.put(participantId, State.from(HelixDefinedState.DROPPED));
- } else if ((currentStateMap.get(participantId) == null || !currentStateMap.get(
- participantId).equals(State.from(HelixDefinedState.ERROR)))
- && disabledParticipantsForPartition.contains(participantId)) {
- // if disabled and not in ERROR state, transit to initial-state (e.g. OFFLINE)
- participantStateMap.put(participantId, stateModelDef.getTypedInitialState());
- }
- }
- }
-
- // ideal state is deleted
- if (preferenceMap == null) {
- return participantStateMap;
- }
-
- for (ParticipantId participantId : preferenceMap.keySet()) {
- boolean notInErrorState =
- currentStateMap == null || currentStateMap.get(participantId) == null
- || !currentStateMap.get(participantId).equals(State.from(HelixDefinedState.ERROR));
-
- if (liveParticipantSet.contains(participantId) && notInErrorState
- && !disabledParticipantsForPartition.contains(participantId)) {
- participantStateMap.put(participantId, preferenceMap.get(participantId));
- }
- }
-
- return participantStateMap;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/rebalancer/CustomRebalancerContext.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/rebalancer/CustomRebalancerContext.java b/helix-core/src/main/java/org/apache/helix/api/rebalancer/CustomRebalancerContext.java
deleted file mode 100644
index 9d5b7e8..0000000
--- a/helix-core/src/main/java/org/apache/helix/api/rebalancer/CustomRebalancerContext.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.apache.helix.api.rebalancer;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.helix.api.State;
-import org.apache.helix.api.id.ParticipantId;
-import org.apache.helix.api.id.PartitionId;
-import org.apache.helix.api.id.ResourceId;
-import org.apache.helix.api.rebalancer.util.ConstraintBasedAssignment;
-import org.apache.helix.controller.strategy.AutoRebalanceStrategy;
-import org.apache.helix.controller.strategy.AutoRebalanceStrategy.DefaultPlacementScheme;
-import org.apache.helix.controller.strategy.AutoRebalanceStrategy.ReplicaPlacementScheme;
-import org.apache.helix.model.IdealState.RebalanceMode;
-import org.apache.helix.model.ResourceAssignment;
-import org.apache.helix.model.StateModelDefinition;
-import org.codehaus.jackson.annotate.JsonIgnore;
-
-import com.google.common.collect.Maps;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * RebalancerContext for a resource that should be rebalanced in CUSTOMIZED mode. By default, it
- * corresponds to {@link CustomRebalancer}
- */
-public class CustomRebalancerContext extends PartitionedRebalancerContext {
- private Map<PartitionId, Map<ParticipantId, State>> _preferenceMaps;
-
- /**
- * Instantiate a CustomRebalancerContext
- */
- public CustomRebalancerContext() {
- super(RebalanceMode.CUSTOMIZED);
- setRebalancerRef(RebalancerRef.from(CustomRebalancer.class));
- _preferenceMaps = Maps.newHashMap();
- }
-
- /**
- * Get the preference maps of the partitions and replicas of the resource
- * @return map of partition to participant and state
- */
- public Map<PartitionId, Map<ParticipantId, State>> getPreferenceMaps() {
- return _preferenceMaps;
- }
-
- /**
- * Set the preference maps of the partitions and replicas of the resource
- * @param preferenceMaps map of partition to participant and state
- */
- public void setPreferenceMaps(Map<PartitionId, Map<ParticipantId, State>> preferenceMaps) {
- _preferenceMaps = preferenceMaps;
- }
-
- /**
- * Get the preference map of a partition
- * @param partitionId the partition to look up
- * @return map of participant to state
- */
- @JsonIgnore
- public Map<ParticipantId, State> getPreferenceMap(PartitionId partitionId) {
- return _preferenceMaps.get(partitionId);
- }
-
- /**
- * Generate preference maps based on a default cluster setup
- * @param stateModelDef the state model definition to follow
- * @param participantSet the set of participant ids to configure for
- */
- @Override
- @JsonIgnore
- public void generateDefaultConfiguration(StateModelDefinition stateModelDef,
- Set<ParticipantId> participantSet) {
- // compute default upper bounds
- Map<State, String> upperBounds = Maps.newHashMap();
- for (State state : stateModelDef.getTypedStatesPriorityList()) {
- upperBounds.put(state, stateModelDef.getNumParticipantsPerState(state));
- }
-
- // determine the current mapping
- Map<PartitionId, Map<ParticipantId, State>> currentMapping = getPreferenceMaps();
-
- // determine the preference maps
- LinkedHashMap<State, Integer> stateCounts =
- ConstraintBasedAssignment.stateCount(upperBounds, stateModelDef, participantSet.size(),
- getReplicaCount());
- ReplicaPlacementScheme placementScheme = new DefaultPlacementScheme();
- List<ParticipantId> participantList = new ArrayList<ParticipantId>(participantSet);
- List<PartitionId> partitionList = new ArrayList<PartitionId>(getPartitionSet());
- AutoRebalanceStrategy strategy =
- new AutoRebalanceStrategy(ResourceId.from(""), partitionList, stateCounts,
- getMaxPartitionsPerParticipant(), placementScheme);
- Map<String, Map<String, String>> rawPreferenceMaps =
- strategy.typedComputePartitionAssignment(participantList, currentMapping, participantList)
- .getMapFields();
- Map<PartitionId, Map<ParticipantId, State>> preferenceMaps =
- Maps.newHashMap(ResourceAssignment.replicaMapsFromStringMaps(rawPreferenceMaps));
- setPreferenceMaps(preferenceMaps);
- }
-
- /**
- * Build a CustomRebalancerContext. By default, it corresponds to {@link CustomRebalancer}
- */
- public static final class Builder extends PartitionedRebalancerContext.AbstractBuilder<Builder> {
- private final Map<PartitionId, Map<ParticipantId, State>> _preferenceMaps;
-
- /**
- * Instantiate for a resource
- * @param resourceId resource id
- */
- public Builder(ResourceId resourceId) {
- super(resourceId);
- super.rebalancerRef(RebalancerRef.from(CustomRebalancer.class));
- _preferenceMaps = Maps.newHashMap();
- }
-
- /**
- * Add a preference map for a partition
- * @param partitionId partition to set
- * @param preferenceList map of participant id to state indicating where replicas are served
- * @return Builder
- */
- public Builder preferenceMap(PartitionId partitionId, Map<ParticipantId, State> preferenceMap) {
- _preferenceMaps.put(partitionId, preferenceMap);
- return self();
- }
-
- @Override
- protected Builder self() {
- return this;
- }
-
- @Override
- public CustomRebalancerContext build() {
- CustomRebalancerContext context = new CustomRebalancerContext();
- super.update(context);
- context.setPreferenceMaps(_preferenceMaps);
- return context;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/rebalancer/DefaultContextSerializer.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/rebalancer/DefaultContextSerializer.java b/helix-core/src/main/java/org/apache/helix/api/rebalancer/DefaultContextSerializer.java
deleted file mode 100644
index 64e1f8b..0000000
--- a/helix-core/src/main/java/org/apache/helix/api/rebalancer/DefaultContextSerializer.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.apache.helix.api.rebalancer;
-
-import java.io.ByteArrayInputStream;
-import java.io.StringWriter;
-
-import org.apache.helix.HelixException;
-import org.apache.log4j.Logger;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Default serializer implementation for RebalancerContexts. Uses the Jackson JSON library to
- * convert to and from strings
- */
-public class DefaultContextSerializer implements ContextSerializer {
-
- private static Logger logger = Logger.getLogger(DefaultContextSerializer.class);
-
- @Override
- public <T> String serialize(final T data) {
- if (data == null) {
- return null;
- }
-
- ObjectMapper mapper = new ObjectMapper();
- SerializationConfig serializationConfig = mapper.getSerializationConfig();
- serializationConfig.set(SerializationConfig.Feature.INDENT_OUTPUT, true);
- serializationConfig.set(SerializationConfig.Feature.AUTO_DETECT_FIELDS, true);
- serializationConfig.set(SerializationConfig.Feature.CAN_OVERRIDE_ACCESS_MODIFIERS, true);
- StringWriter sw = new StringWriter();
- try {
- mapper.writeValue(sw, data);
- } catch (Exception e) {
- logger.error("Exception during payload data serialization.", e);
- throw new HelixException(e);
- }
- return sw.toString();
- }
-
- @Override
- public <T> T deserialize(final Class<T> clazz, final String string) {
- if (string == null || string.length() == 0) {
- return null;
- }
-
- ObjectMapper mapper = new ObjectMapper();
- ByteArrayInputStream bais = new ByteArrayInputStream(string.getBytes());
-
- DeserializationConfig deserializationConfig = mapper.getDeserializationConfig();
- deserializationConfig.set(DeserializationConfig.Feature.AUTO_DETECT_FIELDS, true);
- deserializationConfig.set(DeserializationConfig.Feature.AUTO_DETECT_SETTERS, true);
- deserializationConfig.set(DeserializationConfig.Feature.AUTO_DETECT_CREATORS, true);
- deserializationConfig.set(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, true);
- deserializationConfig.set(DeserializationConfig.Feature.CAN_OVERRIDE_ACCESS_MODIFIERS, true);
- try {
- T payload = mapper.readValue(bais, clazz);
- return payload;
- } catch (Exception e) {
- logger.error("Exception during deserialization of payload bytes: " + string, e);
- return null;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/rebalancer/FullAutoRebalancer.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/rebalancer/FullAutoRebalancer.java b/helix-core/src/main/java/org/apache/helix/api/rebalancer/FullAutoRebalancer.java
deleted file mode 100644
index f5a5abe..0000000
--- a/helix-core/src/main/java/org/apache/helix/api/rebalancer/FullAutoRebalancer.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package org.apache.helix.api.rebalancer;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.helix.HelixManager;
-import org.apache.helix.ZNRecord;
-import org.apache.helix.api.Cluster;
-import org.apache.helix.api.Participant;
-import org.apache.helix.api.State;
-import org.apache.helix.api.id.ParticipantId;
-import org.apache.helix.api.id.PartitionId;
-import org.apache.helix.api.rebalancer.util.ConstraintBasedAssignment;
-import org.apache.helix.controller.stages.ResourceCurrentState;
-import org.apache.helix.controller.strategy.AutoRebalanceStrategy;
-import org.apache.helix.controller.strategy.AutoRebalanceStrategy.DefaultPlacementScheme;
-import org.apache.helix.controller.strategy.AutoRebalanceStrategy.ReplicaPlacementScheme;
-import org.apache.helix.model.ResourceAssignment;
-import org.apache.helix.model.StateModelDefinition;
-import org.apache.log4j.Logger;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Lists;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-public class FullAutoRebalancer implements Rebalancer {
- // These should be final, but are initialized in init rather than a constructor
- private AutoRebalanceStrategy _algorithm;
-
- private static Logger LOG = Logger.getLogger(FullAutoRebalancer.class);
-
- @Override
- public void init(HelixManager helixManager) {
- // do nothing
- }
-
- @Override
- public ResourceAssignment computeResourceMapping(RebalancerConfig rebalancerConfig,
- Cluster cluster, ResourceCurrentState currentState) {
- FullAutoRebalancerContext config =
- rebalancerConfig.getRebalancerContext(FullAutoRebalancerContext.class);
- StateModelDefinition stateModelDef =
- cluster.getStateModelMap().get(config.getStateModelDefId());
- // Compute a preference list based on the current ideal state
- List<PartitionId> partitions = new ArrayList<PartitionId>(config.getPartitionSet());
- Map<ParticipantId, Participant> liveParticipants = cluster.getLiveParticipantMap();
- Map<ParticipantId, Participant> allParticipants = cluster.getParticipantMap();
- int replicas = -1;
- if (config.anyLiveParticipant()) {
- replicas = liveParticipants.size();
- } else {
- replicas = config.getReplicaCount();
- }
-
- // count how many replicas should be in each state
- Map<State, String> upperBounds =
- ConstraintBasedAssignment.stateConstraints(stateModelDef, config.getResourceId(),
- cluster.getConfig());
- LinkedHashMap<State, Integer> stateCountMap =
- ConstraintBasedAssignment.stateCount(upperBounds, stateModelDef,
- liveParticipants.size(), replicas);
-
- // get the participant lists
- List<ParticipantId> liveParticipantList =
- new ArrayList<ParticipantId>(liveParticipants.keySet());
- List<ParticipantId> allParticipantList =
- new ArrayList<ParticipantId>(cluster.getParticipantMap().keySet());
-
- // compute the current mapping from the current state
- Map<PartitionId, Map<ParticipantId, State>> currentMapping =
- currentMapping(config, currentState, stateCountMap);
-
- // If there are nodes tagged with resource, use only those nodes
- Set<ParticipantId> taggedNodes = new HashSet<ParticipantId>();
- if (config.getParticipantGroupTag() != null) {
- for (ParticipantId participantId : liveParticipantList) {
- if (liveParticipants.get(participantId).hasTag(config.getParticipantGroupTag())) {
- taggedNodes.add(participantId);
- }
- }
- }
- if (taggedNodes.size() > 0) {
- if (LOG.isInfoEnabled()) {
- LOG.info("found the following instances with tag " + config.getResourceId() + " "
- + taggedNodes);
- }
- liveParticipantList = new ArrayList<ParticipantId>(taggedNodes);
- }
-
- // determine which nodes the replicas should live on
- int maxPartition = config.getMaxPartitionsPerParticipant();
- if (LOG.isInfoEnabled()) {
- LOG.info("currentMapping: " + currentMapping);
- LOG.info("stateCountMap: " + stateCountMap);
- LOG.info("liveNodes: " + liveParticipantList);
- LOG.info("allNodes: " + allParticipantList);
- LOG.info("maxPartition: " + maxPartition);
- }
- ReplicaPlacementScheme placementScheme = new DefaultPlacementScheme();
- _algorithm =
- new AutoRebalanceStrategy(config.getResourceId(), partitions, stateCountMap, maxPartition,
- placementScheme);
- ZNRecord newMapping =
- _algorithm.typedComputePartitionAssignment(liveParticipantList, currentMapping,
- allParticipantList);
-
- if (LOG.isInfoEnabled()) {
- LOG.info("newMapping: " + newMapping);
- }
-
- // compute a full partition mapping for the resource
- if (LOG.isDebugEnabled()) {
- LOG.debug("Processing resource:" + config.getResourceId());
- }
- ResourceAssignment partitionMapping = new ResourceAssignment(config.getResourceId());
- for (PartitionId partition : partitions) {
- Set<ParticipantId> disabledParticipantsForPartition =
- ConstraintBasedAssignment.getDisabledParticipants(allParticipants, partition);
- List<String> rawPreferenceList = newMapping.getListField(partition.stringify());
- if (rawPreferenceList == null) {
- rawPreferenceList = Collections.emptyList();
- }
- List<ParticipantId> preferenceList =
- Lists.transform(rawPreferenceList, new Function<String, ParticipantId>() {
- @Override
- public ParticipantId apply(String participantName) {
- return ParticipantId.from(participantName);
- }
- });
- preferenceList =
- ConstraintBasedAssignment.getPreferenceList(cluster, partition, preferenceList);
- Map<ParticipantId, State> bestStateForPartition =
- ConstraintBasedAssignment.computeAutoBestStateForPartition(upperBounds,
- liveParticipants.keySet(), stateModelDef, preferenceList,
- currentState.getCurrentStateMap(config.getResourceId(), partition),
- disabledParticipantsForPartition);
- partitionMapping.addReplicaMap(partition, bestStateForPartition);
- }
- return partitionMapping;
- }
-
- private Map<PartitionId, Map<ParticipantId, State>> currentMapping(
- FullAutoRebalancerContext config, ResourceCurrentState currentStateOutput,
- Map<State, Integer> stateCountMap) {
- Map<PartitionId, Map<ParticipantId, State>> map =
- new HashMap<PartitionId, Map<ParticipantId, State>>();
-
- for (PartitionId partition : config.getPartitionSet()) {
- Map<ParticipantId, State> curStateMap =
- currentStateOutput.getCurrentStateMap(config.getResourceId(), partition);
- map.put(partition, new HashMap<ParticipantId, State>());
- for (ParticipantId node : curStateMap.keySet()) {
- State state = curStateMap.get(node);
- if (stateCountMap.containsKey(state)) {
- map.get(partition).put(node, state);
- }
- }
-
- Map<ParticipantId, State> pendingStateMap =
- currentStateOutput.getPendingStateMap(config.getResourceId(), partition);
- for (ParticipantId node : pendingStateMap.keySet()) {
- State state = pendingStateMap.get(node);
- if (stateCountMap.containsKey(state)) {
- map.get(partition).put(node, state);
- }
- }
- }
- return map;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/rebalancer/FullAutoRebalancerContext.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/rebalancer/FullAutoRebalancerContext.java b/helix-core/src/main/java/org/apache/helix/api/rebalancer/FullAutoRebalancerContext.java
deleted file mode 100644
index 6a3fe10..0000000
--- a/helix-core/src/main/java/org/apache/helix/api/rebalancer/FullAutoRebalancerContext.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.apache.helix.api.rebalancer;
-
-import org.apache.helix.api.id.ResourceId;
-import org.apache.helix.model.IdealState.RebalanceMode;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * RebalancerContext for FULL_AUTO rebalancing mode. By default, it corresponds to
- * {@link FullAutoRebalancer}
- */
-public class FullAutoRebalancerContext extends PartitionedRebalancerContext {
- public FullAutoRebalancerContext() {
- super(RebalanceMode.FULL_AUTO);
- setRebalancerRef(RebalancerRef.from(FullAutoRebalancer.class));
- }
-
- /**
- * Builder for a full auto rebalancer context. By default, it corresponds to
- * {@link FullAutoRebalancer}
- */
- public static final class Builder extends PartitionedRebalancerContext.AbstractBuilder<Builder> {
- /**
- * Instantiate with a resource
- * @param resourceId resource id
- */
- public Builder(ResourceId resourceId) {
- super(resourceId);
- super.rebalancerRef(RebalancerRef.from(FullAutoRebalancer.class));
- }
-
- @Override
- protected Builder self() {
- return this;
- }
-
- @Override
- public FullAutoRebalancerContext build() {
- FullAutoRebalancerContext context = new FullAutoRebalancerContext();
- super.update(context);
- return context;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/rebalancer/PartitionedRebalancerContext.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/rebalancer/PartitionedRebalancerContext.java b/helix-core/src/main/java/org/apache/helix/api/rebalancer/PartitionedRebalancerContext.java
deleted file mode 100644
index 311683d..0000000
--- a/helix-core/src/main/java/org/apache/helix/api/rebalancer/PartitionedRebalancerContext.java
+++ /dev/null
@@ -1,372 +0,0 @@
-package org.apache.helix.api.rebalancer;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.helix.HelixConstants.StateModelToken;
-import org.apache.helix.api.Partition;
-import org.apache.helix.api.id.ParticipantId;
-import org.apache.helix.api.id.PartitionId;
-import org.apache.helix.api.id.ResourceId;
-import org.apache.helix.model.IdealState;
-import org.apache.helix.model.IdealState.RebalanceMode;
-import org.apache.helix.model.StateModelDefinition;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-
-import com.google.common.collect.Maps;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * RebalancerContext for a resource whose subunits are partitions. In addition, these partitions can
- * be replicated.
- */
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class PartitionedRebalancerContext extends BasicRebalancerContext implements
- ReplicatedRebalancerContext {
- private Map<PartitionId, Partition> _partitionMap;
- private boolean _anyLiveParticipant;
- private int _replicaCount;
- private int _maxPartitionsPerParticipant;
- private final RebalanceMode _rebalanceMode;
-
- /**
- * Instantiate a DataRebalancerContext
- */
- public PartitionedRebalancerContext(RebalanceMode rebalanceMode) {
- _partitionMap = Collections.emptyMap();
- _replicaCount = 1;
- _anyLiveParticipant = false;
- _maxPartitionsPerParticipant = Integer.MAX_VALUE;
- _rebalanceMode = rebalanceMode;
- }
-
- /**
- * Get a map from partition id to partition
- * @return partition map (mutable)
- */
- public Map<PartitionId, Partition> getPartitionMap() {
- return _partitionMap;
- }
-
- /**
- * Set a map of partition id to partition
- * @param partitionMap partition map
- */
- public void setPartitionMap(Map<PartitionId, Partition> partitionMap) {
- _partitionMap = Maps.newHashMap(partitionMap);
- }
-
- /**
- * Get the set of partitions for this resource
- * @return set of partition ids
- */
- @JsonIgnore
- public Set<PartitionId> getPartitionSet() {
- return _partitionMap.keySet();
- }
-
- /**
- * Get a partition
- * @param partitionId id of the partition to get
- * @return Partition object, or null if not present
- */
- @JsonIgnore
- public Partition getPartition(PartitionId partitionId) {
- return _partitionMap.get(partitionId);
- }
-
- @Override
- public boolean anyLiveParticipant() {
- return _anyLiveParticipant;
- }
-
- /**
- * Indicate if this resource should be assigned to any live participant
- * @param anyLiveParticipant true if any live participant expected, false otherwise
- */
- public void setAnyLiveParticipant(boolean anyLiveParticipant) {
- _anyLiveParticipant = anyLiveParticipant;
- }
-
- @Override
- public int getReplicaCount() {
- return _replicaCount;
- }
-
- /**
- * Set the number of replicas that each partition should have
- * @param replicaCount
- */
- public void setReplicaCount(int replicaCount) {
- _replicaCount = replicaCount;
- }
-
- /**
- * Get the maximum number of partitions that a participant can serve
- * @return maximum number of partitions per participant
- */
- public int getMaxPartitionsPerParticipant() {
- return _maxPartitionsPerParticipant;
- }
-
- /**
- * Set the maximum number of partitions that a participant can serve
- * @param maxPartitionsPerParticipant maximum number of partitions per participant
- */
- public void setMaxPartitionsPerParticipant(int maxPartitionsPerParticipant) {
- _maxPartitionsPerParticipant = maxPartitionsPerParticipant;
- }
-
- /**
- * Get the rebalancer mode of the resource
- * @return RebalanceMode
- */
- public RebalanceMode getRebalanceMode() {
- return _rebalanceMode;
- }
-
- @Override
- @JsonIgnore
- public Map<PartitionId, Partition> getSubUnitMap() {
- return getPartitionMap();
- }
-
- /**
- * Generate a default configuration given the state model and a participant.
- * @param stateModelDef the state model definition to follow
- * @param participantSet the set of participant ids to configure for
- */
- @JsonIgnore
- public void generateDefaultConfiguration(StateModelDefinition stateModelDef,
- Set<ParticipantId> participantSet) {
- // the base context does not understand enough to know do to anything
- }
-
- /**
- * Convert a physically-stored IdealState into a rebalancer context for a partitioned resource
- * @param idealState populated IdealState
- * @return PartitionedRebalancerContext
- */
- public static PartitionedRebalancerContext from(IdealState idealState) {
- PartitionedRebalancerContext context;
- switch (idealState.getRebalanceMode()) {
- case FULL_AUTO:
- FullAutoRebalancerContext.Builder fullAutoBuilder =
- new FullAutoRebalancerContext.Builder(idealState.getResourceId());
- populateContext(fullAutoBuilder, idealState);
- context = fullAutoBuilder.build();
- break;
- case SEMI_AUTO:
- SemiAutoRebalancerContext.Builder semiAutoBuilder =
- new SemiAutoRebalancerContext.Builder(idealState.getResourceId());
- for (PartitionId partitionId : idealState.getPartitionIdSet()) {
- semiAutoBuilder.preferenceList(partitionId, idealState.getPreferenceList(partitionId));
- }
- populateContext(semiAutoBuilder, idealState);
- context = semiAutoBuilder.build();
- break;
- case CUSTOMIZED:
- CustomRebalancerContext.Builder customBuilder =
- new CustomRebalancerContext.Builder(idealState.getResourceId());
- for (PartitionId partitionId : idealState.getPartitionIdSet()) {
- customBuilder.preferenceMap(partitionId, idealState.getParticipantStateMap(partitionId));
- }
- populateContext(customBuilder, idealState);
- context = customBuilder.build();
- break;
- default:
- Builder baseBuilder = new Builder(idealState.getResourceId());
- populateContext(baseBuilder, idealState);
- context = baseBuilder.build();
- break;
- }
- return context;
- }
-
- /**
- * Update a builder subclass with all the fields of the ideal state
- * @param builder builder that extends AbstractBuilder
- * @param idealState populated IdealState
- */
- private static <T extends AbstractBuilder<T>> void populateContext(T builder,
- IdealState idealState) {
- String replicas = idealState.getReplicas();
- int replicaCount = 0;
- boolean anyLiveParticipant = false;
- if (replicas.equals(StateModelToken.ANY_LIVEINSTANCE.toString())) {
- anyLiveParticipant = true;
- } else {
- replicaCount = Integer.parseInt(replicas);
- }
- if (idealState.getNumPartitions() > 0 && idealState.getPartitionIdSet().size() == 0) {
- // backwards compatibility: partition sets were based on pref lists/maps previously
- builder.addPartitions(idealState.getNumPartitions());
- } else {
- for (PartitionId partitionId : idealState.getPartitionIdSet()) {
- builder.addPartition(new Partition(partitionId));
- }
- }
- builder.anyLiveParticipant(anyLiveParticipant).replicaCount(replicaCount)
- .maxPartitionsPerParticipant(idealState.getMaxPartitionsPerInstance())
- .participantGroupTag(idealState.getInstanceGroupTag())
- .stateModelDefId(idealState.getStateModelDefId())
- .stateModelFactoryId(idealState.getStateModelFactoryId());
- RebalancerRef rebalancerRef = idealState.getRebalancerRef();
- if (rebalancerRef != null) {
- builder.rebalancerRef(rebalancerRef);
- }
- }
-
- /**
- * Builder for a basic data rebalancer context
- */
- public static final class Builder extends AbstractBuilder<Builder> {
- /**
- * Instantiate with a resource
- * @param resourceId resource id
- */
- public Builder(ResourceId resourceId) {
- super(resourceId);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
-
- @Override
- public PartitionedRebalancerContext build() {
- PartitionedRebalancerContext context =
- new PartitionedRebalancerContext(RebalanceMode.USER_DEFINED);
- super.update(context);
- return context;
- }
- }
-
- /**
- * Abstract builder for a generic partitioned resource rebalancer context
- */
- public static abstract class AbstractBuilder<T extends BasicRebalancerContext.AbstractBuilder<T>>
- extends BasicRebalancerContext.AbstractBuilder<T> {
- private final ResourceId _resourceId;
- private final Map<PartitionId, Partition> _partitionMap;
- private boolean _anyLiveParticipant;
- private int _replicaCount;
- private int _maxPartitionsPerParticipant;
-
- /**
- * Instantiate with a resource
- * @param resourceId resource id
- */
- public AbstractBuilder(ResourceId resourceId) {
- super(resourceId);
- _resourceId = resourceId;
- _partitionMap = Maps.newHashMap();
- _anyLiveParticipant = false;
- _replicaCount = 1;
- _maxPartitionsPerParticipant = Integer.MAX_VALUE;
- }
-
- /**
- * Add a partition that the resource serves
- * @param partition fully-qualified partition
- * @return Builder
- */
- public T addPartition(Partition partition) {
- _partitionMap.put(partition.getId(), partition);
- return self();
- }
-
- /**
- * Add a collection of partitions
- * @param partitions any collection of Partition objects
- * @return Builder
- */
- public T addPartitions(Collection<Partition> partitions) {
- for (Partition partition : partitions) {
- addPartition(partition);
- }
- return self();
- }
-
- /**
- * Add a specified number of partitions with a default naming scheme, namely
- * resourceId_partitionNumber where partitionNumber starts at 0
- * @param partitionCount number of partitions to add
- * @return Builder
- */
- public T addPartitions(int partitionCount) {
- for (int i = 0; i < partitionCount; i++) {
- addPartition(new Partition(PartitionId.from(_resourceId, Integer.toString(i))));
- }
- return self();
- }
-
- /**
- * Set whether any live participant should be used in rebalancing
- * @param anyLiveParticipant true if any live participant can be used, false otherwise
- * @return Builder
- */
- public T anyLiveParticipant(boolean anyLiveParticipant) {
- _anyLiveParticipant = anyLiveParticipant;
- return self();
- }
-
- /**
- * Set the number of replicas
- * @param replicaCount number of replicas
- * @return Builder
- */
- public T replicaCount(int replicaCount) {
- _replicaCount = replicaCount;
- return self();
- }
-
- /**
- * Set the maximum number of partitions to assign to any participant
- * @param maxPartitionsPerParticipant the maximum
- * @return Builder
- */
- public T maxPartitionsPerParticipant(int maxPartitionsPerParticipant) {
- _maxPartitionsPerParticipant = maxPartitionsPerParticipant;
- return self();
- }
-
- /**
- * Update a DataRebalancerContext with fields from this builder level
- * @param context DataRebalancerContext
- */
- protected final void update(PartitionedRebalancerContext context) {
- super.update(context);
- // enforce at least one partition
- if (_partitionMap.isEmpty()) {
- addPartitions(1);
- }
- context.setPartitionMap(_partitionMap);
- context.setAnyLiveParticipant(_anyLiveParticipant);
- context.setMaxPartitionsPerParticipant(_maxPartitionsPerParticipant);
- context.setReplicaCount(_replicaCount);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/rebalancer/Rebalancer.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/rebalancer/Rebalancer.java b/helix-core/src/main/java/org/apache/helix/api/rebalancer/Rebalancer.java
deleted file mode 100644
index e164920..0000000
--- a/helix-core/src/main/java/org/apache/helix/api/rebalancer/Rebalancer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.helix.api.rebalancer;
-
-import org.apache.helix.HelixManager;
-import org.apache.helix.api.Cluster;
-import org.apache.helix.controller.stages.ResourceCurrentState;
-import org.apache.helix.model.ResourceAssignment;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Allows one to come up with custom implementation of a rebalancer.<br/>
- * This will be invoked on all changes that happen in the cluster.<br/>
- * Simply return the resource assignment for a resource in this method.<br/>
- */
-public interface Rebalancer {
-
- public void init(HelixManager helixManager);
-
- public ResourceAssignment computeResourceMapping(RebalancerConfig rebalancerConfig, Cluster cluster,
- ResourceCurrentState currentState);
-}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/rebalancer/RebalancerConfig.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/rebalancer/RebalancerConfig.java b/helix-core/src/main/java/org/apache/helix/api/rebalancer/RebalancerConfig.java
deleted file mode 100644
index 2c57a29..0000000
--- a/helix-core/src/main/java/org/apache/helix/api/rebalancer/RebalancerConfig.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package org.apache.helix.api.rebalancer;
-
-import org.apache.helix.api.Scope;
-import org.apache.helix.api.config.NamespacedConfig;
-import org.apache.helix.model.ResourceConfiguration;
-import org.apache.helix.util.HelixUtil;
-import org.apache.log4j.Logger;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Configuration for a resource rebalancer. This contains a RebalancerContext, which contains
- * information specific to each rebalancer.
- */
-public final class RebalancerConfig {
- private enum Fields {
- SERIALIZER_CLASS,
- REBALANCER_CONTEXT,
- REBALANCER_CONTEXT_CLASS
- }
-
- private static final Logger LOG = Logger.getLogger(RebalancerConfig.class);
- private ContextSerializer _serializer;
- private Rebalancer _rebalancer;
- private final RebalancerContext _context;
- private final NamespacedConfig _config;
-
- /**
- * Instantiate a RebalancerConfig
- * @param context rebalancer context
- * @param rebalancerRef reference to the rebalancer class that will be used
- */
- public RebalancerConfig(RebalancerContext context) {
- _config =
- new NamespacedConfig(Scope.resource(context.getResourceId()),
- RebalancerConfig.class.getSimpleName());
- _config.setSimpleField(Fields.SERIALIZER_CLASS.toString(), context.getSerializerClass()
- .getName());
- _config
- .setSimpleField(Fields.REBALANCER_CONTEXT_CLASS.toString(), context.getClass().getName());
- _context = context;
- try {
- _serializer = context.getSerializerClass().newInstance();
- _config.setSimpleField(Fields.REBALANCER_CONTEXT.toString(), _serializer.serialize(context));
- } catch (InstantiationException e) {
- LOG.error("Error initializing the configuration", e);
- } catch (IllegalAccessException e) {
- LOG.error("Error initializing the configuration", e);
- }
- }
-
- /**
- * Instantiate from a physical ResourceConfiguration
- * @param resourceConfiguration populated ResourceConfiguration
- */
- public RebalancerConfig(ResourceConfiguration resourceConfiguration) {
- _config = new NamespacedConfig(resourceConfiguration, RebalancerConfig.class.getSimpleName());
- _serializer = getSerializer();
- _context = getContext();
- }
-
- /**
- * Get the class that can serialize and deserialize the rebalancer context
- * @return ContextSerializer
- */
- private ContextSerializer getSerializer() {
- String serializerClassName = _config.getSimpleField(Fields.SERIALIZER_CLASS.toString());
- if (serializerClassName != null) {
- try {
- return (ContextSerializer) HelixUtil.loadClass(getClass(), serializerClassName)
- .newInstance();
- } catch (InstantiationException e) {
- LOG.error("Error getting the serializer", e);
- } catch (IllegalAccessException e) {
- LOG.error("Error getting the serializer", e);
- } catch (ClassNotFoundException e) {
- LOG.error("Error getting the serializer", e);
- }
- }
- return null;
- }
-
- private RebalancerContext getContext() {
- String className = _config.getSimpleField(Fields.REBALANCER_CONTEXT_CLASS.toString());
- try {
- Class<? extends RebalancerContext> contextClass =
- HelixUtil.loadClass(getClass(), className).asSubclass(RebalancerContext.class);
- String serialized = _config.getSimpleField(Fields.REBALANCER_CONTEXT.toString());
- return _serializer.deserialize(contextClass, serialized);
- } catch (ClassNotFoundException e) {
- LOG.error(className + " is not a valid class");
- } catch (ClassCastException e) {
- LOG.error(className + " does not implement RebalancerContext");
- }
- return null;
- }
-
- /**
- * Get a rebalancer class instance
- * @return Rebalancer
- */
- public Rebalancer getRebalancer() {
- // cache the rebalancer to avoid loading and instantiating it excessively
- if (_rebalancer == null) {
- if (_context == null || _context.getRebalancerRef() == null) {
- return null;
- }
- _rebalancer = _context.getRebalancerRef().getRebalancer();
- }
- return _rebalancer;
- }
-
- /**
- * Get the instantiated RebalancerContext
- * @param contextClass specific class of the RebalancerContext
- * @return RebalancerContext subclass instance, or null if conversion is not possible
- */
- public <T extends RebalancerContext> T getRebalancerContext(Class<T> contextClass) {
- try {
- return contextClass.cast(_context);
- } catch (ClassCastException e) {
- LOG.info(contextClass + " is incompatible with context class: " + _context.getClass());
- }
- return null;
- }
-
- /**
- * Get the rebalancer context serialized as a string
- * @return string representing the context
- */
- public String getSerializedContext() {
- return _config.getSimpleField(Fields.REBALANCER_CONTEXT.toString());
- }
-
- /**
- * Convert this to a namespaced config
- * @return NamespacedConfig
- */
- public NamespacedConfig toNamespacedConfig() {
- return _config;
- }
-
- /**
- * Get a RebalancerConfig from a physical resource config
- * @param resourceConfiguration physical resource config
- * @return RebalancerConfig
- */
- public static RebalancerConfig from(ResourceConfiguration resourceConfiguration) {
- return new RebalancerConfig(resourceConfiguration);
- }
-
- /**
- * Get a RebalancerConfig from a RebalancerContext
- * @param context instantiated RebalancerContext
- * @return RebalancerConfig
- */
- public static RebalancerConfig from(RebalancerContext context) {
- return new RebalancerConfig(context);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/rebalancer/RebalancerContext.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/rebalancer/RebalancerContext.java b/helix-core/src/main/java/org/apache/helix/api/rebalancer/RebalancerContext.java
deleted file mode 100644
index 80f6b06..0000000
--- a/helix-core/src/main/java/org/apache/helix/api/rebalancer/RebalancerContext.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.apache.helix.api.rebalancer;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.helix.api.Partition;
-import org.apache.helix.api.id.PartitionId;
-import org.apache.helix.api.id.ResourceId;
-import org.apache.helix.api.id.StateModelDefId;
-import org.apache.helix.api.id.StateModelFactoryId;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Defines the state available to a rebalancer. The most common use case is to use a
- * {@link PartitionedRebalancerContext} or a subclass and set up a resource with it. A rebalancer
- * configuration, at a minimum, is aware of subunits of a resource, the state model to follow, and
- * how the configuration should be serialized.
- */
-public interface RebalancerContext {
- /**
- * Get a map of resource partition identifiers to partitions. A partition is a subunit of a
- * resource, e.g. a subtask of a task
- * @return map of (subunit id, subunit) pairs
- */
- public Map<? extends PartitionId, ? extends Partition> getSubUnitMap();
-
- /**
- * Get the subunits of the resource (e.g. partitions)
- * @return set of subunit ids
- */
- public Set<? extends PartitionId> getSubUnitIdSet();
-
- /**
- * Get a specific subunit
- * @param subUnitId the id of the subunit
- * @return SubUnit
- */
- public Partition getSubUnit(PartitionId subUnitId);
-
- /**
- * Get the resource to rebalance
- * @return resource id
- */
- public ResourceId getResourceId();
-
- /**
- * Get the state model definition that the resource follows
- * @return state model definition id
- */
- public StateModelDefId getStateModelDefId();
-
- /**
- * Get the state model factory of this resource
- * @return state model factory id
- */
- public StateModelFactoryId getStateModelFactoryId();
-
- /**
- * Get the tag, if any, that participants must have in order to serve this resource
- * @return participant group tag, or null
- */
- public String getParticipantGroupTag();
-
- /**
- * Get the serializer for this context
- * @return ContextSerializer class object
- */
- public Class<? extends ContextSerializer> getSerializerClass();
-
- /**
- * Get a reference to the class used to rebalance this resource
- * @return RebalancerRef
- */
- public RebalancerRef getRebalancerRef();
-}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/rebalancer/RebalancerRef.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/rebalancer/RebalancerRef.java b/helix-core/src/main/java/org/apache/helix/api/rebalancer/RebalancerRef.java
deleted file mode 100644
index 83ae589..0000000
--- a/helix-core/src/main/java/org/apache/helix/api/rebalancer/RebalancerRef.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.apache.helix.api.rebalancer;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.helix.util.HelixUtil;
-import org.apache.log4j.Logger;
-import org.codehaus.jackson.annotate.JsonCreator;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonProperty;
-
-/**
- * Reference to a class that extends {@link Rebalancer}. It loads the class automatically.
- */
-public class RebalancerRef {
- private static final Logger LOG = Logger.getLogger(RebalancerRef.class);
-
- @JsonProperty("rebalancerClassName")
- private final String _rebalancerClassName;
-
- @JsonCreator
- private RebalancerRef(@JsonProperty("rebalancerClassName") String rebalancerClassName) {
- _rebalancerClassName = rebalancerClassName;
- }
-
- /**
- * Get an instantiated Rebalancer
- * @return Rebalancer or null if instantiation failed
- */
- @JsonIgnore
- public Rebalancer getRebalancer() {
- try {
- return (Rebalancer) (HelixUtil.loadClass(getClass(), _rebalancerClassName).newInstance());
- } catch (Exception e) {
- LOG.warn("Exception while invoking custom rebalancer class:" + _rebalancerClassName, e);
- }
- return null;
- }
-
- @Override
- public String toString() {
- return _rebalancerClassName;
- }
-
- @Override
- public boolean equals(Object that) {
- if (that instanceof RebalancerRef) {
- return this.toString().equals(((RebalancerRef) that).toString());
- } else if (that instanceof String) {
- return this.toString().equals(that);
- }
- return false;
- }
-
- /**
- * Get a rebalancer class reference
- * @param rebalancerClassName name of the class
- * @return RebalancerRef or null if name is null
- */
- public static RebalancerRef from(String rebalancerClassName) {
- if (rebalancerClassName == null) {
- return null;
- }
- return new RebalancerRef(rebalancerClassName);
- }
-
- /**
- * Get a RebalancerRef from a class object
- * @param rebalancerClass class that implements Rebalancer
- * @return RebalancerRef
- */
- public static RebalancerRef from(Class<? extends Rebalancer> rebalancerClass) {
- if (rebalancerClass == null) {
- return null;
- }
- return RebalancerRef.from(rebalancerClass.getName());
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/rebalancer/ReplicatedRebalancerContext.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/rebalancer/ReplicatedRebalancerContext.java b/helix-core/src/main/java/org/apache/helix/api/rebalancer/ReplicatedRebalancerContext.java
deleted file mode 100644
index 4e98ce7..0000000
--- a/helix-core/src/main/java/org/apache/helix/api/rebalancer/ReplicatedRebalancerContext.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.apache.helix.api.rebalancer;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Methods specifying a rebalancer context that allows replicas. For instance, a rebalancer context
- * with partitions may accept state model definitions that support multiple replicas per partition,
- * and it's possible that the policy is that each live participant in the system should have a
- * replica.
- */
-public interface ReplicatedRebalancerContext extends RebalancerContext {
- /**
- * Check if this resource should be assigned to any live participant
- * @return true if any live participant expected, false otherwise
- */
- public boolean anyLiveParticipant();
-
- /**
- * Get the number of replicas that each resource subunit should have
- * @return replica count
- */
- public int getReplicaCount();
-}
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e032132a/helix-core/src/main/java/org/apache/helix/api/rebalancer/SemiAutoRebalancer.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/rebalancer/SemiAutoRebalancer.java b/helix-core/src/main/java/org/apache/helix/api/rebalancer/SemiAutoRebalancer.java
deleted file mode 100644
index 80ab256..0000000
--- a/helix-core/src/main/java/org/apache/helix/api/rebalancer/SemiAutoRebalancer.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.apache.helix.api.rebalancer;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.helix.HelixManager;
-import org.apache.helix.api.Cluster;
-import org.apache.helix.api.State;
-import org.apache.helix.api.id.ParticipantId;
-import org.apache.helix.api.id.PartitionId;
-import org.apache.helix.api.rebalancer.util.ConstraintBasedAssignment;
-import org.apache.helix.controller.stages.ResourceCurrentState;
-import org.apache.helix.model.ResourceAssignment;
-import org.apache.helix.model.StateModelDefinition;
-import org.apache.log4j.Logger;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Rebalancer for the SEMI_AUTO mode. It expects a RebalancerConfig that understands the preferred
- * locations of each partition replica
- */
-public class SemiAutoRebalancer implements Rebalancer {
- private static final Logger LOG = Logger.getLogger(SemiAutoRebalancer.class);
-
- @Override
- public void init(HelixManager helixManager) {
- // do nothing
- }
-
- @Override
- public ResourceAssignment computeResourceMapping(RebalancerConfig rebalancerConfig,
- Cluster cluster, ResourceCurrentState currentState) {
- SemiAutoRebalancerContext config =
- rebalancerConfig.getRebalancerContext(SemiAutoRebalancerContext.class);
- StateModelDefinition stateModelDef =
- cluster.getStateModelMap().get(config.getStateModelDefId());
- if (LOG.isDebugEnabled()) {
- LOG.debug("Processing resource:" + config.getResourceId());
- }
- ResourceAssignment partitionMapping = new ResourceAssignment(config.getResourceId());
- for (PartitionId partition : config.getPartitionSet()) {
- Map<ParticipantId, State> currentStateMap =
- currentState.getCurrentStateMap(config.getResourceId(), partition);
- Set<ParticipantId> disabledInstancesForPartition =
- ConstraintBasedAssignment.getDisabledParticipants(cluster.getParticipantMap(),
- partition);
- List<ParticipantId> preferenceList =
- ConstraintBasedAssignment.getPreferenceList(cluster, partition,
- config.getPreferenceList(partition));
- Map<State, String> upperBounds =
- ConstraintBasedAssignment.stateConstraints(stateModelDef, config.getResourceId(),
- cluster.getConfig());
- Map<ParticipantId, State> bestStateForPartition =
- ConstraintBasedAssignment.computeAutoBestStateForPartition(upperBounds, cluster
- .getLiveParticipantMap().keySet(), stateModelDef, preferenceList, currentStateMap,
- disabledInstancesForPartition);
- partitionMapping.addReplicaMap(partition, bestStateForPartition);
- }
- return partitionMapping;
- }
-
-}