[HELIX-279] Apply gc handling fixes to main ZKHelixManager class, adding back HelixManager#ALLOW_PARTICIPANT_AUTO_JOIN and mark it deprecated
Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/002acfd6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/002acfd6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/002acfd6 Branch: refs/heads/helix-0.6.2-release Commit: 002acfd64c95c3119d746c8f7aef92b6383b9e7f Parents: a416e74 Author: zzhang <[email protected]> Authored: Thu Oct 24 17:15:58 2013 -0700 Committer: zzhang <[email protected]> Committed: Thu Oct 24 17:15:58 2013 -0700 ---------------------------------------------------------------------- helix-core/src/main/java/org/apache/helix/HelixManager.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/002acfd6/helix-core/src/main/java/org/apache/helix/HelixManager.java ---------------------------------------------------------------------- diff --git a/helix-core/src/main/java/org/apache/helix/HelixManager.java b/helix-core/src/main/java/org/apache/helix/HelixManager.java index d129792..a400686 100644 --- a/helix-core/src/main/java/org/apache/helix/HelixManager.java +++ b/helix-core/src/main/java/org/apache/helix/HelixManager.java @@ -23,6 +23,7 @@ import java.util.List; import org.apache.helix.controller.GenericHelixController; import org.apache.helix.healthcheck.ParticipantHealthReportCollector; +import org.apache.helix.manager.zk.ZKHelixManager; import org.apache.helix.model.HelixConfigScope.ConfigScopeProperty; import org.apache.helix.participant.HelixStateMachineEngine; import org.apache.helix.participant.StateMachineEngine; @@ -53,6 +54,9 @@ import org.apache.helix.store.zk.ZkHelixPropertyStore; * @see GenericHelixController RoutingTableProvider for controller */ public interface HelixManager { + @Deprecated + public static final String ALLOW_PARTICIPANT_AUTO_JOIN = + ZKHelixManager.ALLOW_PARTICIPANT_AUTO_JOIN; /** * Start participating in the cluster operations. All listeners will be
