From be071dd6435185c0bbcef31d30b93eb920659e10 Mon Sep 17 00:00:00 2001 From: Nikhil Bafna Date: Thu, 1 Mar 2018 17:23:44 +0530 Subject: [PATCH 1/2] STORM-2984: Add jitter in executor heartbeat --- .../src/jvm/org/apache/storm/daemon/worker/Worker.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java b/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java index ca0d4d04f3a..9c0ba402038 100644 --- a/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java +++ b/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java @@ -178,7 +178,8 @@ private Object loadWorker(Map topologyConf, IStateStorage stateS }); workerState.executorHeartbeatTimer - .scheduleRecurring(0, (Integer) conf.get(Config.WORKER_HEARTBEAT_FREQUENCY_SECS), + .scheduleRecurringWithJitter(0, (Integer) conf.get(Config.WORKER_HEARTBEAT_FREQUENCY_SECS), + (Integer) conf.get(Config.WORKER_HEARTBEAT_FREQUENCY_SECS), Worker.this::doExecutorHeartbeats); workerState.registerCallbacks(); From cd59e3b7896956694083ab8f386b58a4ac7dfca6 Mon Sep 17 00:00:00 2001 From: Nikhil Bafna Date: Thu, 1 Mar 2018 21:35:28 +0530 Subject: [PATCH 2/2] STORM-2984: Fix jitter time from sec to ms --- storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java b/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java index 9c0ba402038..fcd661d3d48 100644 --- a/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java +++ b/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java @@ -179,7 +179,7 @@ private Object loadWorker(Map topologyConf, IStateStorage stateS workerState.executorHeartbeatTimer .scheduleRecurringWithJitter(0, (Integer) conf.get(Config.WORKER_HEARTBEAT_FREQUENCY_SECS), - (Integer) conf.get(Config.WORKER_HEARTBEAT_FREQUENCY_SECS), + (Integer) conf.get(Config.WORKER_HEARTBEAT_FREQUENCY_SECS) * 1000, Worker.this::doExecutorHeartbeats); workerState.registerCallbacks();