[2/3] storm git commit: Merge branch 'STORM-1520-1.x' into 1.x-branch
Merge branch 'STORM-1520-1.x' 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/d8d8e696 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d8d8e696 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d8d8e696 Branch: refs/heads/1.x-branch Commit: d8d8e696b539597dd0b5be82dff5e89643181c0e Parents: 0164e52 ed4a55f Author: Jungtaek Lim Authored: Tue Feb 9 11:37:54 2016 +0900 Committer: Jungtaek Lim Committed: Tue Feb 9 11:37:54 2016 +0900 -- .../cluster_state/zookeeper_state_factory.clj | 3 +- .../utils/StormConnectionStateConverter.java| 44 2 files changed, 46 insertions(+), 1 deletion(-) --
[1/3] storm git commit: STORM-1520 Nimbus Clojure/Zookeeper issue ("stateChanged" method not found)
Repository: storm
Updated Branches:
refs/heads/1.x-branch 0164e522e -> ec25fad1b
STORM-1520 Nimbus Clojure/Zookeeper issue ("stateChanged" method not found)
* fix a bug which passes wrong type of parameter to
ClusterStateListener.stateChanged()
* we passed ConnectionState from Curator which method needs storm's
ConnectionState
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ed4a55f5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ed4a55f5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ed4a55f5
Branch: refs/heads/1.x-branch
Commit: ed4a55f50f5e73589e2a59c99236651edf0f18b1
Parents: 0164e52
Author: Jungtaek Lim
Authored: Tue Feb 9 11:26:06 2016 +0900
Committer: Jungtaek Lim
Committed: Tue Feb 9 11:26:06 2016 +0900
--
.../cluster_state/zookeeper_state_factory.clj | 3 +-
.../utils/StormConnectionStateConverter.java| 44
2 files changed, 46 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/storm/blob/ed4a55f5/storm-core/src/clj/org/apache/storm/cluster_state/zookeeper_state_factory.clj
--
diff --git
a/storm-core/src/clj/org/apache/storm/cluster_state/zookeeper_state_factory.clj
b/storm-core/src/clj/org/apache/storm/cluster_state/zookeeper_state_factory.clj
index 3104c52..7eca328 100644
---
a/storm-core/src/clj/org/apache/storm/cluster_state/zookeeper_state_factory.clj
+++
b/storm-core/src/clj/org/apache/storm/cluster_state/zookeeper_state_factory.clj
@@ -18,6 +18,7 @@
(:import [org.apache.curator.framework.state ConnectionStateListener])
(:import [org.apache.zookeeper KeeperException$NoNodeException]
[org.apache.storm.cluster ClusterState DaemonType])
+ (:import [org.apache.storm.utils StormConnectionStateConverter])
(:use [org.apache.storm cluster config log util])
(:require [org.apache.storm [zookeeper :as zk]])
(:gen-class
@@ -142,7 +143,7 @@
(let [curator-listener (reify ConnectionStateListener
(stateChanged
[this client newState]
- (.stateChanged listener client newState)))]
+ (.stateChanged listener
(StormConnectionStateConverter/convert newState]
(zk/add-listener zk-reader curator-listener)))
(sync-path
http://git-wip-us.apache.org/repos/asf/storm/blob/ed4a55f5/storm-core/src/jvm/org/apache/storm/utils/StormConnectionStateConverter.java
--
diff --git
a/storm-core/src/jvm/org/apache/storm/utils/StormConnectionStateConverter.java
b/storm-core/src/jvm/org/apache/storm/utils/StormConnectionStateConverter.java
new file mode 100644
index 000..587b5eb
--- /dev/null
+++
b/storm-core/src/jvm/org/apache/storm/utils/StormConnectionStateConverter.java
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.storm.utils;
+
+import org.apache.storm.cluster.ConnectionState;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class StormConnectionStateConverter {
+
+private static final
Map
mapCuratorToStorm = new HashMap<>();
+static {
+
mapCuratorToStorm.put(org.apache.curator.framework.state.ConnectionState.CONNECTED,
ConnectionState.CONNECTED);
+
mapCuratorToStorm.put(org.apache.curator.framework.state.ConnectionState.LOST,
ConnectionState.LOST);
+
mapCuratorToStorm.put(org.apache.curator.framework.state.ConnectionState.RECONNECTED,
ConnectionState.RECONNECTED);
+
mapCuratorToStorm.put(org.apache.curator.framework.state.ConnectionState.READ_ONLY,
ConnectionState.LOST);
+
mapCuratorToStorm.put(org.apache.curator.framework.state.ConnectionState.SUSPENDED,
ConnectionState.LOST);
+}
+
+public static ConnectionState
convert(org.apache.curator.framework.state.ConnectionState state) {
+ConnectionState stormState = mapCuratorToStorm.get(
[3/3] storm git commit: add STORM-1520 to CHANGELOG.md
add STORM-1520 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ec25fad1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ec25fad1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ec25fad1
Branch: refs/heads/1.x-branch
Commit: ec25fad1bc18cfde4736c00016543658e610eeb7
Parents: d8d8e69
Author: Jungtaek Lim
Authored: Tue Feb 9 11:38:31 2016 +0900
Committer: Jungtaek Lim
Committed: Tue Feb 9 11:38:31 2016 +0900
--
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/storm/blob/ec25fad1/CHANGELOG.md
--
diff --git a/CHANGELOG.md b/CHANGELOG.md
index def5816..15a0fd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.0
+ * STORM-1520: Nimbus Clojure/Zookeeper issue ("stateChanged" method not found)
* STORM-1531: Junit and mockito dependencies need to have correct scope
defined in storm-elasticsearch pom.xml
* STORM-1526: Improve Storm core performance
* STORM-1524: Add Pluggable daemon metrics Reporters
[1/4] storm git commit: STORM-1520 Nimbus Clojure/Zookeeper issue ("stateChanged" method not found)
Repository: storm
Updated Branches:
refs/heads/master b89af960a -> 53e44ff3d
STORM-1520 Nimbus Clojure/Zookeeper issue ("stateChanged" method not found)
* fix a bug which passes wrong type of parameter to
ClusterStateListener.stateChanged()
* we passed ConnectionState from Curator which method needs storm's
ConnectionState
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/25f8b2af
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/25f8b2af
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/25f8b2af
Branch: refs/heads/master
Commit: 25f8b2af7ac007ca4da304e3e25813a4f0079af4
Parents: 695f8c9
Author: Jungtaek Lim
Authored: Thu Feb 4 18:17:15 2016 +0900
Committer: Jungtaek Lim
Committed: Thu Feb 4 18:17:15 2016 +0900
--
.../cluster_state/zookeeper_state_factory.clj | 3 ++-
.../utils/StormConnectionStateConverter.java| 26
2 files changed, 28 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/storm/blob/25f8b2af/storm-core/src/clj/org/apache/storm/cluster_state/zookeeper_state_factory.clj
--
diff --git
a/storm-core/src/clj/org/apache/storm/cluster_state/zookeeper_state_factory.clj
b/storm-core/src/clj/org/apache/storm/cluster_state/zookeeper_state_factory.clj
index dcfa8d8..624d75c 100644
---
a/storm-core/src/clj/org/apache/storm/cluster_state/zookeeper_state_factory.clj
+++
b/storm-core/src/clj/org/apache/storm/cluster_state/zookeeper_state_factory.clj
@@ -20,6 +20,7 @@
(:import [org.apache.zookeeper KeeperException$NoNodeException CreateMode
Watcher$Event$EventType Watcher$Event$KeeperState]
[org.apache.storm.cluster ClusterState DaemonType])
+ (:import [org.apache.storm.utils StormConnectionStateConverter])
(:use [org.apache.storm cluster config log util])
(:require [org.apache.storm [zookeeper :as zk]])
(:gen-class
@@ -144,7 +145,7 @@
(let [curator-listener (reify ConnectionStateListener
(stateChanged
[this client newState]
- (.stateChanged listener client newState)))]
+ (.stateChanged listener
(StormConnectionStateConverter/convert newState]
(Zookeeper/addListener zk-reader curator-listener)))
(sync-path
http://git-wip-us.apache.org/repos/asf/storm/blob/25f8b2af/storm-core/src/jvm/org/apache/storm/utils/StormConnectionStateConverter.java
--
diff --git
a/storm-core/src/jvm/org/apache/storm/utils/StormConnectionStateConverter.java
b/storm-core/src/jvm/org/apache/storm/utils/StormConnectionStateConverter.java
new file mode 100644
index 000..0374756
--- /dev/null
+++
b/storm-core/src/jvm/org/apache/storm/utils/StormConnectionStateConverter.java
@@ -0,0 +1,26 @@
+package org.apache.storm.utils;
+
+import org.apache.storm.cluster.ConnectionState;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class StormConnectionStateConverter {
+
+private static final
Map
mapCuratorToStorm = new HashMap<>();
+static {
+
mapCuratorToStorm.put(org.apache.curator.framework.state.ConnectionState.CONNECTED,
ConnectionState.CONNECTED);
+
mapCuratorToStorm.put(org.apache.curator.framework.state.ConnectionState.LOST,
ConnectionState.LOST);
+
mapCuratorToStorm.put(org.apache.curator.framework.state.ConnectionState.RECONNECTED,
ConnectionState.RECONNECTED);
+
mapCuratorToStorm.put(org.apache.curator.framework.state.ConnectionState.READ_ONLY,
ConnectionState.LOST);
+
mapCuratorToStorm.put(org.apache.curator.framework.state.ConnectionState.SUSPENDED,
ConnectionState.LOST);
+}
+
+public static ConnectionState
convert(org.apache.curator.framework.state.ConnectionState state) {
+ConnectionState stormState = mapCuratorToStorm.get(state);
+if (stormState != null) {
+return stormState;
+}
+throw new IllegalStateException("Unknown ConnectionState from Curator:
" + state);
+}
+}
[2/4] storm git commit: STORM-1520 Nimbus Clojure/Zookeeper issue ("stateChanged" method not found)
STORM-1520 Nimbus Clojure/Zookeeper issue ("stateChanged" method not found)
* add missing Apache header
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/00256473
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/00256473
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/00256473
Branch: refs/heads/master
Commit: 002564739dde8fec43e799e0f81e2b951a2a5a19
Parents: 25f8b2a
Author: Jungtaek Lim
Authored: Thu Feb 4 18:49:03 2016 +0900
Committer: Jungtaek Lim
Committed: Thu Feb 4 18:49:03 2016 +0900
--
.../utils/StormConnectionStateConverter.java | 18 ++
1 file changed, 18 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/storm/blob/00256473/storm-core/src/jvm/org/apache/storm/utils/StormConnectionStateConverter.java
--
diff --git
a/storm-core/src/jvm/org/apache/storm/utils/StormConnectionStateConverter.java
b/storm-core/src/jvm/org/apache/storm/utils/StormConnectionStateConverter.java
index 0374756..890c457 100644
---
a/storm-core/src/jvm/org/apache/storm/utils/StormConnectionStateConverter.java
+++
b/storm-core/src/jvm/org/apache/storm/utils/StormConnectionStateConverter.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.storm.utils;
import org.apache.storm.cluster.ConnectionState;
[3/4] storm git commit: Merge branch 'STORM-1520' of https://github.com/HeartSaVioR/storm into STORM-1520
Merge branch 'STORM-1520' of https://github.com/HeartSaVioR/storm into STORM-1520 Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7ddbb9f7 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7ddbb9f7 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7ddbb9f7 Branch: refs/heads/master Commit: 7ddbb9f74bf29e887842b0455b0b5f418c66b001 Parents: b89af96 0025647 Author: Jungtaek Lim Authored: Tue Feb 9 11:20:42 2016 +0900 Committer: Jungtaek Lim Committed: Tue Feb 9 11:20:42 2016 +0900 -- .../cluster_state/zookeeper_state_factory.clj | 3 +- .../utils/StormConnectionStateConverter.java| 44 2 files changed, 46 insertions(+), 1 deletion(-) --
[4/4] storm git commit: add STORM-1520 to CHANGELOG.md
add STORM-1520 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/53e44ff3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/53e44ff3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/53e44ff3
Branch: refs/heads/master
Commit: 53e44ff3dbc9e3bbc52becf2a756cc5d07dc4825
Parents: 7ddbb9f
Author: Jungtaek Lim
Authored: Tue Feb 9 11:21:33 2016 +0900
Committer: Jungtaek Lim
Committed: Tue Feb 9 11:21:33 2016 +0900
--
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/storm/blob/53e44ff3/CHANGELOG.md
--
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77a1aaa..cea2836 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
* STORM-1524: Add Pluggable daemon metrics Reporters
## 1.0.0
+ * STORM-1520: Nimbus Clojure/Zookeeper issue ("stateChanged" method not found)
* STORM-1531: Junit and mockito dependencies need to have correct scope
defined in storm-elasticsearch pom.xml
* STORM-1526: Improve Storm core performance
* STORM-1517: Add peek api in trident stream
[2/3] storm git commit: Merge branch '1.x-branch' of https://github.com/shoebamer/storm into STORM-1531_1x
Merge branch '1.x-branch' of https://github.com/shoebamer/storm into STORM-1531_1x Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7d3c8b9d Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7d3c8b9d Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7d3c8b9d Branch: refs/heads/1.x-branch Commit: 7d3c8b9da2e6504841eb112505114c95c85f8ed6 Parents: c96c4ee fa2cdff Author: Aaron Dossett Authored: Mon Feb 8 20:16:37 2016 -0600 Committer: Aaron Dossett Committed: Mon Feb 8 20:16:37 2016 -0600 -- external/storm-elasticsearch/pom.xml | 2 ++ 1 file changed, 2 insertions(+) --
[3/3] storm git commit: Add STORM-1531 to CHANGELOG.md
Add STORM-1531 to CHANGELOG.md Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0164e522 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0164e522 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0164e522 Branch: refs/heads/1.x-branch Commit: 0164e522ed59f41798eb2b75aef0bde41b17b927 Parents: 7d3c8b9 Author: Aaron Dossett Authored: Mon Feb 8 20:18:06 2016 -0600 Committer: Aaron Dossett Committed: Mon Feb 8 20:18:06 2016 -0600 -- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/0164e522/CHANGELOG.md -- diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f0c7f9..def5816 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## 1.0.0 - * STORM-1526 Improve Storm core performance + * STORM-1531: Junit and mockito dependencies need to have correct scope defined in storm-elasticsearch pom.xml + * STORM-1526: Improve Storm core performance * STORM-1524: Add Pluggable daemon metrics Reporters * STORM-1517: Add peek api in trident stream * STORM-1455: kafka spout should not reset to the beginning of partition when offsetoutofrange exception occurs
[1/3] storm git commit: Added scope to dependencies in storm-elasticsearch pom.xml
Repository: storm Updated Branches: refs/heads/1.x-branch c96c4eef5 -> 0164e522e Added scope to dependencies in storm-elasticsearch pom.xml Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fa2cdff1 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fa2cdff1 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fa2cdff1 Branch: refs/heads/1.x-branch Commit: fa2cdff139fe9ca9403a94687403ab9c2f98aa4c Parents: 1582c22 Author: Shoeb Mohammed Authored: Mon Feb 8 16:24:20 2016 -0600 Committer: Shoeb Mohammed Committed: Mon Feb 8 16:24:20 2016 -0600 -- external/storm-elasticsearch/pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/storm/blob/fa2cdff1/external/storm-elasticsearch/pom.xml -- diff --git a/external/storm-elasticsearch/pom.xml b/external/storm-elasticsearch/pom.xml index 91583ce..efd36ff 100644 --- a/external/storm-elasticsearch/pom.xml +++ b/external/storm-elasticsearch/pom.xml @@ -61,6 +61,7 @@ junit junit +test org.hamcrest @@ -77,6 +78,7 @@ org.mockito mockito-all +test
[3/4] storm git commit: Merge branch 'master' of https://github.com/shoebamer/storm into STORM-1531
Merge branch 'master' of https://github.com/shoebamer/storm into STORM-1531 Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/140a1e59 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/140a1e59 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/140a1e59 Branch: refs/heads/master Commit: 140a1e59b3a4fbb92a361bd66698a0ce4d261a66 Parents: 00c18c9 2b1d89e Author: Aaron Dossett Authored: Mon Feb 8 15:48:32 2016 -0600 Committer: Aaron Dossett Committed: Mon Feb 8 15:48:32 2016 -0600 -- external/storm-elasticsearch/pom.xml | 2 ++ 1 file changed, 2 insertions(+) --
[2/4] storm git commit: Added scope to dependencies
Added scope to dependencies Merge remote-tracking branch 'upstream/master' Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2b1d89e8 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2b1d89e8 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2b1d89e8 Branch: refs/heads/master Commit: 2b1d89e8183cf0a056b42b1a22ee60b918973e97 Parents: 431cbb2 00c18c9 Author: Shoeb Mohammed Authored: Mon Feb 8 10:10:06 2016 -0600 Committer: Shoeb Mohammed Committed: Mon Feb 8 10:10:06 2016 -0600 -- CHANGELOG.md| 11 +- README.markdown | 4 +- conf/defaults.yaml | 4 + .../starter/trident/TridentMapExample.java | 123 ++ external/storm-hdfs/README.md | 15 +- external/storm-hdfs/pom.xml | 22 + .../storm/hdfs/avro/AbstractAvroSerializer.java | 80 .../storm/hdfs/avro/AvroSchemaRegistry.java | 28 ++ .../org/apache/storm/hdfs/avro/AvroUtils.java | 44 ++ .../hdfs/avro/ConfluentAvroSerializer.java | 83 .../storm/hdfs/avro/FixedAvroSerializer.java| 67 +++ .../storm/hdfs/avro/GenericAvroSerializer.java | 36 ++ .../storm/hdfs/bolt/AvroGenericRecordBolt.java | 4 - .../hdfs/avro/TestFixedAvroSerializer.java | 76 .../hdfs/avro/TestGenericAvroSerializer.java| 68 +++ .../test/resources/FixedAvroSerializer.config | 2 + .../jvm/org/apache/storm/kafka/KafkaSpout.java | 8 +- .../jvm/org/apache/storm/kafka/KafkaUtils.java | 44 +- .../apache/storm/kafka/PartitionManager.java| 42 +- .../kafka/trident/TridentKafkaEmitter.java | 23 +- pom.xml | 3 + .../cluster_state/zookeeper_state_factory.clj | 56 +-- .../org/apache/storm/command/dev_zookeeper.clj | 3 +- .../apache/storm/command/shell_submission.clj | 5 +- .../src/clj/org/apache/storm/daemon/common.clj | 19 +- .../src/clj/org/apache/storm/daemon/drpc.clj| 2 +- .../clj/org/apache/storm/daemon/executor.clj| 4 +- .../clj/org/apache/storm/daemon/logviewer.clj | 2 +- .../src/clj/org/apache/storm/daemon/nimbus.clj | 5 +- .../clj/org/apache/storm/daemon/supervisor.clj | 2 +- .../src/clj/org/apache/storm/daemon/task.clj| 2 + storm-core/src/clj/org/apache/storm/testing.clj | 11 +- storm-core/src/clj/org/apache/storm/ui/core.clj | 4 +- .../src/clj/org/apache/storm/zookeeper.clj | 253 +-- storm-core/src/jvm/org/apache/storm/Config.java | 39 ++ .../jvm/org/apache/storm/callback/Callback.java | 23 + .../storm/callback/DefaultWatcherCallBack.java | 35 ++ .../apache/storm/callback/WatcherCallBack.java | 24 ++ .../storm/daemon/metrics/MetricsUtils.java | 108 + .../reporters/ConsolePreparableReporter.java| 76 .../reporters/CsvPreparableReporter.java| 80 .../reporters/JmxPreparableReporter.java| 70 +++ .../metrics/reporters/PreparableReporter.java | 32 ++ .../org/apache/storm/nimbus/ILeaderElector.java | 6 +- .../testing/staticmocking/MockedZookeeper.java | 31 ++ .../jvm/org/apache/storm/trident/Stream.java| 87 +++- .../storm/trident/operation/Consumer.java | 35 ++ .../trident/operation/FlatMapFunction.java | 37 ++ .../storm/trident/operation/MapFunction.java| 36 ++ .../operation/impl/ConsumerExecutor.java| 38 ++ .../operation/impl/FlatMapFunctionExecutor.java | 43 ++ .../operation/impl/MapFunctionExecutor.java | 41 ++ .../trident/planner/processor/MapProcessor.java | 87 .../src/jvm/org/apache/storm/utils/Utils.java | 36 +- .../storm/zookeeper/LeaderElectorImp.java | 121 ++ .../apache/storm/zookeeper/ZkEventTypes.java| 43 ++ .../apache/storm/zookeeper/ZkKeeperStates.java | 41 ++ .../org/apache/storm/zookeeper/Zookeeper.java | 430 +++ .../test/clj/org/apache/storm/cluster_test.clj | 39 +- .../test/clj/org/apache/storm/nimbus_test.clj | 20 +- .../apache/storm/blobstore/BlobStoreTest.java | 1 + 61 files changed, 2418 insertions(+), 396 deletions(-) --
[4/4] storm git commit: add STORM-1531 to CHANGELOG.md
add STORM-1531 to CHANGELOG.md Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b89af960 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b89af960 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b89af960 Branch: refs/heads/master Commit: b89af960accfd37ed5aa7b1d095de5e3758a5df6 Parents: 140a1e5 Author: Aaron Dossett Authored: Mon Feb 8 19:59:56 2016 -0600 Committer: Aaron Dossett Committed: Mon Feb 8 19:59:56 2016 -0600 -- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/b89af960/CHANGELOG.md -- diff --git a/CHANGELOG.md b/CHANGELOG.md index b03ea50..77a1aaa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,8 @@ * STORM-1524: Add Pluggable daemon metrics Reporters ## 1.0.0 - * STORM-1526 Improve Storm core performance + * STORM-1531: Junit and mockito dependencies need to have correct scope defined in storm-elasticsearch pom.xml + * STORM-1526: Improve Storm core performance * STORM-1517: Add peek api in trident stream * STORM-1455: kafka spout should not reset to the beginning of partition when offsetoutofrange exception occurs * STORM-1505: Add map, flatMap and filter functions in trident stream
[1/4] storm git commit: Added scope to storm-elasticsearch unit tests
Repository: storm Updated Branches: refs/heads/master 00c18c988 -> b89af960a Added scope to storm-elasticsearch unit tests Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/431cbb2d Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/431cbb2d Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/431cbb2d Branch: refs/heads/master Commit: 431cbb2db3aa6badfb23c98bcd3255cc603a80d3 Parents: 0997650 Author: Shoeb Mohammed Authored: Mon Feb 8 10:09:35 2016 -0600 Committer: Shoeb Mohammed Committed: Mon Feb 8 10:09:35 2016 -0600 -- external/storm-elasticsearch/pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/storm/blob/431cbb2d/external/storm-elasticsearch/pom.xml -- diff --git a/external/storm-elasticsearch/pom.xml b/external/storm-elasticsearch/pom.xml index d369d14..09d4794 100644 --- a/external/storm-elasticsearch/pom.xml +++ b/external/storm-elasticsearch/pom.xml @@ -61,6 +61,7 @@ junit junit +test org.hamcrest @@ -77,6 +78,7 @@ org.mockito mockito-all +test
storm git commit: add STORM-1526 to CHANGELOG.md
Repository: storm Updated Branches: refs/heads/1.x-branch 8250a4733 -> c96c4eef5 add STORM-1526 to CHANGELOG.md Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c96c4eef Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c96c4eef Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c96c4eef Branch: refs/heads/1.x-branch Commit: c96c4eef5348806e2c396df7a58001997e7dad54 Parents: 8250a47 Author: Jungtaek Lim Authored: Tue Feb 9 11:11:02 2016 +0900 Committer: Jungtaek Lim Committed: Tue Feb 9 11:11:02 2016 +0900 -- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/storm/blob/c96c4eef/CHANGELOG.md -- diff --git a/CHANGELOG.md b/CHANGELOG.md index 2aa6882..4f0c7f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ## 1.0.0 + * STORM-1526 Improve Storm core performance * STORM-1524: Add Pluggable daemon metrics Reporters * STORM-1517: Add peek api in trident stream * STORM-1455: kafka spout should not reset to the beginning of partition when offsetoutofrange exception occurs
storm git commit: STORM-1526 fix perf issue related to clojure dynamic method lookup in the spout.nextTuple() call tree
Repository: storm Updated Branches: refs/heads/1.x-branch 1582c220a -> 8250a4733 STORM-1526 fix perf issue related to clojure dynamic method lookup in the spout.nextTuple() call tree Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8250a473 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8250a473 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8250a473 Branch: refs/heads/1.x-branch Commit: 8250a47336607e06c7c73c5ab1aee7ba7bcfe4ad Parents: 1582c22 Author: Roshan Naik Authored: Thu Feb 4 18:06:07 2016 -0800 Committer: Jungtaek Lim Committed: Tue Feb 9 11:07:28 2016 +0900 -- storm-core/src/clj/org/apache/storm/daemon/executor.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/8250a473/storm-core/src/clj/org/apache/storm/daemon/executor.clj -- diff --git a/storm-core/src/clj/org/apache/storm/daemon/executor.clj b/storm-core/src/clj/org/apache/storm/daemon/executor.clj index c742352..251387b 100644 --- a/storm-core/src/clj/org/apache/storm/daemon/executor.clj +++ b/storm-core/src/clj/org/apache/storm/daemon/executor.clj @@ -58,7 +58,7 @@ (.prepare grouping context (GlobalStreamId. component-id stream-id) target-tasks) (if (instance? LoadAwareCustomStreamGrouping grouping) (fn [task-id ^List values load] - (.chooseTasks grouping task-id values load)) + (.chooseTasks ^LoadAwareCustomStreamGrouping grouping task-id values load)) (fn [task-id ^List values load] (.chooseTasks grouping task-id values
[3/5] storm git commit: STORM-1526 fix perf issue related to clojure dynamic method lookup in the spout.nextTuple() call tree
STORM-1526 fix perf issue related to clojure dynamic method lookup in the spout.nextTuple() call tree Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d58ba009 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d58ba009 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d58ba009 Branch: refs/heads/master Commit: d58ba0099f0900ffe8b45abe9f5a27e4379fb232 Parents: d5a31fc Author: Roshan Naik Authored: Thu Feb 4 18:06:07 2016 -0800 Committer: Roshan Naik Committed: Thu Feb 4 18:06:07 2016 -0800 -- storm-core/src/clj/org/apache/storm/daemon/executor.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/d58ba009/storm-core/src/clj/org/apache/storm/daemon/executor.clj -- diff --git a/storm-core/src/clj/org/apache/storm/daemon/executor.clj b/storm-core/src/clj/org/apache/storm/daemon/executor.clj index afc3ea3..ab0c8aa 100644 --- a/storm-core/src/clj/org/apache/storm/daemon/executor.clj +++ b/storm-core/src/clj/org/apache/storm/daemon/executor.clj @@ -58,7 +58,7 @@ (.prepare grouping context (GlobalStreamId. component-id stream-id) target-tasks) (if (instance? LoadAwareCustomStreamGrouping grouping) (fn [task-id ^List values load] - (.chooseTasks grouping task-id values load)) + (.chooseTasks ^LoadAwareCustomStreamGrouping grouping task-id values load)) (fn [task-id ^List values load] (.chooseTasks grouping task-id values
[4/5] storm git commit: Merge branch 'STORM-1526' of https://github.com/roshannaik/storm into STORM-1526
Merge branch 'STORM-1526' of https://github.com/roshannaik/storm into STORM-1526 Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3f52dda9 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3f52dda9 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3f52dda9 Branch: refs/heads/master Commit: 3f52dda9a078c9aa0d840168ec0c30fa142a5812 Parents: 31b57e8 d58ba00 Author: Sriharsha Chintalapani Authored: Mon Feb 8 07:16:08 2016 -0800 Committer: Sriharsha Chintalapani Committed: Mon Feb 8 07:16:08 2016 -0800 -- storm-core/src/clj/org/apache/storm/daemon/executor.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[5/5] storm git commit: Added STORM-1526 to CHANGELOG.
Added STORM-1526 to CHANGELOG. Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/00c18c98 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/00c18c98 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/00c18c98 Branch: refs/heads/master Commit: 00c18c988f7b4cf98635e43ce5af6ed13ecc08d0 Parents: 3f52dda Author: Sriharsha Chintalapani Authored: Mon Feb 8 07:17:06 2016 -0800 Committer: Sriharsha Chintalapani Committed: Mon Feb 8 07:17:06 2016 -0800 -- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/storm/blob/00c18c98/CHANGELOG.md -- diff --git a/CHANGELOG.md b/CHANGELOG.md index 622e54c..b03ea50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ * STORM-1524: Add Pluggable daemon metrics Reporters ## 1.0.0 + * STORM-1526 Improve Storm core performance * STORM-1517: Add peek api in trident stream * STORM-1455: kafka spout should not reset to the beginning of partition when offsetoutofrange exception occurs * STORM-1505: Add map, flatMap and filter functions in trident stream
[1/5] [storm] Git Push Summary
Repository: storm Updated Branches: refs/heads/master 31b57e8ab -> 00c18c988
