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/09/30 22:12:44 UTC
[1/5] storm git commit: Fix the typo
Repository: storm
Updated Branches:
refs/heads/master d86cdee85 -> b76d90bb1
Fix the typo
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/633d03c4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/633d03c4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/633d03c4
Branch: refs/heads/master
Commit: 633d03c409e6d2cd20af3a7792572cbe2071ac47
Parents: c35ec2c
Author: zhuol <zh...@yahoo-inc.com>
Authored: Tue Sep 29 15:25:34 2015 -0500
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Tue Sep 29 15:26:57 2015 -0500
----------------------------------------------------------------------
bin/storm.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/633d03c4/bin/storm.py
----------------------------------------------------------------------
diff --git a/bin/storm.py b/bin/storm.py
index d2507ed..16d8882 100755
--- a/bin/storm.py
+++ b/bin/storm.py
@@ -352,7 +352,7 @@ def kill_workers(*args):
"""Syntax: [storm kill_workers]
Kill the workers running on this supervisor. This command should be run
- on a supervisor node. If the cluster is running in secure node, then user needs
+ on a supervisor node. If the cluster is running in secure mode, then user needs
to have admin rights on the node to be able to successfully kill all workers.
"""
exec_storm_class(
[2/5] storm git commit: kill_worker class
Posted by bo...@apache.org.
kill_worker class
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c35ec2cf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c35ec2cf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c35ec2cf
Branch: refs/heads/master
Commit: c35ec2cfa3e39a8d5cc9b85c40e77b7fa55e61ae
Parents: 1abe486
Author: zhuol <zh...@yahoo-inc.com>
Authored: Tue Sep 22 10:45:09 2015 -0500
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Tue Sep 29 15:26:57 2015 -0500
----------------------------------------------------------------------
.../clj/backtype/storm/command/kill_workers.clj | 33 ++++++++++++++++++++
1 file changed, 33 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/c35ec2cf/storm-core/src/clj/backtype/storm/command/kill_workers.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/command/kill_workers.clj b/storm-core/src/clj/backtype/storm/command/kill_workers.clj
new file mode 100644
index 0000000..3866cc7
--- /dev/null
+++ b/storm-core/src/clj/backtype/storm/command/kill_workers.clj
@@ -0,0 +1,33 @@
+;; Licensed to the Apache Software Foundation (ASF) under one
+;; or more contributor license agreements. See the NOTICE file
+;; distributed with this work for additional information
+;; regarding copyright ownership. The ASF licenses this file
+;; to you under the Apache License, Version 2.0 (the
+;; "License"); you may not use this file except in compliance
+;; with the License. You may obtain a copy of the License at
+;;
+;; http://www.apache.org/licenses/LICENSE-2.0
+;;
+;; Unless required by applicable law or agreed to in writing, software
+;; distributed under the License is distributed on an "AS IS" BASIS,
+;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;; See the License for the specific language governing permissions and
+;; limitations under the License.
+(ns backtype.storm.command.kill-workers
+ (:import [java.io File])
+ (:use [backtype.storm.daemon common])
+ (:use [backtype.storm util config])
+ (:require [backtype.storm.daemon
+ [supervisor :as supervisor]])
+ (:gen-class))
+
+(defn -main
+ "Construct the supervisor-data from scratch and kill the workers on this supervisor"
+ [& args]
+ (let [conf (read-storm-config)
+ conf (assoc conf STORM-LOCAL-DIR (. (File. (conf STORM-LOCAL-DIR)) getCanonicalPath))
+ isupervisor (supervisor/standalone-supervisor)
+ supervisor-data (supervisor/supervisor-data conf nil isupervisor)
+ ids (supervisor/my-worker-ids conf)]
+ (doseq [id ids]
+ (supervisor/shutdown-worker supervisor-data id))))
[4/5] storm git commit: Merge branch '1058' of
https://github.com/zhuoliu/storm into STORM-1058
Posted by bo...@apache.org.
Merge branch '1058' of https://github.com/zhuoliu/storm into STORM-1058
STORM-1058: create CLI kill_workers to kill workers on a supervisor node
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/579bc6bf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/579bc6bf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/579bc6bf
Branch: refs/heads/master
Commit: 579bc6bf5d868832232f8ac65c7af83ee8291889
Parents: d86cdee 633d03c
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Sep 30 15:00:42 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Sep 30 15:00:42 2015 -0500
----------------------------------------------------------------------
bin/storm.py | 16 +++++++++-
.../clj/backtype/storm/command/kill_workers.clj | 33 ++++++++++++++++++++
.../src/clj/backtype/storm/daemon/executor.clj | 1 -
3 files changed, 48 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/579bc6bf/bin/storm.py
----------------------------------------------------------------------
[5/5] storm git commit: Added STORM-1058 to Changelog
Posted by bo...@apache.org.
Added STORM-1058 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b76d90bb
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b76d90bb
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b76d90bb
Branch: refs/heads/master
Commit: b76d90bb18938a2c6c220ac4eeb7128b56b760ad
Parents: 579bc6b
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Sep 30 15:01:06 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Sep 30 15:01:06 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b76d90bb/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b0fe00..a071591 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1058: create CLI kill_workers to kill workers on a supervisor node
* STORM-1063: support relative log4j conf dir for both daemons and workers
* STORM-1059: Upgrade Storm to use Clojure 1.7.0
* STORM-1069: add check case for external change of 'now' value.
[3/5] storm git commit: Storm-1058 Add kill_workers CLI
Posted by bo...@apache.org.
Storm-1058 Add kill_workers CLI
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1abe4867
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1abe4867
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1abe4867
Branch: refs/heads/master
Commit: 1abe4867160cb07a3eff6c2307d38b049cb51634
Parents: ced6224
Author: zhuol <zh...@yahoo-inc.com>
Authored: Tue Sep 22 10:44:43 2015 -0500
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Tue Sep 29 15:26:57 2015 -0500
----------------------------------------------------------------------
bin/storm.py | 16 +++++++++++++++-
.../src/clj/backtype/storm/daemon/executor.clj | 1 -
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1abe4867/bin/storm.py
----------------------------------------------------------------------
diff --git a/bin/storm.py b/bin/storm.py
index 024912f..d2507ed 100755
--- a/bin/storm.py
+++ b/bin/storm.py
@@ -348,6 +348,19 @@ def get_errors(*args):
jvmtype="-client",
extrajars=[USER_CONF_DIR, os.path.join(STORM_DIR, "bin")])
+def kill_workers(*args):
+ """Syntax: [storm kill_workers]
+
+ Kill the workers running on this supervisor. This command should be run
+ on a supervisor node. If the cluster is running in secure node, then user needs
+ to have admin rights on the node to be able to successfully kill all workers.
+ """
+ exec_storm_class(
+ "backtype.storm.command.kill_workers",
+ args=args,
+ jvmtype="-client",
+ extrajars=[USER_CONF_DIR, os.path.join(STORM_DIR, "bin")])
+
def shell(resourcesdir, command, *args):
tmpjarpath = "stormshell" + str(random.randint(0, 10000000)) + ".jar"
os.system("jar cf %s %s" % (tmpjarpath, resourcesdir))
@@ -561,7 +574,8 @@ COMMANDS = {"jar": jar, "kill": kill, "shell": shell, "nimbus": nimbus, "ui": ui
"remoteconfvalue": print_remoteconfvalue, "repl": repl, "classpath": print_classpath,
"activate": activate, "deactivate": deactivate, "rebalance": rebalance, "help": print_usage,
"list": listtopos, "dev-zookeeper": dev_zookeeper, "version": version, "monitor": monitor,
- "upload-credentials": upload_credentials, "get-errors": get_errors }
+ "upload-credentials": upload_credentials, "get-errors": get_errors,
+ "kill_workers": kill_workers }
def parse_config(config_list):
global CONFIG_OPTS
http://git-wip-us.apache.org/repos/asf/storm/blob/1abe4867/storm-core/src/clj/backtype/storm/daemon/executor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/executor.clj b/storm-core/src/clj/backtype/storm/daemon/executor.clj
index d7a68be..746fde3 100644
--- a/storm-core/src/clj/backtype/storm/daemon/executor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/executor.clj
@@ -647,7 +647,6 @@
(let [active? @(:storm-active-atom executor-data)
curr-count (.get emitted-count)
- ;; suspend-time ((:storm-conf executor-data) BACKPRESSURE-SPOUT-SUSPEND-TIME-MS)
backpressure-enabled ((:storm-conf executor-data) TOPOLOGY-BACKPRESSURE-ENABLE)
throttle-on (and backpressure-enabled
@(:throttle-on (:worker executor-data)))