You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/11/24 18:57:21 UTC
[14/16] storm git commit: remove task-ids from iworkerhook's start
method
remove task-ids from iworkerhook's start method
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ccb8031b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ccb8031b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ccb8031b
Branch: refs/heads/master
Commit: ccb8031b3cebb06d266a8621b91255945221efc6
Parents: dfc33ec
Author: Michael Schonfeld <mi...@schonfeld.org>
Authored: Wed Nov 18 11:55:54 2015 -0500
Committer: Michael Schonfeld <mi...@schonfeld.org>
Committed: Mon Nov 23 18:50:55 2015 -0500
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/worker.clj | 3 +--
storm-core/src/jvm/backtype/storm/hooks/BaseWorkerHook.java | 4 +---
storm-core/src/jvm/backtype/storm/hooks/IWorkerHook.java | 4 +---
3 files changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ccb8031b/storm-core/src/clj/backtype/storm/daemon/worker.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/worker.clj b/storm-core/src/clj/backtype/storm/daemon/worker.clj
index c0a99de..64670c2 100644
--- a/storm-core/src/clj/backtype/storm/daemon/worker.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/worker.clj
@@ -553,12 +553,11 @@
(let [topology (:topology worker)
topo-conf (:conf worker)
worker-topology-context (worker-context worker)
- task-ids (:task_ids worker)
hooks (.get_worker_hooks topology)]
(dofor [hook hooks]
(let [hook-bytes (Utils/toByteArray hook)
deser-hook (Utils/javaDeserialize hook-bytes BaseWorkerHook)]
- (.start deser-hook topo-conf worker-topology-context task-ids)))))
+ (.start deser-hook topo-conf worker-topology-context)))))
(defn run-worker-shutdown-hooks [worker]
(let [topology (:topology worker)
http://git-wip-us.apache.org/repos/asf/storm/blob/ccb8031b/storm-core/src/jvm/backtype/storm/hooks/BaseWorkerHook.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/hooks/BaseWorkerHook.java b/storm-core/src/jvm/backtype/storm/hooks/BaseWorkerHook.java
index 029f671..c146ac2 100644
--- a/storm-core/src/jvm/backtype/storm/hooks/BaseWorkerHook.java
+++ b/storm-core/src/jvm/backtype/storm/hooks/BaseWorkerHook.java
@@ -20,7 +20,6 @@ package backtype.storm.hooks;
import backtype.storm.task.WorkerTopologyContext;
import java.io.Serializable;
-import java.util.List;
import java.util.Map;
/**
@@ -36,10 +35,9 @@ public class BaseWorkerHook implements IWorkerHook, Serializable {
*
* @param stormConf The Storm configuration for this worker
* @param context This object can be used to get information about this worker's place within the topology
- * @param taskIds A list of Integers denoting the task IDs assigned to this worker
*/
@Override
- public void start(Map stormConf, WorkerTopologyContext context, List<Integer> taskIds) {
+ public void start(Map stormConf, WorkerTopologyContext context) {
// NOOP
}
http://git-wip-us.apache.org/repos/asf/storm/blob/ccb8031b/storm-core/src/jvm/backtype/storm/hooks/IWorkerHook.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/hooks/IWorkerHook.java b/storm-core/src/jvm/backtype/storm/hooks/IWorkerHook.java
index 6584883..6fb3946 100644
--- a/storm-core/src/jvm/backtype/storm/hooks/IWorkerHook.java
+++ b/storm-core/src/jvm/backtype/storm/hooks/IWorkerHook.java
@@ -20,7 +20,6 @@ package backtype.storm.hooks;
import backtype.storm.task.WorkerTopologyContext;
import java.io.Serializable;
-import java.util.List;
import java.util.Map;
/**
@@ -35,9 +34,8 @@ public interface IWorkerHook extends Serializable {
*
* @param stormConf The Storm configuration for this worker
* @param context This object can be used to get information about this worker's place within the topology
- * @param taskIds A list of Integers denoting the task IDs assigned to this worker
*/
- void start(Map stormConf, WorkerTopologyContext context, List<Integer> taskIds);
+ void start(Map stormConf, WorkerTopologyContext context);
/**
* This method is called right before a worker shuts down