Repository: helix Updated Branches: refs/heads/helix-0.6.x a7cae437b -> 19ac664d0
[HELIX-521] Should not start GenericHelixController#ClusterEventProcessor in types other than CONTROLLER and CONTROLLER_PARTICIPANT, rb=26045 Project: http://git-wip-us.apache.org/repos/asf/helix/repo Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/19ac664d Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/19ac664d Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/19ac664d Branch: refs/heads/helix-0.6.x Commit: 19ac664d0294ceea288fc219eeccc7ec93290ec5 Parents: a7cae43 Author: zzhang <[email protected]> Authored: Thu Sep 25 14:53:27 2014 -0700 Committer: zzhang <[email protected]> Committed: Thu Sep 25 14:53:27 2014 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/helix/manager/zk/ZKHelixManager.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/helix/blob/19ac664d/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java ---------------------------------------------------------------------- diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java index 6c3923a..a6895cf 100644 --- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java +++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java @@ -125,7 +125,7 @@ public class ZKHelixManager implements HelixManager, IZkStateListener { /** * controller fields */ - private final GenericHelixController _controller = new GenericHelixController(); + private final GenericHelixController _controller; private CallbackHandler _leaderElectionHandler = null; protected final List<HelixTimerTask> _controllerTimerTasks = new ArrayList<HelixTimerTask>(); @@ -216,18 +216,21 @@ public class ZKHelixManager implements HelixManager, IZkStateListener { */ switch (instanceType) { case PARTICIPANT: + _controller = null; _stateMachineEngine = new HelixStateMachineEngine(this); _participantHealthInfoCollector = new ParticipantHealthReportCollectorImpl(this, _instanceName); _timerTasks.add(new ParticipantHealthReportTask(_participantHealthInfoCollector)); break; case CONTROLLER: + _controller = new GenericHelixController(); _stateMachineEngine = null; _participantHealthInfoCollector = null; _controllerTimerTasks.add(new StatusDumpTask(this)); break; case CONTROLLER_PARTICIPANT: + _controller = new GenericHelixController(); _stateMachineEngine = new HelixStateMachineEngine(this); _participantHealthInfoCollector = new ParticipantHealthReportCollectorImpl(this, _instanceName); @@ -237,6 +240,7 @@ public class ZKHelixManager implements HelixManager, IZkStateListener { break; case ADMINISTRATOR: case SPECTATOR: + _controller = null; _stateMachineEngine = null; _participantHealthInfoCollector = null; break;
