diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java index 06dd63730ccb598e789768ead4d09b30e5dd071a..12a07979489a33e67c694bbc8e700c480de192b1 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java @@ -414,8 +414,9 @@ public class RemoteTaskRunner implements TaskRunner @Override public void childEvent(CuratorFramework client, PathChildrenCacheEvent event) throws Exception { - try { + log.info("Event[%s]: %s", event.getType(), event.getData().getPath()); + if (event.getType().equals(PathChildrenCacheEvent.Type.CHILD_ADDED) || event.getType().equals(PathChildrenCacheEvent.Type.CHILD_UPDATED)) { final String taskId = ZKPaths.getNodeFromPath(event.getData().getPath()); diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskMasterLifecycle.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskMasterLifecycle.java index b9fefecf013fb2da79122c558c80138ab68072d8..0eb3a335bc4d0e5df1046dc3ad4fee6fcd25200b 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskMasterLifecycle.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskMasterLifecycle.java @@ -100,6 +100,7 @@ public class TaskMasterLifecycle leaderLifecycle.addManagedInstance(taskRunner); Initialization.makeServiceDiscoveryClient(curator, serviceDiscoveryConfig, leaderLifecycle); leaderLifecycle.addManagedInstance(taskConsumer); + leaderLifecycle.addManagedInstance(scheduler); leading = true; diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/scaling/ResourceManagementScheduler.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/scaling/ResourceManagementScheduler.java index 45c0060fda6414f3d82af2f57a0083f0d852deb2..2473e9d6e4121d41af5a66792d3d17b6d05cc15f 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/scaling/ResourceManagementScheduler.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/scaling/ResourceManagementScheduler.java @@ -71,6 +71,8 @@ public class ResourceManagementScheduler return; } + log.info("Started Resource Management Scheduler"); + ScheduledExecutors.scheduleAtFixedRate( exec, config.getProvisionResourcesDuration(), @@ -79,6 +81,7 @@ public class ResourceManagementScheduler @Override public void run() { + log.info("Running resource management strategy"); resourceManagementStrategy.doProvision( taskRunner.getPendingTasks(), taskRunner.getWorkers() @@ -123,6 +126,7 @@ public class ResourceManagementScheduler if (!started) { return; } + log.info("Stopping Resource Management Scheduler"); exec.shutdown(); started = false; } diff --git a/pom.xml b/pom.xml index ee0e0a85493ac73b63746327de1da93104b96ea1..d14760ba5c158c2c09b90bf257a8625fc3e451ad 100644 --- a/pom.xml +++ b/pom.xml @@ -115,22 +115,22 @@ com.netflix.curator curator-client - 1.2.2 + 1.3.2 com.netflix.curator curator-framework - 1.2.2 + 1.3.2 com.netflix.curator curator-recipes - 1.2.2 + 1.3.2 com.netflix.curator curator-x-discovery - 1.2.2 + 1.3.2 com.netflix.curator