Repository: incubator-eagle Updated Branches: refs/heads/master 38ec7fc23 -> aa7b0254d
[Minor] : Merge confliction cause scheduler trigger still running Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/aa7b0254 Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/aa7b0254 Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/aa7b0254 Branch: refs/heads/master Commit: aa7b0254ddd1b8aa665f581eebf6a88c9d694563 Parents: 38ec7fc Author: Ralph, Su <suliang...@gmail.com> Authored: Fri Nov 11 14:27:23 2016 +0800 Committer: Ralph, Su <suliang...@gmail.com> Committed: Fri Nov 11 14:28:23 2016 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/eagle/alert/coordinator/Coordinator.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/aa7b0254/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/main/java/org/apache/eagle/alert/coordinator/Coordinator.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/main/java/org/apache/eagle/alert/coordinator/Coordinator.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/main/java/org/apache/eagle/alert/coordinator/Coordinator.java index 5ed6700..95698e8 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/main/java/org/apache/eagle/alert/coordinator/Coordinator.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/main/java/org/apache/eagle/alert/coordinator/Coordinator.java @@ -26,7 +26,6 @@ import org.apache.eagle.alert.config.ZKConfigBuilder; import org.apache.eagle.alert.coordination.model.ScheduleState; import org.apache.eagle.alert.coordinator.impl.MetadataValdiator; import org.apache.eagle.alert.coordinator.provider.ScheduleContextBuilder; -import org.apache.eagle.alert.coordinator.trigger.CoordinatorTrigger; import org.apache.eagle.alert.service.IMetadataServiceClient; import org.apache.eagle.alert.service.MetadataServiceClientImpl; import org.slf4j.Logger; @@ -209,7 +208,7 @@ public class Coordinator { return t; }); - scheduleSrv.scheduleAtFixedRate(new CoordinatorTrigger(config, client), initDelayMillis, delayMillis, TimeUnit.MILLISECONDS); + // scheduleSrv.scheduleAtFixedRate(new CoordinatorTrigger(config, client), initDelayMillis, delayMillis, TimeUnit.MILLISECONDS); Runtime.getRuntime().addShutdownHook(new Thread(new CoordinatorShutdownHook(scheduleSrv))); LOG.info("Eagle Coordinator started ...");
