You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/01/20 01:22:40 UTC
[1/3] storm git commit: STORM-2176 Workers do not shutdown cleanly
and worker hooks don't run when a topology is killed
Repository: storm
Updated Branches:
refs/heads/1.0.x-branch 4d36f7d97 -> 909111fd3
STORM-2176 Workers do not shutdown cleanly and worker hooks don't run when a topology is killed
* increase supervisor.worker.shutdown.sleep.secs to let workers kill themselves first even stuck
* disable shutdown hook for log4j2 to make sure logs are written after shutdown is started
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/339e77b8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/339e77b8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/339e77b8
Branch: refs/heads/1.0.x-branch
Commit: 339e77b8218e3c418a3d093bd6ce8b98cf5ff2c4
Parents: 4d36f7d
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jan 6 17:21:05 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jan 20 10:22:11 2017 +0900
----------------------------------------------------------------------
conf/defaults.yaml | 2 +-
log4j2/cluster.xml | 2 +-
log4j2/worker.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/339e77b8/conf/defaults.yaml
----------------------------------------------------------------------
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index ccf8739..7e6f719 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -150,7 +150,7 @@ supervisor.worker.start.timeout.secs: 120
#how long between heartbeats until supervisor considers that worker dead and tries to restart it
supervisor.worker.timeout.secs: 30
#how many seconds to sleep for before shutting down threads on worker
-supervisor.worker.shutdown.sleep.secs: 1
+supervisor.worker.shutdown.sleep.secs: 3
#how frequently the supervisor checks on the status of the processes it's monitoring and restarts if necessary
supervisor.monitor.frequency.secs: 3
#how frequently the supervisor heartbeats to the cluster state (for nimbus)
http://git-wip-us.apache.org/repos/asf/storm/blob/339e77b8/log4j2/cluster.xml
----------------------------------------------------------------------
diff --git a/log4j2/cluster.xml b/log4j2/cluster.xml
index 3a6d7b6..6a789e4 100644
--- a/log4j2/cluster.xml
+++ b/log4j2/cluster.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<configuration monitorInterval="60">
+<configuration monitorInterval="60" shutdownHook="disable">
<properties>
<property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %t %c{1.} [%p] %msg%n</property>
</properties>
http://git-wip-us.apache.org/repos/asf/storm/blob/339e77b8/log4j2/worker.xml
----------------------------------------------------------------------
diff --git a/log4j2/worker.xml b/log4j2/worker.xml
index f1e23a1..cd785ec 100644
--- a/log4j2/worker.xml
+++ b/log4j2/worker.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<configuration monitorInterval="60">
+<configuration monitorInterval="60" shutdownHook="disable">
<properties>
<property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %c{1.} %t [%p] %msg%n</property>
<property name="patternNoTime">%msg%n</property>
[3/3] storm git commit: STORM-2176: CHANGELOG
Posted by ka...@apache.org.
STORM-2176: CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/909111fd
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/909111fd
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/909111fd
Branch: refs/heads/1.0.x-branch
Commit: 909111fd37860861589f4b1d3b5892170980ea04
Parents: 46381bd
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jan 20 10:22:26 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jan 20 10:22:26 2017 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/909111fd/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa2502b..d72e09e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.3
+ * STORM-2176: Workers do not shutdown cleanly and worker hooks don't run when a topology is killed
* STORM-2293: hostname should only refer node's 'storm.local.hostname'
* STORM-2246: Logviewer download link has urlencoding on part of the URL
* STORM-1906: Window count/length of zero should be disallowed
[2/3] storm git commit: Merge branch 'STORM-2176-1.0.x' into
1.0.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-2176-1.0.x' into 1.0.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/46381bdb
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/46381bdb
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/46381bdb
Branch: refs/heads/1.0.x-branch
Commit: 46381bdbac9d9f3151d1ddd6d6f083e240ac365e
Parents: 4d36f7d 339e77b
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jan 20 10:22:15 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jan 20 10:22:15 2017 +0900
----------------------------------------------------------------------
conf/defaults.yaml | 2 +-
log4j2/cluster.xml | 2 +-
log4j2/worker.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------