You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/06/09 20:53:42 UTC

[01/35] storm git commit: [STORM-1575] fix TwitterSampleSpout NPE on close

Repository: storm
Updated Branches:
  refs/heads/1.0.x-branch 1a50bec2c -> 749208e70
  refs/heads/1.x-branch 71476b48d -> 760f10aef
  refs/heads/master 02c4f6b40 -> a52e83b83


[STORM-1575] fix TwitterSampleSpout NPE on close


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a37ddbaa
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a37ddbaa
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a37ddbaa

Branch: refs/heads/master
Commit: a37ddbaa7a4c8b94a68efda94a74910333333820
Parents: dd00bc0
Author: manuzhang <ow...@gmail.com>
Authored: Thu Feb 25 15:07:12 2016 +0800
Committer: manuzhang <ow...@gmail.com>
Committed: Thu Feb 25 15:07:12 2016 +0800

----------------------------------------------------------------------
 .../apache/storm/starter/spout/TwitterSampleSpout.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/a37ddbaa/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/TwitterSampleSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/TwitterSampleSpout.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/TwitterSampleSpout.java
index df26d25..e8a2c05 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/TwitterSampleSpout.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/TwitterSampleSpout.java
@@ -103,24 +103,24 @@ public class TwitterSampleSpout extends BaseRichSpout {
 
 		};
 
-		TwitterStream twitterStream = new TwitterStreamFactory(
+		_twitterStream = new TwitterStreamFactory(
 				new ConfigurationBuilder().setJSONStoreEnabled(true).build())
 				.getInstance();
 
-		twitterStream.addListener(listener);
-		twitterStream.setOAuthConsumer(consumerKey, consumerSecret);
+		_twitterStream.addListener(listener);
+		_twitterStream.setOAuthConsumer(consumerKey, consumerSecret);
 		AccessToken token = new AccessToken(accessToken, accessTokenSecret);
-		twitterStream.setOAuthAccessToken(token);
+		_twitterStream.setOAuthAccessToken(token);
 		
 		if (keyWords.length == 0) {
 
-			twitterStream.sample();
+			_twitterStream.sample();
 		}
 
 		else {
 
 			FilterQuery query = new FilterQuery().track(keyWords);
-			twitterStream.filter(query);
+			_twitterStream.filter(query);
 		}
 
 	}


[35/35] storm git commit: add STORM-1884 to changelog

Posted by pt...@apache.org.
add STORM-1884 to changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/749208e7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/749208e7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/749208e7

Branch: refs/heads/1.0.x-branch
Commit: 749208e70174c0be1f965ffcabaaf9bc2e823c29
Parents: 70bd535
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 16:53:17 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:53:17 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/749208e7/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fefe2d..ea77a2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.0.2
+ * STORM-1884: Prioritize pendingPrepare over pendingCommit
  * STORM-1575: fix TwitterSampleSpout NPE on close
  * STORM-1874: Update logger private permissions
  * STORM-1865: update command line client document


[29/35] storm git commit: add STORM-1575 to changelog

Posted by pt...@apache.org.
add STORM-1575 to changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a8141994
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a8141994
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a8141994

Branch: refs/heads/1.0.x-branch
Commit: a8141994dbc71344642d8fe5c2692ef1a7ed8904
Parents: e0fe1c3
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 16:44:33 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:44:33 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/a8141994/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d84cd7c..3fefe2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.0.2
+ * STORM-1575: fix TwitterSampleSpout NPE on close
  * STORM-1874: Update logger private permissions
  * STORM-1865: update command line client document
  * STORM-1771: HiveState should flushAndClose before closing old or idle Hive connections


[21/35] storm git commit: add STORM-1874 to changelog

Posted by pt...@apache.org.
add STORM-1874 to changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/135d7cde
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/135d7cde
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/135d7cde

Branch: refs/heads/1.x-branch
Commit: 135d7cdeda70a0a67308e893d12e0699135bbd9d
Parents: 6891bee
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 16:27:23 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:27:23 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/135d7cde/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b5a41b..361c548 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.1.0
+ * STORM-1874: Update logger private permissions
  * STORM-1865: update command line client document
  * STORM-1771: HiveState should flushAndClose before closing old or idle Hive connections
  * STORM-1882: Expose TextFileReader public


[26/35] storm git commit: [STORM-1575] fix TwitterSampleSpout NPE on close

Posted by pt...@apache.org.
[STORM-1575] fix TwitterSampleSpout NPE on close

Signed-off-by: P. Taylor Goetz <pt...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/12ba18b8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/12ba18b8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/12ba18b8

Branch: refs/heads/1.x-branch
Commit: 12ba18b820723e57e6c18b7d874a4e206c1ccd54
Parents: 135d7cd
Author: manuzhang <ow...@gmail.com>
Authored: Thu Feb 25 15:07:12 2016 +0800
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:43:22 2016 -0400

----------------------------------------------------------------------
 .../apache/storm/starter/spout/TwitterSampleSpout.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/12ba18b8/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/TwitterSampleSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/TwitterSampleSpout.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/TwitterSampleSpout.java
index df26d25..e8a2c05 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/TwitterSampleSpout.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/TwitterSampleSpout.java
@@ -103,24 +103,24 @@ public class TwitterSampleSpout extends BaseRichSpout {
 
 		};
 
-		TwitterStream twitterStream = new TwitterStreamFactory(
+		_twitterStream = new TwitterStreamFactory(
 				new ConfigurationBuilder().setJSONStoreEnabled(true).build())
 				.getInstance();
 
-		twitterStream.addListener(listener);
-		twitterStream.setOAuthConsumer(consumerKey, consumerSecret);
+		_twitterStream.addListener(listener);
+		_twitterStream.setOAuthConsumer(consumerKey, consumerSecret);
 		AccessToken token = new AccessToken(accessToken, accessTokenSecret);
-		twitterStream.setOAuthAccessToken(token);
+		_twitterStream.setOAuthAccessToken(token);
 		
 		if (keyWords.length == 0) {
 
-			twitterStream.sample();
+			_twitterStream.sample();
 		}
 
 		else {
 
 			FilterQuery query = new FilterQuery().track(keyWords);
-			twitterStream.filter(query);
+			_twitterStream.filter(query);
 		}
 
 	}


[15/35] storm git commit: add STORM-1865 to changelog

Posted by pt...@apache.org.
add STORM-1865 to changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e88e3138
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e88e3138
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e88e3138

Branch: refs/heads/1.x-branch
Commit: e88e31389cf9f557e8719af4064a01d8598391de
Parents: 0b9472c
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 16:09:28 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:09:28 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/e88e3138/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fe4fb3..0b5a41b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.1.0
+ * STORM-1865: update command line client document
  * STORM-1771: HiveState should flushAndClose before closing old or idle Hive connections
  * STORM-1882: Expose TextFileReader public
  * STORM-1873: Implement alternative behaviour for late tuples


[03/35] storm git commit: Fix STORM-1884

Posted by pt...@apache.org.
Fix STORM-1884


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d5dbbe0e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d5dbbe0e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d5dbbe0e

