You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2016/05/18 17:02:25 UTC
[1/2] storm git commit: Merge branch 'master' of
https://github.com/fbyrne/storm into STORM-1730
Repository: storm
Updated Branches:
refs/heads/1.x-branch b1abf8221 -> 00685adfd
Merge branch 'master' of https://github.com/fbyrne/storm into STORM-1730
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6e46e27a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6e46e27a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6e46e27a
Branch: refs/heads/1.x-branch
Commit: 6e46e27a6971fd15fefcc1072edf87cfa2b7dcb9
Parents: b1abf82
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Wed May 18 09:35:14 2016 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Wed May 18 10:01:23 2016 -0700
----------------------------------------------------------------------
.../jvm/org/apache/storm/utils/DisruptorQueue.java | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6e46e27a/storm-core/src/jvm/org/apache/storm/utils/DisruptorQueue.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/utils/DisruptorQueue.java b/storm-core/src/jvm/org/apache/storm/utils/DisruptorQueue.java
index 2a6fead..ef6f65b 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/DisruptorQueue.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/DisruptorQueue.java
@@ -17,6 +17,7 @@
*/
package org.apache.storm.utils;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.lmax.disruptor.AlertException;
import com.lmax.disruptor.EventFactory;
import com.lmax.disruptor.EventHandler;
@@ -44,6 +45,7 @@ import java.util.TimerTask;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -62,11 +64,21 @@ public class DisruptorQueue implements IStatefulObject {
private static final FlusherPool FLUSHER = new FlusherPool();
private static class FlusherPool {
- private Timer _timer = new Timer("disruptor-flush-trigger", true);
- private ThreadPoolExecutor _exec = new ThreadPoolExecutor(1, 100, 10, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(1024), new ThreadPoolExecutor.DiscardPolicy());
+ private static final String THREAD_PREFIX = "disruptor-flush";
+ private Timer _timer = new Timer(THREAD_PREFIX + "-trigger", true);
+ private ThreadPoolExecutor _exec;
private HashMap<Long, ArrayList<Flusher>> _pendingFlush = new HashMap<>();
private HashMap<Long, TimerTask> _tt = new HashMap<>();
+ public FlusherPool() {
+ _exec = new ThreadPoolExecutor(1, 100, 10, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(1024), new ThreadPoolExecutor.DiscardPolicy());
+ ThreadFactory threadFactory = new ThreadFactoryBuilder()
+ .setDaemon(true)
+ .setNameFormat(THREAD_PREFIX + "-task-pool")
+ .build();
+ _exec.setThreadFactory(threadFactory);
+ }
+
public synchronized void start(Flusher flusher, final long flushInterval) {
ArrayList<Flusher> pending = _pendingFlush.get(flushInterval);
if (pending == null) {
[2/2] storm git commit: Added STORM-1730 to CHANGELOG.
Posted by sr...@apache.org.
Added STORM-1730 to CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/00685adf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/00685adf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/00685adf
Branch: refs/heads/1.x-branch
Commit: 00685adfd9c0750c64da8478073e8ce2c4fd8817
Parents: 6e46e27
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Wed May 18 10:01:53 2016 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Wed May 18 10:01:53 2016 -0700
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/00685adf/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0225288..bc4e352 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.1.0
+ * STORM-1730: LocalCluster#shutdown() does not terminate all storm threads/thread pools.
* STORM-1841: Address a few minor issues in windowing and doc
* STORM-1709: Added group by support in storm sql standalone mode
* STORM-1720: Support GEO in storm-redis