Branch: refs/heads/master
Commit: d5dbbe0e3207508f28d4dfae263ce930743a049d
Parents: a9ef86d
Author: Balazs Kossovics <ba...@s4m.io>
Authored: Mon Jun 6 17:04:27 2016 +0200
Committer: Balazs Kossovics <ba...@s4m.io>
Committed: Mon Jun 6 17:04:27 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/storm/redis/state/RedisKeyValueState.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/d5dbbe0e/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java
----------------------------------------------------------------------
diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java b/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java
index 6071757..6d690d4 100644
--- a/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java
+++ b/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java
@@ -161,7 +161,11 @@ public class RedisKeyValueState<K, V> implements KeyValueState<K, V> {
             commands = jedisContainer.getInstance();
             if (commands.exists(prepareNamespace)) {
                 LOG.debug("Prepared txn already exists, will merge", txid);
-                pendingPrepare.putAll(pendingCommit);
+                for (Map.Entry<String, String> e: pendingCommit.entrySet()) {
+                    if (!pendingPrepare.containsKey(e.getKey())) {
+                        pendingPrepare.put(e.getKey(), e.getValue());
+                    }
+                }
             }
             if (!pendingPrepare.isEmpty()) {
                 commands.hmset(prepareNamespace, pendingPrepare);


[30/35] storm git commit: Merge branch 'fix_storm_1884' of github.com:s4mDev/storm

Posted by pt...@apache.org.
Merge branch 'fix_storm_1884' of github.com:s4mDev/storm


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2507b0bb
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2507b0bb
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2507b0bb

Branch: refs/heads/master
Commit: 2507b0bbd2a0beda9bc9e3e70e84b6908b13db4d
Parents: d974546 d5dbbe0
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 16:49:19 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:49:19 2016 -0400

----------------------------------------------------------------------
 .../java/org/apache/storm/redis/state/RedisKeyValueState.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



[19/35] storm git commit: add STORM-1874 to changelog

Posted by pt...@apache.org.
add STORM-1874 to changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b7f28206
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b7f28206
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b7f28206

Branch: refs/heads/master
Commit: b7f28206e759d419e5202c53b8732235319a41d2
Parents: 1d9c0be
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 16:25:38 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:25:38 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/b7f28206/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 884837a..661bfdf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 2.0.0
+ * STORM-1874: Update logger private permissions
  * STORM-1865: update command line client document
  * STORM-1771. HiveState should flushAndClose before closing old or idle Hive connections
  * STORM-1882: Expose TextFileReader public


[04/35] storm git commit: STORM-1771. HiveState should flushAndClose before closing old or idle Hive connections.

Posted by pt...@apache.org.
STORM-1771. HiveState should flushAndClose before closing old or idle Hive connections.


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a8ea1419
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a8ea1419
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a8ea1419

Branch: refs/heads/1.x-branch
Commit: a8ea1419319040196f18363497583c25ab496c3a
Parents: 00685ad
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Mon Jun 6 10:39:45 2016 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Mon Jun 6 10:39:45 2016 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/storm/hive/trident/HiveState.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/a8ea1419/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java
----------------------------------------------------------------------
diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java b/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java
index 08a5953..cef1a4f 100644
--- a/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java
+++ b/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java
@@ -236,12 +236,14 @@ public class HiveState implements State {
         }
         try {
             LOG.info("Closing least used Writer to Hive end point : " + eldest);
-            allWriters.remove(eldest).close();
+            allWriters.remove(eldest).flushAndClose();
         } catch (IOException e) {
             LOG.warn("Failed to close writer for end point: " + eldest, e);
         } catch (InterruptedException e) {
             LOG.warn("Interrupted when attempting to close writer for end point: " + eldest, e);
             Thread.currentThread().interrupt();
+        } catch (Exception e) {
+            LOG.warn("Interrupted when attempting to close writer for end point: " + ep, e);
         }
     }
 
@@ -265,12 +267,14 @@ public class HiveState implements State {
         for(HiveEndPoint ep : retirees) {
             try {
                 LOG.info("Closing idle Writer to Hive end point : {}", ep);
-                allWriters.remove(ep).close();
+                allWriters.remove(ep).flushAndClose();
             } catch (IOException e) {
                 LOG.warn("Failed to close writer for end point: {}. Error: "+ ep, e);
             } catch (InterruptedException e) {
                 LOG.warn("Interrupted when attempting to close writer for end point: " + ep, e);
                 Thread.currentThread().interrupt();
+            } catch (Exception e) {
+                LOG.warn("Interrupted when attempting to close writer for end point: " + ep, e);
             }
         }
         return count;


[23/35] storm git commit: add STORM-1874 to changelog

Posted by pt...@apache.org.
add STORM-1874 to changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c4c54e38
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c4c54e38
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c4c54e38

Branch: refs/heads/1.0.x-branch
Commit: c4c54e38e7f710b0b16d5467c0fd2d988e86c0bc
Parents: 2e10ba6
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 16:28:06 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:28:06 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/c4c54e38/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d806932..d84cd7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.0.2
+ * STORM-1874: Update logger private permissions
  * STORM-1865: update command line client document
  * STORM-1771: HiveState should flushAndClose before closing old or idle Hive connections
  * STORM-1882: Expose TextFileReader public


[22/35] storm git commit: update logger private permissions

Posted by pt...@apache.org.
update logger private permissions

Signed-off-by: P. Taylor Goetz <pt...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2e10ba67
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2e10ba67
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2e10ba67

Branch: refs/heads/1.0.x-branch
Commit: 2e10ba6791aed701c9bbafa5c42166038d4bc61b
Parents: 315ff44
Author: darionyaphet <da...@gmail.com>
Authored: Wed Jun 1 13:27:54 2016 +0800
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:27:38 2016 -0400

----------------------------------------------------------------------
 .../src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java       | 2 +-
 .../jvm/org/apache/storm/kafka/DynamicPartitionConnections.java    | 2 +-
 .../storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java     | 2 +-
 .../storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java     | 2 +-
 .../src/jvm/org/apache/storm/kafka/PartitionManager.java           | 2 +-
 .../storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java  | 2 +-
 external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java   | 2 +-
 .../jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java    | 2 +-
 .../src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/2e10ba67/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java
index 0fc85b3..2ad90da 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java
@@ -37,7 +37,7 @@ import java.util.Map;
 
 public class DynamicBrokersReader {
 
-    public static final Logger LOG = LoggerFactory.getLogger(DynamicBrokersReader.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DynamicBrokersReader.class);
 
     private CuratorFramework _curator;
     private String _zkPath;

http://git-wip-us.apache.org/repos/asf/storm/blob/2e10ba67/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicPartitionConnections.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicPartitionConnections.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicPartitionConnections.java
index 6d30139..19f0452 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicPartitionConnections.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicPartitionConnections.java
@@ -30,7 +30,7 @@ import java.util.Set;
 
 public class DynamicPartitionConnections {
 
-    public static final Logger LOG = LoggerFactory.getLogger(DynamicPartitionConnections.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DynamicPartitionConnections.class);
 
     static class ConnectionInfo {
         SimpleConsumer consumer;

http://git-wip-us.apache.org/repos/asf/storm/blob/2e10ba67/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java
index d1da446..7bacd0b 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java
@@ -40,7 +40,7 @@ public class KafkaSpout extends BaseRichSpout {
         NO_EMITTED
     }
 
-    public static final Logger LOG = LoggerFactory.getLogger(KafkaSpout.class);
+    private static final Logger LOG = LoggerFactory.getLogger(KafkaSpout.class);
 
     SpoutConfig _spoutConfig;
     SpoutOutputCollector _collector;

http://git-wip-us.apache.org/repos/asf/storm/blob/2e10ba67/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java
index 9eb8268..32c1c7f 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java
@@ -47,7 +47,7 @@ import kafka.message.Message;
 
 public class KafkaUtils {
 
-    public static final Logger LOG = LoggerFactory.getLogger(KafkaUtils.class);
+    private static final Logger LOG = LoggerFactory.getLogger(KafkaUtils.class);
     private static final int NO_OFFSET = -5;
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/2e10ba67/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
index c20f237..f9d8cf6 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
@@ -39,7 +39,7 @@ import kafka.javaapi.message.ByteBufferMessageSet;
 import kafka.message.MessageAndOffset;
 
 public class PartitionManager {
-    public static final Logger LOG = LoggerFactory.getLogger(PartitionManager.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PartitionManager.class);
 
     private final CombinedMetric _fetchAPILatencyMax;
     private final ReducedMetric _fetchAPILatencyMean;

http://git-wip-us.apache.org/repos/asf/storm/blob/2e10ba67/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java
index a53d566..98bf8a0 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java
@@ -26,7 +26,7 @@ import java.util.*;
 import static org.apache.storm.kafka.KafkaUtils.taskId;
 
 public class ZkCoordinator implements PartitionCoordinator {
-    public static final Logger LOG = LoggerFactory.getLogger(ZkCoordinator.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ZkCoordinator.class);
 
     SpoutConfig _spoutConfig;
     int _taskIndex;

http://git-wip-us.apache.org/repos/asf/storm/blob/2e10ba67/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java
index d12016b..1428bb7 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java
@@ -33,7 +33,7 @@ import java.util.List;
 import java.util.Map;
 
 public class ZkState {
-    public static final Logger LOG = LoggerFactory.getLogger(ZkState.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ZkState.class);
     CuratorFramework _curator;
 
     private CuratorFramework newCurator(Map stateConf) throws Exception {

http://git-wip-us.apache.org/repos/asf/storm/blob/2e10ba67/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java
index 9732c8c..809ed73 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java
@@ -41,7 +41,7 @@ import kafka.message.MessageAndOffset;
 
 public class TridentKafkaEmitter {
 
-    public static final Logger LOG = LoggerFactory.getLogger(TridentKafkaEmitter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TridentKafkaEmitter.class);
 
     private DynamicPartitionConnections _connections;
     private String _topologyName;

http://git-wip-us.apache.org/repos/asf/storm/blob/2e10ba67/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java
index d26c341..abc10db 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java
@@ -29,7 +29,7 @@ import java.util.Map;
 
 public class ZkBrokerReader implements IBrokerReader {
 
-	public static final Logger LOG = LoggerFactory.getLogger(ZkBrokerReader.class);
+	private static final Logger LOG = LoggerFactory.getLogger(ZkBrokerReader.class);
 
 	List<GlobalPartitionInformation> cachedBrokers = new ArrayList<GlobalPartitionInformation>();
 	DynamicBrokersReader reader;


[11/35] storm git commit: add STORM-1771 to changelog

Posted by pt...@apache.org.
add STORM-1771 to changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0cef213f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0cef213f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0cef213f

Branch: refs/heads/master
Commit: 0cef213f23a2398771187a75a530b869f3a6eb21
Parents: f5eb479
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 16:05:30 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:05:30 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/0cef213f/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12b120a..c3573e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 2.0.0
+ * STORM-1771. HiveState should flushAndClose before closing old or idle Hive connections
  * STORM-1882: Expose TextFileReader public
  * STORM-1873: Implement alternative behaviour for late tuples
  * STORM-1878: Flux can now handle IStatefulBolts


[08/35] storm git commit: STORM-1771. HiveState should flushAndClose before closing old or idle Hive connections.

Posted by pt...@apache.org.
STORM-1771. HiveState should flushAndClose before closing old or idle Hive connections.

Signed-off-by: P. Taylor Goetz <pt...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ca186cd1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ca186cd1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ca186cd1

Branch: refs/heads/1.0.x-branch
Commit: ca186cd1a62c90022a6b8cd4616efd5b32505a5a
Parents: 1a50bec
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Mon Jun 6 10:39:45 2016 -0700
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:01:49 2016 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/storm/hive/trident/HiveState.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/ca186cd1/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java
----------------------------------------------------------------------
diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java b/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java
index 08a5953..cef1a4f 100644
--- a/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java
+++ b/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java
@@ -236,12 +236,14 @@ public class HiveState implements State {
         }
         try {
             LOG.info("Closing least used Writer to Hive end point : " + eldest);
-            allWriters.remove(eldest).close();
+            allWriters.remove(eldest).flushAndClose();
         } catch (IOException e) {
             LOG.warn("Failed to close writer for end point: " + eldest, e);
         } catch (InterruptedException e) {
             LOG.warn("Interrupted when attempting to close writer for end point: " + eldest, e);
             Thread.currentThread().interrupt();
+        } catch (Exception e) {
+            LOG.warn("Interrupted when attempting to close writer for end point: " + ep, e);
         }
     }
 
@@ -265,12 +267,14 @@ public class HiveState implements State {
         for(HiveEndPoint ep : retirees) {
             try {
                 LOG.info("Closing idle Writer to Hive end point : {}", ep);
-                allWriters.remove(ep).close();
+                allWriters.remove(ep).flushAndClose();
             } catch (IOException e) {
                 LOG.warn("Failed to close writer for end point: {}. Error: "+ ep, e);
             } catch (InterruptedException e) {
                 LOG.warn("Interrupted when attempting to close writer for end point: " + ep, e);
                 Thread.currentThread().interrupt();
+            } catch (Exception e) {
+                LOG.warn("Interrupted when attempting to close writer for end point: " + ep, e);
             }
         }
         return count;


[06/35] storm git commit: Merge branch 'STORM-1771' of github.com:harshach/incubator-storm into 1.x-branch

Posted by pt...@apache.org.
Merge branch 'STORM-1771' of github.com:harshach/incubator-storm into 1.x-branch


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/674c923d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/674c923d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/674c923d

Branch: refs/heads/1.x-branch
Commit: 674c923d3fd4de15f7b5c458b2f46c2f19c660d2
Parents: 71476b4 a8ea141
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 15:59:09 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 15:59:09 2016 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/storm/hive/trident/HiveState.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------



[10/35] storm git commit: STORM-1771. HiveState should flushAndClose before closing old or idle Hive connections.

Posted by pt...@apache.org.
STORM-1771. HiveState should flushAndClose before closing old or idle Hive connections.

Signed-off-by: P. Taylor Goetz <pt...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f5eb4790
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f5eb4790
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f5eb4790

Branch: refs/heads/master
Commit: f5eb4790e77ec1cda9706c68a9a728808034ffec
Parents: 02c4f6b
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Mon Jun 6 10:39:45 2016 -0700
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:04:22 2016 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/storm/hive/trident/HiveState.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/f5eb4790/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java
----------------------------------------------------------------------
diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java b/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java
index 08a5953..cef1a4f 100644
--- a/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java
+++ b/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java
@@ -236,12 +236,14 @@ public class HiveState implements State {
         }
         try {
             LOG.info("Closing least used Writer to Hive end point : " + eldest);
-            allWriters.remove(eldest).close();
+            allWriters.remove(eldest).flushAndClose();
         } catch (IOException e) {
             LOG.warn("Failed to close writer for end point: " + eldest, e);
         } catch (InterruptedException e) {
             LOG.warn("Interrupted when attempting to close writer for end point: " + eldest, e);
             Thread.currentThread().interrupt();
+        } catch (Exception e) {
+            LOG.warn("Interrupted when attempting to close writer for end point: " + ep, e);
         }
     }
 
@@ -265,12 +267,14 @@ public class HiveState implements State {
         for(HiveEndPoint ep : retirees) {
             try {
                 LOG.info("Closing idle Writer to Hive end point : {}", ep);
-                allWriters.remove(ep).close();
+                allWriters.remove(ep).flushAndClose();
             } catch (IOException e) {
                 LOG.warn("Failed to close writer for end point: {}. Error: "+ ep, e);
             } catch (InterruptedException e) {
                 LOG.warn("Interrupted when attempting to close writer for end point: " + ep, e);
                 Thread.currentThread().interrupt();
+            } catch (Exception e) {
+                LOG.warn("Interrupted when attempting to close writer for end point: " + ep, e);
             }
         }
         return count;


[02/35] storm git commit: update logger private permissions

Posted by pt...@apache.org.
update logger private permissions


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d0162b72
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d0162b72
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d0162b72

Branch: refs/heads/master
Commit: d0162b726fe63759cb67473185b4ad836bcc6e88
Parents: 671e21e
Author: darionyaphet <da...@gmail.com>
Authored: Wed Jun 1 13:27:54 2016 +0800
Committer: darionyaphet <da...@gmail.com>
Committed: Wed Jun 1 13:27:54 2016 +0800

----------------------------------------------------------------------
 .../src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java       | 2 +-
 .../jvm/org/apache/storm/kafka/DynamicPartitionConnections.java    | 2 +-
 .../storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java     | 2 +-
 .../storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java     | 2 +-
 .../src/jvm/org/apache/storm/kafka/PartitionManager.java           | 2 +-
 .../storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java  | 2 +-
 external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java   | 2 +-
 .../jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java    | 2 +-
 .../src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/d0162b72/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java
index 0fc85b3..2ad90da 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java
@@ -37,7 +37,7 @@ import java.util.Map;
 
 public class DynamicBrokersReader {
 
-    public static final Logger LOG = LoggerFactory.getLogger(DynamicBrokersReader.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DynamicBrokersReader.class);
 
     private CuratorFramework _curator;
     private String _zkPath;

http://git-wip-us.apache.org/repos/asf/storm/blob/d0162b72/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicPartitionConnections.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicPartitionConnections.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicPartitionConnections.java
index 6d30139..19f0452 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicPartitionConnections.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicPartitionConnections.java
@@ -30,7 +30,7 @@ import java.util.Set;
 
 public class DynamicPartitionConnections {
 
-    public static final Logger LOG = LoggerFactory.getLogger(DynamicPartitionConnections.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DynamicPartitionConnections.class);
 
     static class ConnectionInfo {
         SimpleConsumer consumer;

http://git-wip-us.apache.org/repos/asf/storm/blob/d0162b72/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java
index d1da446..7bacd0b 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java
@@ -40,7 +40,7 @@ public class KafkaSpout extends BaseRichSpout {
         NO_EMITTED
     }
 
-    public static final Logger LOG = LoggerFactory.getLogger(KafkaSpout.class);
+    private static final Logger LOG = LoggerFactory.getLogger(KafkaSpout.class);
 
     SpoutConfig _spoutConfig;
     SpoutOutputCollector _collector;

http://git-wip-us.apache.org/repos/asf/storm/blob/d0162b72/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java
index 090b6d1..88b29c5 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java
@@ -47,7 +47,7 @@ import kafka.message.Message;
 
 public class KafkaUtils {
 
-    public static final Logger LOG = LoggerFactory.getLogger(KafkaUtils.class);
+    private static final Logger LOG = LoggerFactory.getLogger(KafkaUtils.class);
     private static final int NO_OFFSET = -5;
 
     //suppress default constructor for noninstantiablility

http://git-wip-us.apache.org/repos/asf/storm/blob/d0162b72/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
index 535e589..f8d2c41 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
@@ -39,7 +39,7 @@ import kafka.javaapi.message.ByteBufferMessageSet;
 import kafka.message.MessageAndOffset;
 
 public class PartitionManager {
-    public static final Logger LOG = LoggerFactory.getLogger(PartitionManager.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PartitionManager.class);
 
     private final CombinedMetric _fetchAPILatencyMax;
     private final ReducedMetric _fetchAPILatencyMean;

http://git-wip-us.apache.org/repos/asf/storm/blob/d0162b72/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java
index a53d566..98bf8a0 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java
@@ -26,7 +26,7 @@ import java.util.*;
 import static org.apache.storm.kafka.KafkaUtils.taskId;
 
 public class ZkCoordinator implements PartitionCoordinator {
-    public static final Logger LOG = LoggerFactory.getLogger(ZkCoordinator.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ZkCoordinator.class);
 
     SpoutConfig _spoutConfig;
     int _taskIndex;

http://git-wip-us.apache.org/repos/asf/storm/blob/d0162b72/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java
index d12016b..1428bb7 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java
@@ -33,7 +33,7 @@ import java.util.List;
 import java.util.Map;
 
 public class ZkState {
-    public static final Logger LOG = LoggerFactory.getLogger(ZkState.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ZkState.class);
     CuratorFramework _curator;
 
     private CuratorFramework newCurator(Map stateConf) throws Exception {

http://git-wip-us.apache.org/repos/asf/storm/blob/d0162b72/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java
index 512363c..4bf3076 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java
@@ -41,7 +41,7 @@ import kafka.message.MessageAndOffset;
 
 public class TridentKafkaEmitter {
 
-    public static final Logger LOG = LoggerFactory.getLogger(TridentKafkaEmitter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TridentKafkaEmitter.class);
 
     private DynamicPartitionConnections _connections;
     private String _topologyName;

http://git-wip-us.apache.org/repos/asf/storm/blob/d0162b72/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java
index d26c341..abc10db 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java
@@ -29,7 +29,7 @@ import java.util.Map;
 
 public class ZkBrokerReader implements IBrokerReader {
 
-	public static final Logger LOG = LoggerFactory.getLogger(ZkBrokerReader.class);
+	private static final Logger LOG = LoggerFactory.getLogger(ZkBrokerReader.class);
 
 	List<GlobalPartitionInformation> cachedBrokers = new ArrayList<GlobalPartitionInformation>();
 	DynamicBrokersReader reader;


[17/35] storm git commit: add STORM-1865 to changelog

Posted by pt...@apache.org.
add STORM-1865 to changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/315ff441
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/315ff441
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/315ff441

Branch: refs/heads/1.0.x-branch
Commit: 315ff441bf8a4d3b38d00574e62964f7c275dbea
Parents: f3046d4
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 16:10:27 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:10:27 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/315ff441/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b77d533..d806932 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.0.2
+ * STORM-1865: update command line client document
  * STORM-1771: HiveState should flushAndClose before closing old or idle Hive connections
  * STORM-1882: Expose TextFileReader public
  * STORM-1864 : StormSubmitter should throw respective exceptions and log respective errors for registered submitter hook invocation


[24/35] storm git commit: Merge branch 'fix_1575' of github.com:manuzhang/storm

Posted by pt...@apache.org.
Merge branch 'fix_1575' of github.com:manuzhang/storm


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bf4c71cf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bf4c71cf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bf4c71cf

Branch: refs/heads/master
Commit: bf4c71cff1c1f36861283945200abde704a8c724
Parents: b7f2820 a37ddba
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 16:41:00 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:41:00 2016 -0400

----------------------------------------------------------------------
 .../apache/storm/starter/spout/TwitterSampleSpout.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------



[20/35] storm git commit: update logger private permissions

Posted by pt...@apache.org.
update logger private permissions

Signed-off-by: P. Taylor Goetz <pt...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6891bee9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6891bee9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6891bee9

Branch: refs/heads/1.x-branch
Commit: 6891bee9cfc1fa0b1581c81f52b3182cd65560e3
Parents: e88e313
Author: darionyaphet <da...@gmail.com>
Authored: Wed Jun 1 13:27:54 2016 +0800
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:26:16 2016 -0400

----------------------------------------------------------------------
 .../src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java       | 2 +-
 .../jvm/org/apache/storm/kafka/DynamicPartitionConnections.java    | 2 +-
 .../storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java     | 2 +-
 .../storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java     | 2 +-
 .../src/jvm/org/apache/storm/kafka/PartitionManager.java           | 2 +-
 .../storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java  | 2 +-
 external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java   | 2 +-
 .../jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java    | 2 +-
 .../src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/6891bee9/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java
index 0fc85b3..2ad90da 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java
@@ -37,7 +37,7 @@ import java.util.Map;
 
 public class DynamicBrokersReader {
 
-    public static final Logger LOG = LoggerFactory.getLogger(DynamicBrokersReader.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DynamicBrokersReader.class);
 
     private CuratorFramework _curator;
     private String _zkPath;

http://git-wip-us.apache.org/repos/asf/storm/blob/6891bee9/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicPartitionConnections.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicPartitionConnections.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicPartitionConnections.java
index 6d30139..19f0452 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicPartitionConnections.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/DynamicPartitionConnections.java
@@ -30,7 +30,7 @@ import java.util.Set;
 
 public class DynamicPartitionConnections {
 
-    public static final Logger LOG = LoggerFactory.getLogger(DynamicPartitionConnections.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DynamicPartitionConnections.class);
 
     static class ConnectionInfo {
         SimpleConsumer consumer;

http://git-wip-us.apache.org/repos/asf/storm/blob/6891bee9/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java
index d1da446..7bacd0b 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java
@@ -40,7 +40,7 @@ public class KafkaSpout extends BaseRichSpout {
         NO_EMITTED
     }
 
-    public static final Logger LOG = LoggerFactory.getLogger(KafkaSpout.class);
+    private static final Logger LOG = LoggerFactory.getLogger(KafkaSpout.class);
 
     SpoutConfig _spoutConfig;
     SpoutOutputCollector _collector;

http://git-wip-us.apache.org/repos/asf/storm/blob/6891bee9/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java
index 48d3ab7..822912b 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java
@@ -47,7 +47,7 @@ import kafka.message.Message;
 
 public class KafkaUtils {
 
-    public static final Logger LOG = LoggerFactory.getLogger(KafkaUtils.class);
+    private static final Logger LOG = LoggerFactory.getLogger(KafkaUtils.class);
     private static final int NO_OFFSET = -5;
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/6891bee9/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
index c20f237..f9d8cf6 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/PartitionManager.java
@@ -39,7 +39,7 @@ import kafka.javaapi.message.ByteBufferMessageSet;
 import kafka.message.MessageAndOffset;
 
 public class PartitionManager {
-    public static final Logger LOG = LoggerFactory.getLogger(PartitionManager.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PartitionManager.class);
 
     private final CombinedMetric _fetchAPILatencyMax;
     private final ReducedMetric _fetchAPILatencyMean;

http://git-wip-us.apache.org/repos/asf/storm/blob/6891bee9/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java
index a53d566..98bf8a0 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java
@@ -26,7 +26,7 @@ import java.util.*;
 import static org.apache.storm.kafka.KafkaUtils.taskId;
 
 public class ZkCoordinator implements PartitionCoordinator {
-    public static final Logger LOG = LoggerFactory.getLogger(ZkCoordinator.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ZkCoordinator.class);
 
     SpoutConfig _spoutConfig;
     int _taskIndex;

http://git-wip-us.apache.org/repos/asf/storm/blob/6891bee9/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java
index d12016b..1428bb7 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java
@@ -33,7 +33,7 @@ import java.util.List;
 import java.util.Map;
 
 public class ZkState {
-    public static final Logger LOG = LoggerFactory.getLogger(ZkState.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ZkState.class);
     CuratorFramework _curator;
 
     private CuratorFramework newCurator(Map stateConf) throws Exception {

http://git-wip-us.apache.org/repos/asf/storm/blob/6891bee9/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java
index 9732c8c..809ed73 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java
@@ -41,7 +41,7 @@ import kafka.message.MessageAndOffset;
 
 public class TridentKafkaEmitter {
 
-    public static final Logger LOG = LoggerFactory.getLogger(TridentKafkaEmitter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TridentKafkaEmitter.class);
 
     private DynamicPartitionConnections _connections;
     private String _topologyName;

http://git-wip-us.apache.org/repos/asf/storm/blob/6891bee9/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java
index d26c341..abc10db 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java
@@ -29,7 +29,7 @@ import java.util.Map;
 
 public class ZkBrokerReader implements IBrokerReader {
 
-	public static final Logger LOG = LoggerFactory.getLogger(ZkBrokerReader.class);
+	private static final Logger LOG = LoggerFactory.getLogger(ZkBrokerReader.class);
 
 	List<GlobalPartitionInformation> cachedBrokers = new ArrayList<GlobalPartitionInformation>();
 	DynamicBrokersReader reader;


[34/35] storm git commit: Fix STORM-1884

Posted by pt...@apache.org.
Fix STORM-1884

Signed-off-by: P. Taylor Goetz <pt...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/70bd5359
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/70bd5359
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/70bd5359

Branch: refs/heads/1.0.x-branch
Commit: 70bd5359d5fead47613d1008f1baa9232aa567c0
Parents: a814199
Author: Balazs Kossovics <ba...@s4m.io>
Authored: Mon Jun 6 17:04:27 2016 +0200
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:52:48 2016 -0400

----------------------------------------------------------------------
 .../java/org/apache/storm/redis/state/RedisKeyValueState.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/70bd5359/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java
----------------------------------------------------------------------
diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java b/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java
index 6071757..6d690d4 100644
--- a/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java
+++ b/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java
@@ -161,7 +161,11 @@ public class RedisKeyValueState<K, V> implements KeyValueState<K, V> {
             commands = jedisContainer.getInstance();
             if (commands.exists(prepareNamespace)) {
                 LOG.debug("Prepared txn already exists, will merge", txid);
-                pendingPrepare.putAll(pendingCommit);
+                for (Map.Entry<String, String> e: pendingCommit.entrySet()) {
+                    if (!pendingPrepare.containsKey(e.getKey())) {
+                        pendingPrepare.put(e.getKey(), e.getValue());
+                    }
+                }
             }
             if (!pendingPrepare.isEmpty()) {
                 commands.hmset(prepareNamespace, pendingPrepare);


[09/35] storm git commit: add STORM-1771 to changelog

Posted by pt...@apache.org.
add STORM-1771 to changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2bc5248c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2bc5248c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2bc5248c

Branch: refs/heads/1.0.x-branch
Commit: 2bc5248cbf843998fb0ade726d967c2067bf9ecb
Parents: ca186cd
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 16:04:02 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:04:02 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/2bc5248c/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe4a93f..b77d533 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.0.2
+ * STORM-1771: HiveState should flushAndClose before closing old or idle Hive connections
  * STORM-1882: Expose TextFileReader public
  * STORM-1864 : StormSubmitter should throw respective exceptions and log respective errors for registered submitter hook invocation
  * STORM-1887: Fixed help message for set_log_level command


[05/35] storm git commit: STORM-1865: update command line client document

Posted by pt...@apache.org.
STORM-1865: update command line client document

Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9ea9352d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9ea9352d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9ea9352d

Branch: refs/heads/master
Commit: 9ea9352d2a8eb629c826f56622a395c654536fb7
Parents: 2c77a20
Author: Xin Wang <be...@163.com>
Authored: Wed Jun 8 12:50:46 2016 +0800
Committer: Xin Wang <be...@163.com>
Committed: Wed Jun 8 12:50:46 2016 +0800

----------------------------------------------------------------------
 docs/Command-line-client.md | 163 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 163 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/9ea9352d/docs/Command-line-client.md
----------------------------------------------------------------------
diff --git a/docs/Command-line-client.md b/docs/Command-line-client.md
index e97b49c..05e981b 100644
--- a/docs/Command-line-client.md
+++ b/docs/Command-line-client.md
@@ -20,6 +20,22 @@ These commands are:
 1. supervisor
 1. ui
 1. drpc
+1. blobstore
+1. dev-zookeeper
+1. get-errors
+1. heartbeats
+1. kill_workers
+1. list
+1. logviewer
+1. monitor
+1. node-health-check
+1. pacemaker
+1. set_log_level
+1. shell
+1. sql
+1. upload-credentials
+1. version
+1. help
 
 ### jar
 
@@ -102,3 +118,150 @@ Launches the UI daemon. The UI provides a web interface for a Storm cluster and
 Syntax: `storm drpc`
 
 Launches a DRPC daemon. This command should be run under supervision with a tool like [daemontools](http://cr.yp.to/daemontools.html) or [monit](http://mmonit.com/monit/). See [Distributed RPC](Distributed-RPC.html) for more information.
+
+### blobstore
+
+Syntax: `storm blobstore cmd`
+
+list [KEY...] - lists blobs currently in the blob store
+
+cat [-f FILE] KEY - read a blob and then either write it to a file, or STDOUT (requires read access).
+
+create [-f FILE] [-a ACL ...] [--replication-factor NUMBER] KEY - create a new blob. Contents comes from a FILE or STDIN. ACL is in the form [uo]:[username]:[r-][w-][a-] can be comma separated list.
+
+update [-f FILE] KEY - update the contents of a blob.  Contents comes from a FILE or STDIN (requires write access).
+
+delete KEY - delete an entry from the blob store (requires write access).
+
+set-acl [-s ACL] KEY - ACL is in the form [uo]:[username]:[r-][w-][a-] can be comma separated list (requires admin access).
+
+replication --read KEY - Used to read the replication factor of the blob.
+
+replication --update --replication-factor NUMBER KEY where NUMBER > 0. It is used to update the replication factor of a blob.
+
+For example, the following would create a mytopo:data.tgz key using the data stored in data.tgz.  User alice would have full access, bob would have read/write access and everyone else would have read access.
+
+storm blobstore create mytopo:data.tgz -f data.tgz -a u:alice:rwa,u:bob:rw,o::r
+
+### dev-zookeeper
+
+Syntax: `storm dev-zookeeper`
+
+Launches a fresh Zookeeper server using "dev.zookeeper.path" as its local dir and "storm.zookeeper.port" as its port. This is only intended for development/testing, the Zookeeper instance launched is not configured to be used in production.
+
+### get-errors
+
+Syntax: `storm get-errors topology-name`
+
+Get the latest error from the running topology. The returned result contains the key value pairs for component-name and component-error for the components in error. The result is returned in json format.
+
+### heartbeats
+
+Syntax: `storm heartbeats [cmd]`
+
+list PATH - lists heartbeats nodes under PATH currently in the ClusterState.
+get  PATH - Get the heartbeat data at PATH
+
+### kill_workers
+
+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 mode, then user needs to have admin rights on the node to be able to successfully kill all workers.
+
+### list
+
+Syntax: `storm list`
+
+List the running topologies and their statuses.
+
+### logviewer
+
+Syntax: `storm logviewer`
+
+Launches the log viewer daemon. It provides a web interface for viewing storm log files. This command should be run under supervision with a tool like daemontools or monit.
+
+See Setting up a Storm cluster for more information.(http://storm.apache.org/documentation/Setting-up-a-Storm-cluster)
+
+### monitor
+
+Syntax: `storm monitor topology-name [-i interval-secs] [-m component-id] [-s stream-id] [-w [emitted | transferred]]`
+
+Monitor given topology's throughput interactively.
+One can specify poll-interval, component-id, stream-id, watch-item[emitted | transferred]
+  By default,
+    poll-interval is 4 seconds;
+    all component-ids will be list;
+    stream-id is 'default';
+    watch-item is 'emitted';
+
+### node-health-check
+
+Syntax: `storm node-health-check`
+
+Run health checks on the local supervisor.
+
+### pacemaker
+
+Syntax: `storm pacemaker`
+
+Launches the Pacemaker daemon. This command should be run under
+supervision with a tool like daemontools or monit.
+
+See Setting up a Storm cluster for more information.(http://storm.apache.org/documentation/Setting-up-a-Storm-cluster)
+
+### set_log_level
+
+Syntax: `storm set_log_level -l [logger name]=[log level][:optional timeout] -r [logger name] topology-name`
+
+Dynamically change topology log levels
+    
+where log level is one of: ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF
+and timeout is integer seconds.
+
+e.g.
+  ./bin/storm set_log_level -l ROOT=DEBUG:30 topology-name
+
+  Set the root logger's level to DEBUG for 30 seconds
+
+  ./bin/storm set_log_level -l com.myapp=WARN topology-name
+
+  Set the com.myapp logger's level to WARN for 30 seconds
+
+  ./bin/storm set_log_level -l com.myapp=WARN -l com.myOtherLogger=ERROR:123 topology-name
+
+  Set the com.myapp logger's level to WARN indifinitely, and com.myOtherLogger to ERROR for 123 seconds
+
+  ./bin/storm set_log_level -r com.myOtherLogger topology-name
+
+  Clears settings, resetting back to the original level
+
+### shell
+
+Syntax: `storm shell resourcesdir command args`
+
+Makes constructing jar and uploading to nimbus for using non JVM languages
+
+eg: `storm shell resources/ python topology.py arg1 arg2`
+
+### sql
+
+Syntax: `storm sql sql-file topology-name`
+
+Compiles the SQL statements into a Trident topology and submits it to Storm.
+
+### upload-credentials
+
+Syntax: `storm upload_credentials topology-name [credkey credvalue]*`
+
+Uploads a new set of credentials to a running topology
+
+### version
+
+Syntax: `storm version`
+
+Prints the version number of this Storm release.
+
+### help
+Syntax: `storm help [command]`
+
+Print one help message or list of available commands


[33/35] storm git commit: add STORM-1884 to changelog

Posted by pt...@apache.org.
add STORM-1884 to changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/760f10ae
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/760f10ae
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/760f10ae

Branch: refs/heads/1.x-branch
Commit: 760f10aefe46eb92ddd18f4c2de9f712b5eab5b9
Parents: 5cccb91
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 16:52:30 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:52:30 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/760f10ae/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33bdec2..c7b2226 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.1.0
+ * STORM-1884: Prioritize pendingPrepare over pendingCommit
  * STORM-1575: fix TwitterSampleSpout NPE on close
  * STORM-1874: Update logger private permissions
  * STORM-1865: update command line client document


[12/35] storm git commit: Merge branch 'STORM-1865' of github.com:vesense/storm

Posted by pt...@apache.org.
Merge branch 'STORM-1865' of github.com:vesense/storm


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fd35ad60
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fd35ad60
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fd35ad60

Branch: refs/heads/master
Commit: fd35ad60787498a398bdff9bd9b125b107098a84
Parents: 0cef213 9ea9352
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 16:07:20 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:07:20 2016 -0400

----------------------------------------------------------------------
 docs/Command-line-client.md | 163 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 163 insertions(+)
----------------------------------------------------------------------



[25/35] storm git commit: add STORM-1575 to changelog

Posted by pt...@apache.org.
add STORM-1575 to changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d974546b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d974546b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d974546b

Branch: refs/heads/master
Commit: d974546bee3291ab44d5aec5139e1837dbcbc72a
Parents: bf4c71c
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 16:42:12 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:42:12 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.md | 698 +-----------------------------------------------------
 1 file changed, 2 insertions(+), 696 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/d974546b/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 661bfdf..eddea8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 2.0.0
+ * STORM-1575: fix TwitterSampleSpout NPE on close
  * STORM-1874: Update logger private permissions
  * STORM-1865: update command line client document
  * STORM-1771. HiveState should flushAndClose before closing old or idle Hive connections
@@ -517,699 +518,4 @@
  * STORM-789: Send more topology context to Multi-Lang components via initial handshake
  * STORM-788: UI Fix key for process latencies
  * STORM-787: test-ns should announce test failures with 'BUILD FAILURE'
- * STORM-786: KafkaBolt should ack tick tuples
- * STORM-773: backtype.storm.transactional-test fails periodically with timeout
- * STORM-772: Tasts fail periodically with InterruptedException or InterruptedIOException
- * STORM-766: Include version info in the service page
- * STORM-765: Thrift serialization for local state
- * STORM-764: Have option to compress thrift heartbeat
- * STORM-762: uptime for worker heartbeats is lost when converted to thrift
- * STORM-761: An option for new/updated Redis keys to expire in RedisMapState
- * STORM-757: Simulated time can leak out on errors
- * STORM-753: Improve RedisStateQuerier to convert List<Values> from Redis value
- * STORM-752: [storm-redis] Clarify Redis*StateUpdater's expire is optional
- * STORM-750: Set Config serialVersionUID
- * STORM-749: Remove CSRF check from the REST API.
- * STORM-747: assignment-version-callback/info-with-version-callback are not fired when assignments change
- * STORM-746: Skip ack init when there are no output tasks
- * STORM-745: fix storm.cmd to evaluate 'shift' correctly with 'storm jar'
- * STORM-741: Allow users to pass a config value to perform impersonation.
- * STORM-740: Simple Transport Client cannot configure thrift buffer size
- * STORM-737: Check task->node+port with read lock to prevent sending to closed connection
- * STORM-735: [storm-redis] Upgrade Jedis to 2.7.0
- * STORM-730: remove extra curly brace
- * STORM-729: Include Executors (Window Hint) if the component is of Bolt type
- * STORM-727: Storm tests should succeed even if a storm process is running locally.
- * STORM-724: Document RedisStoreBolt and RedisLookupBolt which is missed.
- * STORM-723: Remove RedisStateSetUpdater / RedisStateSetCountQuerier which didn't tested and have a bug
- * STORM-721: Storm UI server should support SSL.
- * STORM-715: Add a link to AssignableMetric.java in Metrics.md
- * STORM-714: Make CSS more consistent with self, prev release
- * STORM-713: Include topic information with Kafka metrics.
- * STORM-712: Storm daemons shutdown if OutOfMemoryError occurs in any thread
- * STORM-711: All connectors should use collector.reportError and tuple anchoring.
- * STORM-708: CORS support for STORM UI.
- * STORM-707: Client (Netty): improve logging to help troubleshooting connection woes
- * STORM-704: Apply Travis CI to Apache Storm Project
- * STORM-703: With hash key option for RedisMapState, only get values for keys in batch
- * STORM-699: storm-jdbc should support custom insert queries. 
- * STORM-696: Single Namespace Test Launching
- * STORM-694: java.lang.ClassNotFoundException: backtype.storm.daemon.common.SupervisorInfo
- * STORM-693: KafkaBolt exception handling improvement.
- * STORM-691: Add basic lookup / persist bolts
- * STORM-690: Return Jedis into JedisPool with marking 'broken' if connection is broken
- * STORM-689: SimpleACLAuthorizer should provide a way to restrict who can submit topologies.
- * STORM-688: update Util to compile under JDK8
- * STORM-687: Storm UI does not display up to date information despite refreshes in IE
- * STORM-685: wrong output in log when committed offset is too far behind latest offset
- * STORM-684: In RichSpoutBatchExecutor: underlying spout is not closed when emitter is closed
- * STORM-683: Make false in a conf really evaluate to false in clojure.
- * STORM-682: supervisor should handle worker state corruption gracefully.
- * STORM-681: Auto insert license header with genthrift.sh
- * STORM-675: Allow users to have storm-env.sh under config dir to set custom JAVA_HOME and other env variables.
- * STORM-673: Typo 'deamon' in security documentation
- * STORM-672: Typo in Trident documentation example
- * STORM-670: restore java 1.6 compatibility (storm-kafka)
- * STORM-669: Replace links with ones to latest api document
- * STORM-667: Incorrect capitalization "SHell" in Multilang-protocol.md
- * STORM-663: Create javadocs for BoltDeclarer
- * STORM-659: return grep matches each on its own line.
- * STORM-657: make the shutdown-worker sleep time before kill -9 configurable
- * STORM-656: Document "external" modules and "Committer Sponsors"
- * STORM-651: improvements to storm.cmd
- * STORM-641: Add total number of topologies to api/v1/cluster/summary.
- * STORM-640: Storm UI vulnerable to poodle attack.
- * STORM-637: Integrate PartialKeyGrouping into storm API
- * STORM-636: Faster, optional retrieval of last component error
- * STORM-635: logviewer returns 404 if storm_home/logs is a symlinked dir.
- * STORM-634: Storm serialization changed to thrift to support rolling upgrade.
- * STORM-632: New grouping for better load balancing
- * STORM-630: Support for Clojure 1.6.0
- * STORM-629: Place Link to Source Code Repository on Webpage
- * STORM-627: Storm-hbase configuration error.
- * STORM-626: Add script to print out the merge command for a given pull request.
- * STORM-625: Don't leak netty clients when worker moves or reuse netty client.	
- * STORM-623: Generate latest javadocs
- * STORM-620: Duplicate maven plugin declaration
- * STORM-616: Storm JDBC Connector.
- * STORM-615: Add REST API to upload topology.
- * STORM-613: Fix wrong getOffset return value
- * STORM-612: Update the contact address in configure.ac
- * STORM-611: Remove extra "break"s
- * STORM-610: Check the return value of fts_close()
- * STORM-609: Add storm-redis to storm external
- * STORM-608: Storm UI CSRF escape characters not work correctly.
- * STORM-607: storm-hbase HBaseMapState should support user to customize the hbase-key & hbase-qualifier
- * STORM-603: Log errors when required kafka params are missing
- * STORM-601: Make jira-github-join ignore case.
- * STORM-600: upgrade jacoco plugin to support jdk8
- * STORM-599: Use nimbus's cached heartbeats rather than fetching again from ZK
- * STORM-596: remove config topology.receiver.buffer.size
- * STORM-595: storm-hdfs can only work with sequence files that use Writables.
- * STORM-586: Trident kafka spout fails instead of updating offset when kafka offset is out of range.
- * STORM-585: Performance issue in none grouping
- * STORM-583: Add Microsoft Azure Event Hub spout implementations
- * STORM-578: Calls to submit-mocked-assignment in supervisor-test use invalid executor-id format
- * STORM-577: long time launch worker will block supervisor heartbeat
- * STORM-575: Ability to specify Jetty host to bind to
- * STORM-572: Storm UI 'favicon.ico'
- * STORM-572: Allow Users to pass TEST-TIMEOUT-MS for java
- * STORM-571: upgrade clj-time.
- * STORM-570: Switch from tablesorter to datatables jquery plugin.
- * STORM-569: Add Conf for bolt's outgoing overflow-buffer.
- * STORM-567: Move Storm Documentation/Website from SVN to git
- * STORM-565: Fix NPE when topology.groups is null.
- * STORM-563: Kafka Spout doesn't pick up from the beginning of the queue unless forceFromStart specified.
- * STORM-561: Add flux as an external module
- * STORM-557: High Quality Images for presentations
- * STORM-554: the type of first param "topology" should be ^StormTopology not ^TopologyContext
- * STORM-552: Add netty socket backlog config
- * STORM-548: Receive Thread Shutdown hook should connect to local hostname but not Localhost
- * STORM-541: Build produces maven warnings
- * STORM-539: Storm Hive Connector.
- * STORM-533: Add in client and server IConnection metrics.
- * STORM-527: update worker.clj -- delete "missing-tasks" checking
- * STORM-525: Add time sorting function to the 2nd col of bolt exec table
- * STORM-512: KafkaBolt doesn't handle ticks properly
- * STORM-505: Fix debug string construction
- * STORM-495: KafkaSpout retries with exponential backoff
- * STORM-487: Remove storm.cmd, no need to duplicate work python runs on windows too.
- * STORM-483: provide dedicated directories for classpath extension
- * STORM-456: Storm UI: cannot navigate to topology page when name contains spaces.
- * STORM-446: Allow superusers to impersonate other users in secure mode.
- * STORM-444: Add AutoHDFS like credential fetching for HBase
- * STORM-442: multilang ShellBolt/ShellSpout die() can be hang when Exception happened
- * STORM-441: Remove bootstrap macro from Clojure codebase
- * STORM-410: Add groups support to log-viewer
- * STORM-400: Thrift upgrade to thrift-0.9.2
- * STORM-329: fix cascading Storm failure by improving reconnection strategy and buffering messages (thanks tedxia)
- * STORM-322: Windows script do not handle spaces in JAVA_HOME path
- * STORM-248: cluster.xml location is hardcoded for workers
- * STORM-243: Record version and revision information in builds
- * STORM-188: Allow user to specifiy full configuration path when running storm command
- * STORM-130: Supervisor getting killed due to java.io.FileNotFoundException: File '../stormconf.ser' does not exist.
-
-## 0.9.6
- * STORM-996: netty-unit-tests/test-batch demonstrates out-of-order delivery
- * STORM-1056: allow supervisor log filename to be configurable via ENV variable
- * STORM-1051: Netty Client.java's flushMessages produces a NullPointerException
- * STORM-763: nimbus reassigned worker A to another machine, but other worker's netty client can't connect to the new worker A
- * STORM-935: Update Disruptor queue version to 2.10.4
- * STORM-503: Short disruptor queue wait time leads to high CPU usage when idle
- * STORM-728: Put emitted and transferred stats under correct columns
- * STORM-643: KafkaUtils repeatedly fetches messages whose offset is out of range
- * STORM-933: NullPointerException during KafkaSpout deactivation
-
-## 0.9.5
- * STORM-790: Log "task is null" instead of let worker died when task is null in transfer-fn
- * STORM-796: Add support for "error" command in ShellSpout
- * STORM-745: fix storm.cmd to evaluate 'shift' correctly with 'storm jar'
- * STORM-130: Supervisor getting killed due to java.io.FileNotFoundException: File '../stormconf.ser' does not exist.
-
-## 0.9.4
- * STORM-559: ZkHosts in README should use 2181 as port.
- * STORM-682: supervisor should handle worker state corruption gracefully.
- * STORM-693: when kafka bolt fails to write tuple, it should report error instead of silently acking.
- * STORM-329: fix cascading Storm failure by improving reconnection strategy and buffering messages
- * STORM-130: Supervisor getting killed due to java.io.FileNotFoundException: File '../stormconf.ser' does not exist.
-
-
-## 0.9.3-rc2
- * STORM-558: change "swap!" to "reset!" to fix assignment-versions in supervisor
- * STORM-555: Storm json response should set charset to UTF-8
- * STORM-513: check heartbeat from multilang subprocess
- * STORM-549: "topology.enable.message.timeouts" does nothing
- * STORM-546: Local hostname configuration ignored by executor
- * STORM-492: Test timeout should be configurable
- * STORM-540: Change default time format in logs to ISO8601 in order to include timezone
- * STORM-511: Storm-Kafka spout keeps sending fetch requests with invalid offset
- * STORM-538: Guava com.google.thirdparty.publicsuffix is not shaded
- * STORM-497: don't modify the netty server taskToQueueId mapping while the someone could be reading it.
- * STORM-537: A worker reconnects infinitely to another dead worker (Sergey Tryuber)
-
-## 0.9.3-rc1
- * STORM-519: add tuple as an input param to HBaseValueMapper 
- * STORM-488: Exit with 254 error code if storm CLI is run with unknown command
- * STORM-506: Do not count bolt acks & fails in total stats
- * STORM-490: fix build under Windows
- * STORM-439: Replace purl.js qith jquery URL plugin
- * STORM-499: Document and clean up shaded dependncy resolution with maven
- * STORM-210: Add storm-hbase module
- * STORM-507: Topology visualization should not block ui
- * STORM-504: Class used by `repl` command is deprecated.
- * STORM-330: Implement storm exponential backoff stategy for netty client and curator
- * STORM-461: exit-process! does not always exit the process, but throws an exception
- * STORM-341: fix assignment sorting
- * STORM-476: external/storm-kafka: avoid NPE on null message payloads
- * STORM-424: fix error message related to kafka offsets
- * STORM-454: correct documentation in STORM-UI-REST-API.md
- * STORM-474: Reformat UI HTML code
- * STORM-447: shade/relocate packages of dependencies that are common causes of dependency conflicts
- * STORM-279: cluster.xml doesn't take in STORM_LOG_DIR values.
- * STORM-380: Kafka spout: throw RuntimeException if a leader cannot be found for a partition
- * STORM-435: Improve storm-kafka documentation
- * STORM-405: Add kafka trident state so messages can be sent to kafka topic
- * STORM-211: Add module for HDFS integration
- * STORM-337: Expose managed spout ids publicly
- * STORM-320: Support STORM_CONF_DIR environment variable to support
- * STORM-360: Add node details for Error Topology and Component pages
- * STORM-54: Per-Topology Classpath and Environment for Workers
- * STORM-355: excluding outdated netty transitively included via curator
- * STORM-183: Replacing RunTime.halt() with RunTime.exit()
- * STORM-213: Decouple In-Process ZooKeeper from LocalCluster.
- * STORM-365: Add support for Python 3 to storm command.
- * STORM-332: Enable Kryo serialization in storm-kafka
- * STORM-370: Add check for empty table before sorting dom in UI
- * STORM-359: add logviewer paging and download
- * STORM-372: Typo in storm_env.ini
- * STORM-266: Adding shell process pid and name in the log message
- * STORM-367: Storm UI REST api documentation.
- * STORM-200: Proposal for Multilang's Metrics feature
- * STORM-351: multilang python process fall into endless loop
- * STORM-375: Smarter downloading of assignments by supervisors and workers
- * STORM-328: More restrictive Config checks, strict range check within Utils.getInt()
- * STORM-381: Replace broken jquery.tablesorter.min.js to latest
- * STORM-312: add storm monitor tools to monitor throughtput interactively
- * STORM-354: Testing: allow users to pass TEST-TIMEOUT-MS as param for complete-topology
- * STORM-254: one Spout/Bolt can register metric twice with same name in different timeBucket
- * STORM-403: heartbeats-to-nimbus in supervisor-test failed due to uninten...
- * STORM-402: FileNotFoundException when using storm with apache tika
- * STORM-364: The exception time display as default timezone.
- * STORM-420: Missing quotes in storm-starter python code
- * STORM-399: Kafka Spout defaulting to latest offset when current offset is older then 100k
- * STORM-421: Memoize local hostname lookup in executor
- * STORM-414: support logging level to multilang protocol spout and bolt
- * STORM-321: Added a tool to see the current status of STORM JIRA and github pulls.
- * STORM-415: validate-launched-once in supervisor-test can not handle multiple topologies
- * STORM-155: Storm rebalancing code causes multiple topologies assigned to a single port
- * STORM-419: Updated test so sort ordering is very explicit.
- * STORM-406: Fix for reconnect logic in netty client.
- * STORM-366: Add color span to most recent error and fix ui templates.
- * STORM-369: topology summary page displays wrong order.
- * STORM-239: Allow supervisor to operate in paths with spaces in them
- * STORM-87: fail fast on ShellBolt exception
- * STORM-417: Storm UI lost table sort style when tablesorter was updated
- * STORM-396: Replace NullPointerException with IllegalArgumentExeption
- * STORM-451: Latest storm does not build due to a pom.xml error in storm-hdfs pom.xml
- * STORM-453: migrated to curator 2.5.0
- * STORM-458: sample spout uses incorrect name when connecting bolt
- * STORM-455: Report error-level messages from ShellBolt children
- * STORM-443: multilang log's loglevel protocol can cause hang
- * STORM-449: Updated ShellBolt to not exit when shutting down.
- * STORM-464: Simulated time advanced after test cluster exits causes intermittent test failures
- * STORM-463: added static version of metrics helpers for Config
- * STORM-376: Add compression to serialization
- * STORM-437: Enforce utf-8 when multilang reads from stdin
- * STORM-361: Add JSON-P support to Storm UI API
- * STORM-373: Provide Additional String substitutions for *.worker.childopts
- * STORM-274: Add support for command remoteconfvalue in storm.cmd
- * STORM-132: sort supervisor by free slot in desending order
- * STORM-472: Improve error message for non-completeable testing spouts
- * STORM-401: handle InterruptedIOException properly.
- * STORM-461: exit-process! does not always exit the process, but throws an exception instead
- * STORM-475: Storm UI pages do not use UTF-8
- * STORM-336: Logback version should be upgraded
- * STORM-386: nodejs multilang protocol implementation and examples
- * STORM-500: Add Spinner when UI is loading stats from nimbus
- * STORM-501: Missing StormSubmitter API
- * STORM-493: Workers inherit storm.conf.file/storm.options properties of their supervisor
- * STORM-498: make ZK connection timeout configurable in Kafka spout
- * STORM-428: extracted ITuple interface
- * STORM-508: Update DEVELOPER.md now that Storm has graduated from Incubator
- * STORM-514: Update storm-starter README now that Storm has graduated from Incubator
-
-## 0.9.2-incubating
- * STORM-66: send taskid on initial handshake
- * STORM-342: Contention in Disruptor Queue which may cause out of order or lost messages
- * STORM-338: Move towards idiomatic Clojure style 
- * STORM-335: add drpc test for removing timed out requests from queue
- * STORM-69: Storm UI Visualizations for Topologies
- * STORM-297: Performance scaling with CPU
- * STORM-244: DRPC timeout can return null instead of throwing an exception
- * STORM-63: remove timeout drpc request from its function's request queue
- * STORM-313: Remove log-level-page from logviewer
- * STORM-205: Add REST API To Storm UI
- * STORM-326: tasks send duplicate metrics
- * STORM-331: Update the Kafka dependency of storm-kafka to 0.8.1.1
- * STORM-308: Add support for config_value to {supervisor,nimbus,ui,drpc,logviewer} childopts
- * STORM-309: storm-starter Readme: windows documentation update
- * STORM-318: update storm-kafka to use apache curator-2.4.0
- * STORM-303: storm-kafka reliability improvements
- * STORM-233: Removed inline heartbeat to nimbus to avoid workers being killed when under heavy ZK load
- * STORM-267: fix package name of LoggingMetricsConsumer in storm.yaml.example
- * STORM-265: upgrade to clojure 1.5.1
- * STORM-232: ship JNI dependencies with the topology jar
- * STORM-295: Add storm configuration to define JAVA_HOME
- * STORM-138: Pluggable serialization for multilang
- * STORM-264: Removes references to the deprecated topology.optimize
- * STORM-245: implement Stream.localOrShuffle() for trident
- * STORM-317: Add SECURITY.md to release binaries
- * STORM-310: Change Twitter authentication
- * STORM-305: Create developer documentation
- * STORM-280: storm unit tests are failing on windows
- * STORM-298: Logback file does not include full path for metrics appender fileNamePattern
- * STORM-316: added validation to registermetrics to have timebucketSizeInSecs >= 1
- * STORM-315: Added progress bar when submitting topology
- * STORM-214: Windows: storm.cmd does not properly handle multiple -c arguments
- * STORM-306: Add security documentation
- * STORM-302: Fix Indentation for pom.xml in storm-dist
- * STORM-235: Registering a null metric should blow up early
- * STORM-113: making thrift usage thread safe for local cluster
- * STORM-223: use safe parsing for reading YAML
- * STORM-238: LICENSE and NOTICE files are duplicated in storm-core jar
- * STORM-276: Add support for logviewer in storm.cmd.
- * STORM-286: Use URLEncoder#encode with the encoding specified.
- * STORM-296: Storm kafka unit tests are failing on windows
- * STORM-291: upgrade http-client to 4.3.3
- * STORM-252: Upgrade curator to latest version
- * STORM-294: Commas not escaped in command line
- * STORM-287: Fix the positioning of documentation strings in clojure code
- * STORM-290: Fix a log binding conflict caused by curator dependencies
- * STORM-289: Fix Trident DRPC memory leak
- * STORM-173: Treat command line "-c" option number config values as such
- * STORM-194: Support list of strings in *.worker.childopts, handle spaces
- * STORM-288: Fixes version spelling in pom.xml
- * STORM-208: Add storm-kafka as an external module
- * STORM-285: Fix storm-core shade plugin config
- * STORM-12: reduce thread usage of netty transport
- * STORM-281: fix and issue with config parsing that could lead to leaking file descriptors
- * STORM-196: When JVM_OPTS are set, storm jar fails to detect storm.jar from environment
- * STORM-260: Fix a potential race condition with simulated time in Storm's unit tests
- * STORM-258: Update commons-io version to 2.4
- * STORM-270: don't package .clj files in release jars.
- * STORM-273: Error while running storm topologies on Windows using "storm jar"
- * STROM-247: Replace links to github resources in storm script
- * STORM-263: Update Kryo version to 2.21+
- * STORM-187: Fix Netty error "java.lang.IllegalArgumentException: timeout value is negative"
- * STORM-186: fix float secs to millis long convertion
- * STORM-70: Upgrade to ZK-3.4.5 and curator-1.3.3
- * STORM-146: Unit test regression when storm is compiled with 3.4.5 zookeeper
-
-## 0.9.1-incubating
-* Fix to prevent Nimbus from hanging if random data is sent to nimbus thrift port
-* Improved support for running on Windows platforms
-* Removed dependency on the `unzip` binary
-* Switch build system from Leiningen to Maven
-* STORM-1: Replaced 0MQ as the default transport with Netty.
-* STORM-181: Nimbus now validates topology configuration when topologies are submitted (thanks d2r)
-* STORM-182: Storm UI now includes tooltips to document fields (thanks d2r)
-* STORM-195: `dependency-reduced-pom.xml` should be in `.gitignore`
-* STORM-13: Change license on README.md
-* STORM-2: Move all dependencies off of storm-specific builds
-* STORM-159: Upload separate source and javadoc jars for maven use
-* STORM-149: `storm jar` doesn't work on Windows
-
-## 0.9.0.1
-* Update build configuration to force compatibility with Java 1.6
-
-## 0.9.0
-* Fixed a netty client issue where sleep times for reconnection could be negative (thanks brndnmtthws)
-* Fixed an issue that would cause storm-netty unit tests to fail
-
-## 0.9.0-rc3
-* Added configuration to limit ShellBolt internal _pendingWrites queue length (thanks xiaokang)
-* Fixed a a netty client issue where sleep times for reconnection could be negative (thanks brndnmtthws)
-* Fixed a display issue with system stats in Storm UI (thanks d2r)
-* Nimbus now does worker heartbeat timeout checks as soon as heartbeats are updated (thanks d2r)
-* The logviewer now determines log file location by examining the logback configuration (thanks strongh)
-* Allow tick tuples to work with the system bolt (thanks xumingming)
-* Add default configuration values for the netty transport and the ability to configure the number of worker threads (thanks revans2)
-* Added timeout to unit tests to prevent a situation where tests would hang indefinitely (thanks d2r)
-* Fixed and issue in the system bolt where local mode would not be detected accurately (thanks miofthena)
-
-## 0.9.0-rc2 
-
-* Fixed `storm jar` command to work properly when STORM_JAR_JVM_OPTS is not specified (thanks roadkill001)
-
-## 0.9.0-rc1
-
- * All logging now done with slf4j
- * Replaced log4j logging system with logback
- * Logs are now limited to 1GB per worker (configurable via logging configuration file)
- * Build upgraded to leiningen 2.0
- * Revamped Trident spout interfaces to support more dynamic spouts, such as a spout who reads from a changing set of brokers
- * How tuples are serialized is now pluggable (thanks anfeng)
- * Added blowfish encryption based tuple serialization (thanks anfeng)
- * Have storm fall back to installed storm.yaml (thanks revans2)
- * Improve error message when Storm detects bundled storm.yaml to show the URL's for offending resources (thanks revans2)
- * Nimbus throws NotAliveException instead of FileNotFoundException from various query methods when topology is no longer alive (thanks revans2)
- * Escape HTML and Javascript appropriately in Storm UI (thanks d2r)
- * Storm's Zookeeper client now uses bounded exponential backoff strategy on failures
- * Automatically drain and log error stream of multilang subprocesses
- * Append component name to thread name of running executors so that logs are easier to read
- * Messaging system used for passing messages between workers is now pluggable (thanks anfeng)
- * Netty implementation of messaging (thanks anfeng)
- * Include topology id, worker port, and worker id in properties for worker processes, useful for logging (thanks d2r)
- * Tick tuples can now be scheduled using floating point seconds (thanks tscurtu)
- * Added log viewer daemon and links from UI to logviewers (thanks xiaokang)
- * DRPC server childopts now configurable (thanks strongh)
- * Default number of ackers to number of workers, instead of just one (thanks lyogavin)
- * Validate that Storm configs are of proper types/format/structure (thanks d2r)
- * FixedBatchSpout will now replay batches appropriately on batch failure (thanks ptgoetz)
- * Can set JAR_JVM_OPTS env variable to add jvm options when calling 'storm jar' (thanks srmelody)
- * Throw error if batch id for transaction is behind the batch id in the opaque value (thanks mrflip)
- * Sort topologies by name in UI (thanks jaked)
- * Added LoggingMetricsConsumer to log all metrics to a file, by default not enabled (thanks mrflip)
- * Add prepare(Map conf) method to TopologyValidator (thanks ankitoshniwal)
- * Bug fix: Supervisor provides full path to workers to logging config rather than relative path (thanks revans2) 
- * Bug fix: Call ReducerAggregator#init properly when used within persistentAggregate (thanks lorcan)
- * Bug fix: Set component-specific configs correctly for Trident spouts
-
-## 0.8.3 (unreleased)
-
- * Revert zmq layer to not rely on multipart messages to fix issue reported by some users
- * Bug fix: Fix TransactionalMap and OpaqueMap to correctly do multiple updates to the same key in the same batch
- * Bug fix: Fix race condition between supervisor and Nimbus that could lead to stormconf.ser errors and infinite crashing of supervisor
- * Bug fix: Fix default scheduler to always reassign workers in a constrained topology when there are dead executors
- * Bug fix: Fix memory leak in Trident LRUMemoryMapState due to concurrency issue with LRUMap (thanks jasonjckn)
- * Bug fix: Properly ignore NoNodeExists exceptions when deleting old transaction states
-
-## 0.8.2
-
- * Added backtype.storm.scheduler.IsolationScheduler. This lets you run topologies that are completely isolated at the machine level. Configure Nimbus to isolate certain topologies, and how many machines to give to each of those topologies, with the isolation.scheduler.machines config in Nimbus's storm.yaml. Topologies run on the cluster that are not listed there will share whatever remaining machines there are on the cluster after machines are allocated to the listed topologies.
- * Storm UI now uses nimbus.host to find Nimbus rather than always using localhost (thanks Frostman)
- * Added report-error! to Clojure DSL
- * Automatically throttle errors sent to Zookeeper/Storm UI when too many are reported in a time interval (all errors are still logged) Configured with TOPOLOGY_MAX_ERROR_REPORT_PER_INTERVAL and TOPOLOGY_ERROR_THROTTLE_INTERVAL_SECS
- * Kryo instance used for serialization can now be controlled via IKryoFactory interface and TOPOLOGY_KRYO_FACTORY config
- * Add ability to plug in custom code into Nimbus to allow/disallow topologies to be submitted via NIMBUS_TOPOLOGY_VALIDATOR config
- * Added TOPOLOGY_TRIDENT_BATCH_EMIT_INTERVAL_MILLIS config to control how often a batch can be emitted in a Trident topology. Defaults to 500 milliseconds. This is used to prevent too much load from being placed on Zookeeper in the case that batches are being processed super quickly.
- * Log any topology submissions errors in nimbus.log
- * Add static helpers in Config when using regular maps
- * Make Trident much more memory efficient during failures by immediately removing state for failed attempts when a more recent attempt is seen
- * Add ability to name portions of a Trident computation and have those names appear in the Storm UI
- * Show Nimbus and topology configurations through Storm UI (thanks rnfein)
- * Added ITupleCollection interface for TridentState's and TupleCollectionGet QueryFunction for getting the full contents of a state. MemoryMapState and LRUMemoryMapState implement this
- * Can now submit a topology in inactive state. Storm will wait to call open/prepare on the spouts/bolts until it is first activated.
- * Can now activate, deactive, rebalance, and kill topologies from the Storm UI (thanks Frostman)
- * Can now use --config option to override which yaml file from ~/.storm to use for the config (thanks tjun)
- * Redesigned the pluggable resource scheduler (INimbus, ISupervisor) interfaces to allow for much simpler integrations
- * Added prepare method to IScheduler
- * Added "throws Exception" to TestJob interface
- * Added reportError to multilang protocol and updated Python and Ruby adapters to use it (thanks Lazyshot)
- * Number tuples executed now tracked and shown in Storm UI
- * Added ReportedFailedException which causes a batch to fail without killing worker and reports the error to the UI
- * Execute latency now tracked and shown in Storm UI
- * Adding testTuple methods for easily creating Tuple instances to Testing API (thanks xumingming)
- * Trident now throws an error during construction of a topology when try to select fields that don't exist in a stream (thanks xumingming)
- * Compute the capacity of a bolt based on execute latency and #executed over last 10 minutes and display in UI
- * Storm UI displays exception instead of blank page when there's an error rendering the page (thanks Frostman)
- * Added MultiScheme interface (thanks sritchie)
- * Added MockTridentTuple for testing (thanks emblem)
- * Add whitelist methods to Cluster to allow only a subset of hosts to be revealed as available slots
- * Updated Trident Debug filter to take in an identifier to use when logging (thanks emblem)
- * Number of DRPC server worker threads now customizable (thanks xiaokang)
- * DRPC server now uses a bounded queue for requests to prevent being overloaded with requests (thanks xiaokang)
- * Add __hash__ method to all generated Python Thrift objects so that Python code can read Nimbus stats which use Thrift objects as dict keys
- * Bug fix: Fix for bug that could cause topology to hang when ZMQ blocks sending to a worker that got reassigned
- * Bug fix: Fix deadlock bug due to variant of dining philosophers problem. Spouts now use an overflow buffer to prevent blocking and guarantee that it can consume the incoming queue of acks/fails.
- * Bug fix: Fix race condition in supervisor that would lead to supervisor continuously crashing due to not finding "stormconf.ser" file for an already killed topology
- * Bug fix: bin/storm script now displays a helpful error message when an invalid command is specified
- * Bug fix: fixed NPE when emitting during emit method of Aggregator
- * Bug fix: URLs with periods in them in Storm UI now route correctly
- * Bug fix: Fix occasional cascading worker crashes due when a worker dies due to not removing connections from connection cache appropriately
-  
-## 0.8.1
-
- * Exposed Storm's unit testing facilities via the backtype.storm.Testing class. Notable functions are Testing/withLocalCluster and Testing/completeTopology (thanks xumingming)
- * Implemented pluggable spout wait strategy that is invoked when a spout emits nothing from nextTuple or when a spout hits the MAX_SPOUT_PENDING limit
- * Spouts now have a default wait strategy of a 1 millisecond sleep
- * Changed log level of "Failed message" logging to DEBUG
- * Deprecated LinearDRPCTopologyBuilder, TimeCacheMap, and transactional topologies
- * During "storm jar", whether topology is already running or not is checked before submitting jar to save time (thanks jasonjckn)
- * Added BaseMultiReducer class to Trident that provides empty implementations of prepare and cleanup
- * Added Negate builtin operation to reverse a Filter
- * Added topology.kryo.decorators config that allows functions to be plugged in to customize Kryo (thanks jasonjckn)
- * Enable message timeouts when using LocalCluster
- * Multilang subprocesses can set "need_task_ids" to false when emitting tuples to tell Storm not to send task ids back (performance optimization) (thanks barrywhart)
- * Add contains method on Tuple (thanks okapies)
- * Added ISchemableSpout interface
- * Bug fix: When an item is consumed off an internal buffer, the entry on the buffer is nulled to allow GC to happen on that data
- * Bug fix: Helper class for Trident MapStates now clear their read cache when a new commit happens, preventing updates from spilling over from a failed batch attempt to the next attempt
- * Bug fix: Fix NonTransactionalMap to take in an IBackingMap for regular values rather than TransactionalValue (thanks sjoerdmulder)
- * Bug fix: Fix NPE when no input fields given for regular Aggregator
- * Bug fix: Fix IndexOutOfBoundsExceptions when a bolt for global aggregation had a parallelism greater than 1 (possible with splitting, stateQuerying, and multiReduce)
- * Bug fix: Fix "fields size" error that would sometimes occur when splitting a stream with multiple eaches
- * Bug fix: Fix bug where a committer spout (including opaque spouts) could cause Trident batches to fail
- * Bug fix: Fix Trident bug where multiple groupings on same stream would cause tuples to be duplicated to all consumers
- * Bug fix: Fixed error when repartitioning stream twice in a row without any operations in between
- * Bug fix: Fix rare bug in supervisor where it would continuously fail to clean up workers because the worker was already partially cleaned up
- * Bug fix: Fix emitDirect in storm.py
-
-## 0.8.0
-
- * Added Trident, the new high-level abstraction for intermixing high throughput, stateful stream processing with low-latency distributed querying
- * Added executor abstraction between workers and tasks. Workers = processes, executors = threads that run many tasks from the same spout or bolt.
- * Pluggable scheduler (thanks xumingming)
- * Eliminate explicit storage of task->component in Zookeeper
- * Number of workers can be dynamically changed at runtime through rebalance command and -n switch
- * Number of executors for a component can be dynamically changed at runtime through rebalance command and -e switch (multiple -e switches allowed)
- * Use worker heartbeats instead of task heartbeats (thanks xumingming)
- * UI performance for topologies with many executors/tasks much faster due to optimized usage of Zookeeper (10x improvement)
- * Added button to show/hide system stats (e.g., acker component and stream stats) from the Storm UI (thanks xumingming)
- * Stats are tracked on a per-executor basis instead of per-task basis
- * Major optimization for unreliable spouts and unanchored tuples (will use far less CPU)
- * Revamped internals of Storm to use LMAX disruptor for internal queuing. Dramatic reductions in contention and CPU usage.
- * Numerous micro-optimizations all throughout the codebase to reduce CPU usage.
- * Optimized internals of Storm to use much fewer threads - two fewer threads per spout and one fewer thread per acker.
- * Removed error method from task hooks (to be re-added at a later time)
- * Validate that subscriptions come from valid components and streams, and if it's a field grouping that the schema is correct (thanks xumingming)
- * MemoryTransactionalSpout now works in cluster mode
- * Only track errors on a component by component basis to reduce the amount stored in zookeeper (to speed up UI). A side effect of this change is the removal of the task page in the UI.
- * Add TOPOLOGY-TICK-TUPLE-FREQ-SECS config to have Storm automatically send "tick" tuples to a bolt's execute method coming from the __system component and __tick stream at the configured frequency. Meant to be used as a component-specific configuration.
- * Upgrade Kryo to v2.17
- * Tuple is now an interface and is much cleaner. The Clojure DSL helpers have been moved to TupleImpl
- * Added shared worker resources. Storm provides a shared ExecutorService thread pool by default. The number of threads in the pool can be configured with topology.worker.shared.thread.pool.size
- * Improve CustomStreamGrouping interface to make it more flexible by providing more information
- * Enhanced INimbus interface to allow for forced schedulers and better integration with global scheduler
- * Added assigned method to ISupervisor so it knows exactly what's running and not running
- * Custom serializers can now have one of four constructors: (), (Kryo), (Class), or (Kryo, Class)
- * Disallow ":", ".", and "\" from topology names
- * Errors in multilang subprocesses that go to stderr will be captured and logged to the worker logs (thanks vinodc)
- * Workers detect and warn for missing outbound connections from assignment, drop messages for which there's no outbound connection
- * Zookeeper connection timeout is now configurable (via storm.zookeeper.connection.timeout config)
- * Storm is now less aggressive about halting process when there are Zookeeper errors, preferring to wait until client calls return exceptions.
- * Can configure Zookeeper authentication for Storm's Zookeeper clients via "storm.zookeeper.auth.scheme" and "storm.zookeeper.auth.payload" configs
- * Supervisors only download code for topologies assigned to them
- * Include task id information in task hooks (thanks velvia)
- * Use execvp to spawn daemons (replaces the python launcher process) (thanks ept)
- * Expanded INimbus/ISupervisor interfaces to provide more information (used in Storm/Mesos integration)
- * Bug fix: Realize task ids when worker heartbeats to supervisor. Some users were hitting deserialization problems here in very rare cases (thanks herberteuler)
- * Bug fix: Fix bug where a topology's status would get corrupted to true if nimbus is restarted while status is rebalancing
-
-## 0.7.4
-
- * Bug fix: Disallow slashes in topology names since it causes Nimbus to break by affecting local filesystem and zookeeper paths
- * Bug fix: Prevent slow loading tasks from causing worker timeouts by launching the heartbeat thread before tasks are loaded
-
-## 0.7.3
-
- * Changed debug level of "Failed message" logging to DEBUG
- * Bug fix: Fixed critical regression in 0.7.2 that could cause workers to timeout to the supervisors or to Nimbus. 0.7.2 moved all system tasks to the same thread, so if one took a long time it would block the other critical tasks. Now different system tasks run on different threads.
-
-## 0.7.2
-
-NOTE: The change from 0.7.0 in which OutputCollector no longer assumes immutable inputs has been reverted to support optimized sending of tuples to colocated tasks
-
- * Messages sent to colocated tasks are sent in-memory, skipping serialization (useful in conjunction with localOrShuffle grouping) (thanks xumingming)
- * Upgrade to Clojure 1.4 (thanks sorenmacbeth)
- * Exposed INimbus and ISupervisor interfaces for running Storm on different resource frameworks (like Mesos).
- * Can override the hostname that supervisors report using "storm.local.hostname" config.
- * Make request timeout within DRPC server configurable via "drpc.request.timeout.secs"
- * Added "storm list" command to show running topologies at the command line (thanks xumingming)
- * Storm UI displays the release version (thanks xumingming)
- * Added reportError to BasicOutputCollector
- * Added reportError to BatchOutputCollector
- * Added close method to OpaqueTransactionalSpout coordinator
- * Added "storm dev-zookeeper" command for launching a local zookeeper server. Useful for testing a one node Storm cluster locally. Zookeeper dir configured with "dev.zookeeper.path"
- * Use new style classes for Python multilang adapter (thanks hellp)
- * Added "storm version" command
- * Heavily refactored and simplified the supervisor and worker code
- * Improved error message when duplicate config files found on classpath
- * Print the host and port of Nimbus when using the storm command line client
- * Include as much of currently read output as possible when pipe to subprocess is broken in multilang components
- * Lower supervisor worker start timeout to 120 seconds
- * More debug logging in supervisor
- * "nohup" no longer used by supervisor to launch workers (unnecessary)
- * Throw helpful error message if StormSubmitter used without using storm client script
- * Add Values class as a default serialization
- * Bug fix: give absolute piddir to subprocesses (so that relative paths can be used for storm local dir)
- * Bug fix: Fixed critical bug in transactional topologies where a batch would be considered successful even if the batch didn't finish
- * Bug fix: Fixed critical bug in opaque transactional topologies that would lead to duplicate messages when using pipelining
- * Bug fix: Workers will now die properly if a ShellBolt subprocess dies (thanks tomo)
- * Bug fix: Hide the BasicOutputCollector#getOutputter method, since it shouldn't be a publicly available method
- * Bug fix: Zookeeper in local mode now always gets an unused port. This will eliminate conflicts with other local mode processes or other Zookeeper instances on a local machine. (thanks xumingming)
- * Bug fix: Fixed NPE in CoordinatedBolt it tuples emitted, acked, or failed for a request id that has already timed out. (thanks xumingming)
- * Bug fix: UI no longer errors for topologies with no assigned tasks (thanks xumingming)
- * Bug fix: emitDirect on SpoutOutputCollector now works
- * Bug fix: Fixed NPE when giving null parallelism hint for spout in TransactionalTopologyBuilder (thanks xumingming)
-
-## 0.7.1
-
- * Implemented shell spout (thanks tomo)
- * Shell bolts can now asynchronously emit/ack messages (thanks tomo)
- * Added hooks for when a tuple is emitted, acked, or failed in bolts or spouts.
- * Added activate and deactivate lifecycle methods on spouts. Spouts start off deactivated.
- * Added isReady method to ITransactionalSpout$Coordinator to give the ability to delay the creation of new batches
- * Generalized CustomStreamGrouping to return the target tasks rather than the indices. Also parameterized custom groupings with TopologyContext. (not backwards compatible)
- * Added localOrShuffle grouping that will send to tasks in the same worker process if possible, or do a shuffle grouping otherwise.
- * Removed parameter from TopologyContext#maxTopologyMessageTimeout (simplification).
- * Storm now automatically sets TOPOLOGY_NAME in the config passed to the bolts and spouts to the name of the topology.
- * Added TOPOLOGY_AUTO_TASK_HOOKS config to automatically add hooks into every spout/bolt for the topology.
- * Added ability to override configs at the command line. These config definitions have the highest priority.
- * Error thrown if invalid (not json-serializable) topology conf used.
- * bin/storm script can now be symlinked (thanks gabrielgrant)
- * Socket timeout for DRPCClient is now configurable
- * Added getThisWorkerPort() method to TopologyContext
- * Added better error checking in Fields (thanks git2samus)
- * Improved Clojure DSL to allow destructuring in bolt/spout methods
- * Added Nimbus stats methods to LocalCluster (thanks KasperMadsen)
- * Added rebalance, activate, deactivate, and killTopologyWithOpts methods to LocalCluster
- * Added custom stream groupings to LinearDRPC API
- * Simplify multilang protocol to use json for all messages (thanks tomoj)
- * Bug fix: Fixed string encoding in ShellBolt protocol to be UTF-8 (thanks nicoo)
- * Bug fix: Fixed race condition in FeederSpout that could lead to dropped messages
- * Bug fix: Quoted arguments with spaces now work properly with storm client script
- * Bug fix: Workers start properly when topology name has spaces
- * Bug fix: UI works properly when there are spaces in topology or spout/bolt names (thanks xiaokang)
- * Bug fix: Tuple$Seq now returns correct count (thanks travisfw)
-
-## 0.7.0
-
- * Transactional topologies: a new higher level abstraction that enables exactly-once messaging semantics for most computations. Documented on the wiki.
- * Component-specific configurations: Can now set configurations on a per-spout or per-bolt basis. 
- * New batch bolt abstraction that simplifies the processing of batches in DRPC or transactional topologies. A new batch bolt is created per batch and they are automatically cleaned up.
- * Introduction of base classes for various bolt and spout types. These base classes are in the backtype.storm.topology.base package and provide empty implementations for commonly unused methods
- * CoordinatedBolt generalized to handle non-linear topologies. This will make it easy to implement a non-linear DRPC topology abstraction.
- * Can customize the JVM options for Storm UI with new ui.childopts config
- * BigIntegers are now serializable by default
- * All bolts/spouts now emit a system stream (id "__system"). Currently it only emits startup events, but may emit other events in the future.
- * Optimized tuple trees for batch processing in DRPC and transactional topologies. Only the coordination tuples are anchored. OutputCollector#fail still works because CoordinatedBolt will propagate the fail to all other tuples in the batch. 
- * CoordinatedBolt moved to backtype.storm.coordination package
- * Clojure test framework significantly more composable
- * Massive internal refactorings and simplifications, including changes to the Thrift definition for storm topologies.
- * Optimized acking system. Bolts with zero or more than one consumer used to send an additional ack message. Now those are no longer sent.
- * Changed interface of CustomStreamGrouping to receive a List<Object> rather than a Tuple.
- * Added "storm.zookeeper.retry.times" and "storm.zookeeper.retry.interval" configs (thanks killme2008)
- * Added "storm help" and "storm help {cmd}" to storm script (thanks kachayev)
- * Logging now always goes to logs/ in the Storm directory, regardless of where you launched the daemon (thanks haitaoyao)
- * Improved Clojure DSL: can emit maps and Tuples implement the appropriate interfaces to integrate with Clojure's seq functions (thanks schleyfox)
- * Added "ui.childopts" config (thanks ddillinger)
- * Bug fix: OutputCollector no longer assumes immutable inputs [NOTE: this was reverted in 0.7.2 because it conflicts with sending tuples to colocated tasks without serialization]
- * Bug fix: DRPC topologies now throw a proper error when no DRPC servers are configured instead of NPE (thanks danharvey)
- * Bug fix: Fix local mode so multiple topologies can be run on one LocalCluster
- * Bug fix: "storm supervisor" now uses supervisor.childopts instead of nimbus.childopts (thanks ddillinger)
- * Bug fix: supervisor.childopts and nimbus.childopts can now contain whitespace. Previously only the first token was taken from the string
- * Bug fix: Make TopologyContext "getThisTaskIndex" and "getComponentTasks" consistent
- * Bug fix: Fix NoNodeException that would pop up with task heartbeating under heavy load
- * Bug fix: Catch InterruptedExceptions appropriately in local mode so shutdown always works properly
-
-## 0.6.2
-
- * Automatically delete old files in Nimbus's inbox. Configurable with "nimbus.cleanup.inbox.freq.secs" and "nimbus.inbox.jar.expiration.secs"
- * Redirect System.out and System.err to log4j
- * Added "topology.worker.child.opts" config, for topology-configurable worker options.
- * Use Netflix's Curator library for Zookeeper communication. Workers now reconnect to Zookeeper rather than crash when there's a disconnection.
- * Bug fix: DRPC server no longer hangs with too many concurrent requests. DPRC server now requires two ports: "drpc.port" and "drpc.invocations.port"
- * Bug fix: Multilang resources are now extracted from the relevant jar on the classpath when appropriate. Previously an error would be thrown if the resources/ dir was in a jar in local mode.
- * Bug fix: Fix race condition in unit testing where time simulation fails to detect that Storm cluster is waiting due to threads that are not alive
- * Bug fix: Fix deadlock in Nimbus that could be triggered by a kill command.
-
-## 0.6.1
-
- * storm client "activate" and "deactivate" commands
- * storm client "rebalance" command
- * Nimbus will automatically detect and cleanup corrupt topologies (this would previously give an error of the form "file storm...ser cannot be found").
- * "storm" client will not run unless it's being used from a release. 
- * Topology jar path now passed in using a java property rather than an environment variable.
- * LD\_LIBRARY\_PATH environment variable is now set on worker processes appropriately.
- * Replaced jvyaml with snakeyaml. UTF-8 YAML files should now work properly. 
- * Upgraded httpclient, httpcore, and commons-codec dependencies.
-
-## 0.6.0
-
- * New serialization system based on Kryo
- * Component and stream ids are now strings
- * Pluggable stream groupings
- * Storm now chooses an unused port for Zookeeper in local mode instead of crashing when 2181 was in use.
- * Better support for defining topologies in non-JVM languages. The Thrift structure for topologies now allows you to specify components using a Java class name and a list of arguments to that class's constructor.
- * Bug fix: errors during the preparation phase of spouts or bolts will be reported to the Storm UI 
- * Bug fix: Fixed bugs related to LinearDRPC topologies where the last bolt implements FinishedCallback 
- * Bug fix: String greater than 64K will now serialize properly 
- * Generalized type of anchors in OutputCollector methods to Collection from List. 
- * Improved logging throughout.
- * In the "worker.childopts" config, %ID% will be replaced by the worker port. 
- * Significant internal refactorings to clean up the codebase. 
-
-## 0.5.4
-
- * LinearDRPCTopologyBuilder, a polished DRPC implementation, 
- * Improved custom serialization support. no longer need to provide "token" ids. 
- * Fallback on Java serialization by default. Can be turned off by setting "topology.fall.back.on.java.serialization" to false. 
- * Improved "storm kill" command. Can override the wait time with "-w" flag.
- * Display topology status in Storm UI
- * Changed Thrift namespace to avoid conflicts
- * Better error messages throughout
- * Storm UI port is configurable through "ui.port" 
- * Minor improvements to Clojure DSL 
-
-## 0.5.3
-
- * Nimbus and supervisor daemons can now share a local dir. 
- * Greatly improved Clojure DSL for creating topologies.
- * Increased the default timeouts for startup of workers and tasks.
- * Added the commands "localconfvalue", "remoteconfvalue", and "repl" to the storm script.
- * Better error message when "storm jar" can't find the nimbus host in the configuration. 
-
-## 0.5.2
-
- * No longer need any native dependencies to run Storm in local mode. Storm now uses a pure Java messaging system in local mode
- * Fixed logging configurations so that logging is no longer suppressed when including the Storm release jars on the classpath in local mode. 
-
-## 0.5.1
-
- * Changed ISerialization's "accept" interface to not annotate the Class with the generic type
- * Made Config class implement Map and added helper methods for setting common configs
- 
-## 0.5.0
- 
- * Initial release!
+ * STORM-786: KafkaBolt shoul
\ No newline at end of file


[28/35] storm git commit: [STORM-1575] fix TwitterSampleSpout NPE on close

Posted by pt...@apache.org.
[STORM-1575] fix TwitterSampleSpout NPE on close

Signed-off-by: P. Taylor Goetz <pt...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e0fe1c3d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e0fe1c3d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e0fe1c3d

Branch: refs/heads/1.0.x-branch
Commit: e0fe1c3d3b3de68a84e74f306882c1cc1e5c7047
Parents: c4c54e3
Author: manuzhang <ow...@gmail.com>
Authored: Thu Feb 25 15:07:12 2016 +0800
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:44:12 2016 -0400

----------------------------------------------------------------------
 .../apache/storm/starter/spout/TwitterSampleSpout.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/e0fe1c3d/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/TwitterSampleSpout.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/TwitterSampleSpout.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/TwitterSampleSpout.java
index df26d25..e8a2c05 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/TwitterSampleSpout.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/spout/TwitterSampleSpout.java
@@ -103,24 +103,24 @@ public class TwitterSampleSpout extends BaseRichSpout {
 
 		};
 
-		TwitterStream twitterStream = new TwitterStreamFactory(
+		_twitterStream = new TwitterStreamFactory(
 				new ConfigurationBuilder().setJSONStoreEnabled(true).build())
 				.getInstance();
 
-		twitterStream.addListener(listener);
-		twitterStream.setOAuthConsumer(consumerKey, consumerSecret);
+		_twitterStream.addListener(listener);
+		_twitterStream.setOAuthConsumer(consumerKey, consumerSecret);
 		AccessToken token = new AccessToken(accessToken, accessTokenSecret);
-		twitterStream.setOAuthAccessToken(token);
+		_twitterStream.setOAuthAccessToken(token);
 		
 		if (keyWords.length == 0) {
 
-			twitterStream.sample();
+			_twitterStream.sample();
 		}
 
 		else {
 
 			FilterQuery query = new FilterQuery().track(keyWords);
-			twitterStream.filter(query);
+			_twitterStream.filter(query);
 		}
 
 	}


[31/35] storm git commit: add STORM-1884 to changelog

Posted by pt...@apache.org.
add STORM-1884 to changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a52e83b8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a52e83b8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a52e83b8

Branch: refs/heads/master
Commit: a52e83b833b14f03cb7c742043ba2d0a2933f267
Parents: 2507b0b
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 16:50:38 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:50:38 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/a52e83b8/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eddea8a..f194cee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 2.0.0
+ * STORM-1884: Prioritize pendingPrepare over pendingCommit
  * STORM-1575: fix TwitterSampleSpout NPE on close
  * STORM-1874: Update logger private permissions
  * STORM-1865: update command line client document


[13/35] storm git commit: add STORM-1865 to changelog

Posted by pt...@apache.org.
add STORM-1865 to changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/acbee1d1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/acbee1d1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/acbee1d1

Branch: refs/heads/master
Commit: acbee1d1e4f19758d849259eaf87281a95919ace
Parents: fd35ad6
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 16:08:22 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:08:22 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/acbee1d1/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3573e4..884837a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 2.0.0
+ * STORM-1865: update command line client document
  * STORM-1771. HiveState should flushAndClose before closing old or idle Hive connections
  * STORM-1882: Expose TextFileReader public
  * STORM-1873: Implement alternative behaviour for late tuples


[16/35] storm git commit: STORM-1865: update command line client document

Posted by pt...@apache.org.
STORM-1865: update command line client document

Signed-off-by: P. Taylor Goetz <pt...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f3046d41
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f3046d41
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f3046d41

Branch: refs/heads/1.0.x-branch
Commit: f3046d411fb5ccab555679fd79e31cdcad83f9d4
Parents: 2bc5248
Author: Xin Wang <be...@163.com>
Authored: Wed Jun 8 12:50:46 2016 +0800
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:09:42 2016 -0400

----------------------------------------------------------------------
 docs/Command-line-client.md | 163 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 163 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/f3046d41/docs/Command-line-client.md
----------------------------------------------------------------------
diff --git a/docs/Command-line-client.md b/docs/Command-line-client.md
index e97b49c..05e981b 100644
--- a/docs/Command-line-client.md
+++ b/docs/Command-line-client.md
@@ -20,6 +20,22 @@ These commands are:
 1. supervisor
 1. ui
 1. drpc
+1. blobstore
+1. dev-zookeeper
+1. get-errors
+1. heartbeats
+1. kill_workers
+1. list
+1. logviewer
+1. monitor
+1. node-health-check
+1. pacemaker
+1. set_log_level
+1. shell
+1. sql
+1. upload-credentials
+1. version
+1. help
 
 ### jar
 
@@ -102,3 +118,150 @@ Launches the UI daemon. The UI provides a web interface for a Storm cluster and
 Syntax: `storm drpc`
 
 Launches a DRPC daemon. This command should be run under supervision with a tool like [daemontools](http://cr.yp.to/daemontools.html) or [monit](http://mmonit.com/monit/). See [Distributed RPC](Distributed-RPC.html) for more information.
+
+### blobstore
+
+Syntax: `storm blobstore cmd`
+
+list [KEY...] - lists blobs currently in the blob store
+
+cat [-f FILE] KEY - read a blob and then either write it to a file, or STDOUT (requires read access).
+
+create [-f FILE] [-a ACL ...] [--replication-factor NUMBER] KEY - create a new blob. Contents comes from a FILE or STDIN. ACL is in the form [uo]:[username]:[r-][w-][a-] can be comma separated list.
+
+update [-f FILE] KEY - update the contents of a blob.  Contents comes from a FILE or STDIN (requires write access).
+
+delete KEY - delete an entry from the blob store (requires write access).
+
+set-acl [-s ACL] KEY - ACL is in the form [uo]:[username]:[r-][w-][a-] can be comma separated list (requires admin access).
+
+replication --read KEY - Used to read the replication factor of the blob.
+
+replication --update --replication-factor NUMBER KEY where NUMBER > 0. It is used to update the replication factor of a blob.
+
+For example, the following would create a mytopo:data.tgz key using the data stored in data.tgz.  User alice would have full access, bob would have read/write access and everyone else would have read access.
+
+storm blobstore create mytopo:data.tgz -f data.tgz -a u:alice:rwa,u:bob:rw,o::r
+
+### dev-zookeeper
+
+Syntax: `storm dev-zookeeper`
+
+Launches a fresh Zookeeper server using "dev.zookeeper.path" as its local dir and "storm.zookeeper.port" as its port. This is only intended for development/testing, the Zookeeper instance launched is not configured to be used in production.
+
+### get-errors
+
+Syntax: `storm get-errors topology-name`
+
+Get the latest error from the running topology. The returned result contains the key value pairs for component-name and component-error for the components in error. The result is returned in json format.
+
+### heartbeats
+
+Syntax: `storm heartbeats [cmd]`
+
+list PATH - lists heartbeats nodes under PATH currently in the ClusterState.
+get  PATH - Get the heartbeat data at PATH
+
+### kill_workers
+
+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 mode, then user needs to have admin rights on the node to be able to successfully kill all workers.
+
+### list
+
+Syntax: `storm list`
+
+List the running topologies and their statuses.
+
+### logviewer
+
+Syntax: `storm logviewer`
+
+Launches the log viewer daemon. It provides a web interface for viewing storm log files. This command should be run under supervision with a tool like daemontools or monit.
+
+See Setting up a Storm cluster for more information.(http://storm.apache.org/documentation/Setting-up-a-Storm-cluster)
+
+### monitor
+
+Syntax: `storm monitor topology-name [-i interval-secs] [-m component-id] [-s stream-id] [-w [emitted | transferred]]`
+
+Monitor given topology's throughput interactively.
+One can specify poll-interval, component-id, stream-id, watch-item[emitted | transferred]
+  By default,
+    poll-interval is 4 seconds;
+    all component-ids will be list;
+    stream-id is 'default';
+    watch-item is 'emitted';
+
+### node-health-check
+
+Syntax: `storm node-health-check`
+
+Run health checks on the local supervisor.
+
+### pacemaker
+
+Syntax: `storm pacemaker`
+
+Launches the Pacemaker daemon. This command should be run under
+supervision with a tool like daemontools or monit.
+
+See Setting up a Storm cluster for more information.(http://storm.apache.org/documentation/Setting-up-a-Storm-cluster)
+
+### set_log_level
+
+Syntax: `storm set_log_level -l [logger name]=[log level][:optional timeout] -r [logger name] topology-name`
+
+Dynamically change topology log levels
+    
+where log level is one of: ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF
+and timeout is integer seconds.
+
+e.g.
+  ./bin/storm set_log_level -l ROOT=DEBUG:30 topology-name
+
+  Set the root logger's level to DEBUG for 30 seconds
+
+  ./bin/storm set_log_level -l com.myapp=WARN topology-name
+
+  Set the com.myapp logger's level to WARN for 30 seconds
+
+  ./bin/storm set_log_level -l com.myapp=WARN -l com.myOtherLogger=ERROR:123 topology-name
+
+  Set the com.myapp logger's level to WARN indifinitely, and com.myOtherLogger to ERROR for 123 seconds
+
+  ./bin/storm set_log_level -r com.myOtherLogger topology-name
+
+  Clears settings, resetting back to the original level
+
+### shell
+
+Syntax: `storm shell resourcesdir command args`
+
+Makes constructing jar and uploading to nimbus for using non JVM languages
+
+eg: `storm shell resources/ python topology.py arg1 arg2`
+
+### sql
+
+Syntax: `storm sql sql-file topology-name`
+
+Compiles the SQL statements into a Trident topology and submits it to Storm.
+
+### upload-credentials
+
+Syntax: `storm upload_credentials topology-name [credkey credvalue]*`
+
+Uploads a new set of credentials to a running topology
+
+### version
+
+Syntax: `storm version`
+
+Prints the version number of this Storm release.
+
+### help
+Syntax: `storm help [command]`
+
+Print one help message or list of available commands


[32/35] storm git commit: Fix STORM-1884

Posted by pt...@apache.org.
Fix STORM-1884

Signed-off-by: P. Taylor Goetz <pt...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5cccb910
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5cccb910
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5cccb910

Branch: refs/heads/1.x-branch
Commit: 5cccb9102a2000cacd1ff790ce9dc775acd78540
Parents: 48eb428
Author: Balazs Kossovics <ba...@s4m.io>
Authored: Mon Jun 6 17:04:27 2016 +0200
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:51:49 2016 -0400

----------------------------------------------------------------------
 .../java/org/apache/storm/redis/state/RedisKeyValueState.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/5cccb910/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java
----------------------------------------------------------------------
diff --git a/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java b/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java
index 6071757..6d690d4 100644
--- a/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java
+++ b/external/storm-redis/src/main/java/org/apache/storm/redis/state/RedisKeyValueState.java
@@ -161,7 +161,11 @@ public class RedisKeyValueState<K, V> implements KeyValueState<K, V> {
             commands = jedisContainer.getInstance();
             if (commands.exists(prepareNamespace)) {
                 LOG.debug("Prepared txn already exists, will merge", txid);
-                pendingPrepare.putAll(pendingCommit);
+                for (Map.Entry<String, String> e: pendingCommit.entrySet()) {
+                    if (!pendingPrepare.containsKey(e.getKey())) {
+                        pendingPrepare.put(e.getKey(), e.getValue());
+                    }
+                }
             }
             if (!pendingPrepare.isEmpty()) {
                 commands.hmset(prepareNamespace, pendingPrepare);


[07/35] storm git commit: add STORM-1771 to changelog

Posted by pt...@apache.org.
add STORM-1771 to changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e11f0462
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e11f0462
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e11f0462

Branch: refs/heads/1.x-branch
Commit: e11f0462e112dcef23e765c799d8cd5a028bb158
Parents: 674c923
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 16:00:27 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:00:27 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/e11f0462/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d01d3ce..0fe4fb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.1.0
+ * STORM-1771: HiveState should flushAndClose before closing old or idle Hive connections
  * STORM-1882: Expose TextFileReader public
  * STORM-1873: Implement alternative behaviour for late tuples
  * STORM-1719: Introduce REST API: Topology metric stats for stream


[27/35] storm git commit: add STORM-1575 to changelog

Posted by pt...@apache.org.
add STORM-1575 to changelog


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/48eb4284
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/48eb4284
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/48eb4284

Branch: refs/heads/1.x-branch
Commit: 48eb4284754b20e9837cc7b3d25bd5845e346d05
Parents: 12ba18b
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 16:44:00 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:44:00 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/48eb4284/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 361c548..33bdec2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 1.1.0
+ * STORM-1575: fix TwitterSampleSpout NPE on close
  * STORM-1874: Update logger private permissions
  * STORM-1865: update command line client document
  * STORM-1771: HiveState should flushAndClose before closing old or idle Hive connections


[18/35] storm git commit: Merge branch 'STORM-1874' of github.com:darionyaphet/storm

Posted by pt...@apache.org.
Merge branch 'STORM-1874' of github.com:darionyaphet/storm


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1d9c0bed
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1d9c0bed
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1d9c0bed

Branch: refs/heads/master
Commit: 1d9c0bedd9c6a5b47264845e2708a245137311a7
Parents: acbee1d d0162b7
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu Jun 9 16:15:27 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:15:27 2016 -0400

----------------------------------------------------------------------
 .../src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java       | 2 +-
 .../jvm/org/apache/storm/kafka/DynamicPartitionConnections.java    | 2 +-
 .../storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java     | 2 +-
 .../storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java     | 2 +-
 .../src/jvm/org/apache/storm/kafka/PartitionManager.java           | 2 +-
 .../storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java  | 2 +-
 external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java   | 2 +-
 .../jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java    | 2 +-
 .../src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------



[14/35] storm git commit: STORM-1865: update command line client document

Posted by pt...@apache.org.
STORM-1865: update command line client document

Signed-off-by: P. Taylor Goetz <pt...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0b9472c8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0b9472c8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0b9472c8

Branch: refs/heads/1.x-branch
Commit: 0b9472c867085f01355abcdcf1f1b68080ea983b
Parents: e11f046
Author: Xin Wang <be...@163.com>
Authored: Wed Jun 8 12:50:46 2016 +0800
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu Jun 9 16:09:01 2016 -0400

----------------------------------------------------------------------
 docs/Command-line-client.md | 163 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 163 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/0b9472c8/docs/Command-line-client.md
----------------------------------------------------------------------
diff --git a/docs/Command-line-client.md b/docs/Command-line-client.md
index e97b49c..05e981b 100644
--- a/docs/Command-line-client.md
+++ b/docs/Command-line-client.md
@@ -20,6 +20,22 @@ These commands are:
 1. supervisor
 1. ui
 1. drpc
+1. blobstore
+1. dev-zookeeper
+1. get-errors
+1. heartbeats
+1. kill_workers
+1. list
+1. logviewer
+1. monitor
+1. node-health-check
+1. pacemaker
+1. set_log_level
+1. shell
+1. sql
+1. upload-credentials
+1. version
+1. help
 
 ### jar
 
@@ -102,3 +118,150 @@ Launches the UI daemon. The UI provides a web interface for a Storm cluster and
 Syntax: `storm drpc`
 
 Launches a DRPC daemon. This command should be run under supervision with a tool like [daemontools](http://cr.yp.to/daemontools.html) or [monit](http://mmonit.com/monit/). See [Distributed RPC](Distributed-RPC.html) for more information.
+
+### blobstore
+
+Syntax: `storm blobstore cmd`
+
+list [KEY...] - lists blobs currently in the blob store
+
+cat [-f FILE] KEY - read a blob and then either write it to a file, or STDOUT (requires read access).
+
+create [-f FILE] [-a ACL ...] [--replication-factor NUMBER] KEY - create a new blob. Contents comes from a FILE or STDIN. ACL is in the form [uo]:[username]:[r-][w-][a-] can be comma separated list.
+
+update [-f FILE] KEY - update the contents of a blob.  Contents comes from a FILE or STDIN (requires write access).
+
+delete KEY - delete an entry from the blob store (requires write access).
+
+set-acl [-s ACL] KEY - ACL is in the form [uo]:[username]:[r-][w-][a-] can be comma separated list (requires admin access).
+
+replication --read KEY - Used to read the replication factor of the blob.
+
+replication --update --replication-factor NUMBER KEY where NUMBER > 0. It is used to update the replication factor of a blob.
+
+For example, the following would create a mytopo:data.tgz key using the data stored in data.tgz.  User alice would have full access, bob would have read/write access and everyone else would have read access.
+
+storm blobstore create mytopo:data.tgz -f data.tgz -a u:alice:rwa,u:bob:rw,o::r
+
+### dev-zookeeper
+
+Syntax: `storm dev-zookeeper`
+
+Launches a fresh Zookeeper server using "dev.zookeeper.path" as its local dir and "storm.zookeeper.port" as its port. This is only intended for development/testing, the Zookeeper instance launched is not configured to be used in production.
+
+### get-errors
+
+Syntax: `storm get-errors topology-name`
+
+Get the latest error from the running topology. The returned result contains the key value pairs for component-name and component-error for the components in error. The result is returned in json format.
+
+### heartbeats
+
+Syntax: `storm heartbeats [cmd]`
+
+list PATH - lists heartbeats nodes under PATH currently in the ClusterState.
+get  PATH - Get the heartbeat data at PATH
+
+### kill_workers
+
+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 mode, then user needs to have admin rights on the node to be able to successfully kill all workers.
+
+### list
+
+Syntax: `storm list`
+
+List the running topologies and their statuses.
+
+### logviewer
+
+Syntax: `storm logviewer`
+
+Launches the log viewer daemon. It provides a web interface for viewing storm log files. This command should be run under supervision with a tool like daemontools or monit.
+
+See Setting up a Storm cluster for more information.(http://storm.apache.org/documentation/Setting-up-a-Storm-cluster)
+
+### monitor
+
+Syntax: `storm monitor topology-name [-i interval-secs] [-m component-id] [-s stream-id] [-w [emitted | transferred]]`
+
+Monitor given topology's throughput interactively.
+One can specify poll-interval, component-id, stream-id, watch-item[emitted | transferred]
+  By default,
+    poll-interval is 4 seconds;
+    all component-ids will be list;
+    stream-id is 'default';
+    watch-item is 'emitted';
+
+### node-health-check
+
+Syntax: `storm node-health-check`
+
+Run health checks on the local supervisor.
+
+### pacemaker
+
+Syntax: `storm pacemaker`
+
+Launches the Pacemaker daemon. This command should be run under
+supervision with a tool like daemontools or monit.
+
+See Setting up a Storm cluster for more information.(http://storm.apache.org/documentation/Setting-up-a-Storm-cluster)
+
+### set_log_level
+
+Syntax: `storm set_log_level -l [logger name]=[log level][:optional timeout] -r [logger name] topology-name`
+
+Dynamically change topology log levels
+    
+where log level is one of: ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF
+and timeout is integer seconds.
+
+e.g.
+  ./bin/storm set_log_level -l ROOT=DEBUG:30 topology-name
+
+  Set the root logger's level to DEBUG for 30 seconds
+
+  ./bin/storm set_log_level -l com.myapp=WARN topology-name
+
+  Set the com.myapp logger's level to WARN for 30 seconds
+
+  ./bin/storm set_log_level -l com.myapp=WARN -l com.myOtherLogger=ERROR:123 topology-name
+
+  Set the com.myapp logger's level to WARN indifinitely, and com.myOtherLogger to ERROR for 123 seconds
+
+  ./bin/storm set_log_level -r com.myOtherLogger topology-name
+
+  Clears settings, resetting back to the original level
+
+### shell
+
+Syntax: `storm shell resourcesdir command args`
+
+Makes constructing jar and uploading to nimbus for using non JVM languages
+
+eg: `storm shell resources/ python topology.py arg1 arg2`
+
+### sql
+
+Syntax: `storm sql sql-file topology-name`
+
+Compiles the SQL statements into a Trident topology and submits it to Storm.
+
+### upload-credentials
+
+Syntax: `storm upload_credentials topology-name [credkey credvalue]*`
+
+Uploads a new set of credentials to a running topology
+
+### version
+
+Syntax: `storm version`
+
+Prints the version number of this Storm release.
+
+### help
+Syntax: `storm help [command]`
+
+Print one help message or list of available commands