[1/2] storm git commit: STORM-2918 Update Netty version

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/1.0.x-branch 5b507eaf0 -> 9c8930036


STORM-2918 Update Netty version


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

Branch: refs/heads/1.0.x-branch
Commit: 4df41444ba3a507cb757d59795262f83c74bbca7
Parents: 5b507ea
Author: Artem Ervits 
Authored: Wed Jan 31 15:13:06 2018 -0500
Committer: Jungtaek Lim 
Committed: Fri Feb 2 13:29:15 2018 +0900

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/4df41444/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 1936db0..3f51295 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,7 +224,7 @@
 3.3.2
 0.9.0
 16.0.1
-3.9.0.Final
+3.9.9.Final
 1.6.6
 2.8
 1.7.21

[1/2] storm git commit: STORM-2918 Update Netty version

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/master 5d2cf6f9d -> 7fbe7a278


STORM-2918 Update Netty version


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

Branch: refs/heads/master
Commit: 956ba1c16b46a92e00db0be4b026dc731ec6621f
Parents: f37a6bd
Author: Artem Ervits 
Authored: Wed Jan 31 15:13:06 2018 -0500
Committer: Artem Ervits 
Committed: Wed Jan 31 15:13:06 2018 -0500

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/956ba1c1/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ccace42..28e9b8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -263,7 +263,7 @@
 0.9.0
 16.0.1
 1.0-rc3
-3.9.0.Final
+3.9.9.Final
 1.0.2
 1.6.6
 2.8.2

[2/2] storm git commit: Merge branch 'STORM-2918' of https://github.com/dbist/storm into STORM-2918-merge

[kabhwan]

Merge branch 'STORM-2918' of https://github.com/dbist/storm into 
STORM-2918-merge


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

Branch: refs/heads/master
Commit: 7fbe7a278f99e30ac856a21cfe9e6e5a2c16c8b1
Parents: 5d2cf6f 956ba1c
Author: Jungtaek Lim 
Authored: Fri Feb 2 13:27:03 2018 +0900
Committer: Jungtaek Lim 
Committed: Fri Feb 2 13:27:03 2018 +0900

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/7fbe7a27/pom.xml
--

[1/2] storm git commit: STORM-2918 Update Netty version

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/1.1.x-branch d4c6fe20b -> e906180cd


STORM-2918 Update Netty version


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

Branch: refs/heads/1.1.x-branch
Commit: 4df94e944b7f192e4e6ca4b3e96f8e9c77787d51
Parents: d4c6fe2
Author: Artem Ervits 
Authored: Wed Jan 31 15:13:06 2018 -0500
Committer: Jungtaek Lim 
Committed: Fri Feb 2 13:28:57 2018 +0900

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/4df94e94/pom.xml
--
diff --git a/pom.xml b/pom.xml
index d7fd43b..cefb6f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -245,7 +245,7 @@
 3.3.2
 0.9.0
 16.0.1
-3.9.0.Final
+3.9.9.Final
 1.6.6
 2.8.2
 1.7.21

[1/2] storm git commit: STORM-2918 Update Netty version

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/1.x-branch ca25384c5 -> 80cc88112


STORM-2918 Update Netty version


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

Branch: refs/heads/1.x-branch
Commit: c863d9a8461d4ee77d556d9145d8168a3f9cee73
Parents: ca25384
Author: Artem Ervits 
Authored: Wed Jan 31 15:13:06 2018 -0500
Committer: Jungtaek Lim 
Committed: Fri Feb 2 13:28:13 2018 +0900

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/c863d9a8/pom.xml
--
diff --git a/pom.xml b/pom.xml
index c1511a4..d2b556f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -245,7 +245,7 @@
 3.3.2
 0.9.0
 16.0.1
-3.9.0.Final
+3.9.9.Final
 1.6.6
 2.8.2
 1.7.21

[2/2] storm git commit: Merge branch 'STORM-2918-1.1.x-merge' into 1.1.x-branch

[kabhwan]

Merge branch 'STORM-2918-1.1.x-merge' into 1.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/e906180c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e906180c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e906180c

Branch: refs/heads/1.1.x-branch
Commit: e906180cdd3b77d47458c22ca3120fbea3cb3b17
Parents: d4c6fe2 4df94e9
Author: Jungtaek Lim 
Authored: Fri Feb 2 13:29:03 2018 +0900
Committer: Jungtaek Lim 
Committed: Fri Feb 2 13:29:03 2018 +0900

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[2/2] storm git commit: Merge branch 'STORM-2918-1.0.x-merge' into 1.0.x-branch

[kabhwan]

Merge branch 'STORM-2918-1.0.x-merge' into 1.0.x-branch


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

Branch: refs/heads/1.0.x-branch
Commit: 9c8930036c4829bcf47947cb03a276d32c1a317a
Parents: 5b507ea 4df4144
Author: Jungtaek Lim 
Authored: Fri Feb 2 13:29:18 2018 +0900
Committer: Jungtaek Lim 
Committed: Fri Feb 2 13:29:18 2018 +0900

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[2/2] storm git commit: Merge branch 'STORM-2853' of https://github.com/HeartSaVioR/storm into STORM-2853-merge

[kabhwan]

Merge branch 'STORM-2853' of https://github.com/HeartSaVioR/storm into 
STORM-2853-merge


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

Branch: refs/heads/master
Commit: 5d2cf6f9d45188caf676eb4dc178d0161d369f91
Parents: abf0f8a a5540d7
Author: Jungtaek Lim 
Authored: Fri Feb 2 13:17:03 2018 +0900
Committer: Jungtaek Lim 
Committed: Fri Feb 2 13:17:03 2018 +0900

--
 storm-client/src/jvm/org/apache/storm/executor/Executor.java| 1 -
 .../src/jvm/org/apache/storm/executor/bolt/BoltExecutor.java| 1 +
 .../src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java  | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)
--

[1/2] storm git commit: STORM-2853 Initialize tick tuple after initializing spouts/bolts

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/master abf0f8a22 -> 5d2cf6f9d


STORM-2853 Initialize tick tuple after initializing spouts/bolts

* this prevents newly-initializing executor in deactivated topology to show 
high CPU usage


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

Branch: refs/heads/master
Commit: a5540d79fa8b3b6f625308972fe922786680b833
Parents: f37a6bd
Author: Jungtaek Lim 
Authored: Thu Feb 1 09:46:52 2018 +0900
Committer: Jungtaek Lim 
Committed: Thu Feb 1 09:46:52 2018 +0900

--
 storm-client/src/jvm/org/apache/storm/executor/Executor.java| 1 -
 .../src/jvm/org/apache/storm/executor/bolt/BoltExecutor.java| 1 +
 .../src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java  | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/a5540d79/storm-client/src/jvm/org/apache/storm/executor/Executor.java
--
diff --git a/storm-client/src/jvm/org/apache/storm/executor/Executor.java 
b/storm-client/src/jvm/org/apache/storm/executor/Executor.java
index ed900dc..a90e16c 100644
--- a/storm-client/src/jvm/org/apache/storm/executor/Executor.java
+++ b/storm-client/src/jvm/org/apache/storm/executor/Executor.java
@@ -251,7 +251,6 @@ public abstract class Executor implements Callable, 
EventHandler {
 String handlerName = componentId + "-executor" + executorId;
 Utils.SmartThread handlers =
 Utils.asyncLoop(this, false, reportErrorDie, 
Thread.NORM_PRIORITY, true, true, handlerName);
-setupTicks(StatsUtil.SPOUT.equals(type));
 
 LOG.info("Finished loading executor " + componentId + ":" + 
executorId);
 return new ExecutorShutdown(this, Lists.newArrayList(systemThreads, 
handlers), idToTask, receiveQueue, sendQueue);

http://git-wip-us.apache.org/repos/asf/storm/blob/a5540d79/storm-client/src/jvm/org/apache/storm/executor/bolt/BoltExecutor.java
--
diff --git 
a/storm-client/src/jvm/org/apache/storm/executor/bolt/BoltExecutor.java 
b/storm-client/src/jvm/org/apache/storm/executor/bolt/BoltExecutor.java
index 4e46dc5..8478a2c 100644
--- a/storm-client/src/jvm/org/apache/storm/executor/bolt/BoltExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/executor/bolt/BoltExecutor.java
@@ -87,6 +87,7 @@ public class BoltExecutor extends Executor {
 }
 openOrPrepareWasCalled.set(true);
 LOG.info("Prepared bolt {}:{}", componentId, idToTask.keySet());
+setupTicks(false);
 setupMetrics();
 }
 

http://git-wip-us.apache.org/repos/asf/storm/blob/a5540d79/storm-client/src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java
--
diff --git 
a/storm-client/src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java 
b/storm-client/src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java
index c465338..59139b1 100644
--- a/storm-client/src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java
+++ b/storm-client/src/jvm/org/apache/storm/executor/spout/SpoutExecutor.java
@@ -128,6 +128,7 @@ public class SpoutExecutor extends Executor {
 }
 openOrPrepareWasCalled.set(true);
 LOG.info("Opened spout {}:{}", componentId, idToTask.keySet());
+setupTicks(true);
 setupMetrics();
 }
 

[1/2] storm git commit: STORM-2853 Initialize tick tuple after initializing spouts/bolts

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/1.x-branch d4247d759 -> ca25384c5


STORM-2853 Initialize tick tuple after initializing spouts/bolts

* this prevents newly-initializing executor in deactivated topology to show 
high CPU usage
* this is based on the fact that all the tasks in executor are for same 
component


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

Branch: refs/heads/1.x-branch
Commit: 91f1522820f3ac1c53594e943dfa8f3a2cde1a8f
Parents: 34a220c
Author: Jungtaek Lim 
Authored: Thu Feb 1 10:08:48 2018 +0900
Committer: Jungtaek Lim 
Committed: Thu Feb 1 10:08:48 2018 +0900

--
 storm-core/src/clj/org/apache/storm/daemon/executor.clj | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/91f15228/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 b9bcaae..3940f1b 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/executor.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/executor.clj
@@ -350,7 +350,7 @@
  (when (seq data-points)
(task/send-unanchored task-data Constants/METRICS_STREAM_ID [task-info 
data-points]
 
-(defn setup-ticks! [worker executor-data]
+(defn setup-ticks! [executor-data]
   (let [storm-conf (:storm-conf executor-data)
 comp-id (:component-id executor-data)
 tick-time-secs (storm-conf TOPOLOGY-TICK-TUPLE-FREQ-SECS)
@@ -362,7 +362,7 @@
(= :spout (:type executor-data
 (log-message "Timeouts disabled for executor " comp-id ":" 
(:executor-id executor-data))
 (schedule-recurring
-  (:user-timer worker)
+  (:user-timer (:worker executor-data))
   tick-time-secs
   tick-time-secs
   (fn []
@@ -390,14 +390,13 @@
   (.setLowWaterMark ((:storm-conf executor-data) 
BACKPRESSURE-DISRUPTOR-LOW-WATERMARK))
   (.setEnableBackpressure ((:storm-conf executor-data) 
TOPOLOGY-BACKPRESSURE-ENABLE)))
 
-;; starting the batch-transfer->worker ensures that anything 
publishing to that queue 
+;; starting the batch-transfer->worker ensures that anything 
publishing to that queue
 ;; doesn't block (because it's a single threaded queue and the 
caching/consumer started
 ;; trick isn't thread-safe)
 system-threads [(start-batch-transfer->worker-handler! worker 
executor-data)]
 handlers (with-error-reaction report-error-and-die
(mk-threads executor-data task-datas initial-credentials))
-threads (concat handlers system-threads)]
-(setup-ticks! worker executor-data)
+threads (concat handlers system-threads)]
 
 (log-message "Finished loading executor " component-id ":" (pr-str 
executor-id))
 ;; TODO: add method here to get rendered stats... have worker call that 
when heartbeating
@@ -627,6 +626,7 @@
   )
 (reset! open-or-prepare-was-called? true) 
 (log-message "Opened spout " component-id ":" (keys task-datas))
+(setup-ticks! executor-data)
 (setup-metrics! executor-data)
 
 (fn []
@@ -852,6 +852,7 @@
  )
 (reset! open-or-prepare-was-called? true)
 (log-message "Prepared bolt " component-id ":" (keys task-datas))
+(setup-ticks! executor-data)
 (setup-metrics! executor-data)
 
 (let [receive-queue (:receive-queue executor-data)

[2/2] storm git commit: Merge branch 'STORM-2853-1.1.x-merge' into 1.1.x-branch

[kabhwan]

Merge branch 'STORM-2853-1.1.x-merge' into 1.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/d4c6fe20
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d4c6fe20
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d4c6fe20

Branch: refs/heads/1.1.x-branch
Commit: d4c6fe20bd2035b0b64be2580aeabd8715011ba6
Parents: f690791 8fe4959
Author: Jungtaek Lim 
Authored: Fri Feb 2 13:18:14 2018 +0900
Committer: Jungtaek Lim 
Committed: Fri Feb 2 13:18:14 2018 +0900

--
 storm-core/src/clj/org/apache/storm/daemon/executor.clj | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--

[2/2] storm git commit: Merge branch 'STORM-2853-1.x' of https://github.com/HeartSaVioR/storm into STORM-2853-1.x-merge

[kabhwan]

Merge branch 'STORM-2853-1.x' of https://github.com/HeartSaVioR/storm into 
STORM-2853-1.x-merge


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

Branch: refs/heads/1.x-branch
Commit: ca25384c5424fbd71fedfae969c808734625c657
Parents: d4247d7 91f1522
Author: Jungtaek Lim 
Authored: Fri Feb 2 13:17:47 2018 +0900
Committer: Jungtaek Lim 
Committed: Fri Feb 2 13:17:47 2018 +0900

--
 storm-core/src/clj/org/apache/storm/daemon/executor.clj | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--

[2/2] storm git commit: Merge branch 'STORM-2853-1.0.x-merge' into 1.0.x-branch

[kabhwan]

Merge branch 'STORM-2853-1.0.x-merge' into 1.0.x-branch


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

Branch: refs/heads/1.0.x-branch
Commit: 5b507eaf03d9e5304e1025233b86766b27eadd78
Parents: 174f486 4841475
Author: Jungtaek Lim 
Authored: Fri Feb 2 13:18:54 2018 +0900
Committer: Jungtaek Lim 
Committed: Fri Feb 2 13:18:54 2018 +0900

--
 storm-core/src/clj/org/apache/storm/daemon/executor.clj | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--

[1/2] storm git commit: STORM-2853 Initialize tick tuple after initializing spouts/bolts

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/1.1.x-branch f6907912e -> d4c6fe20b


STORM-2853 Initialize tick tuple after initializing spouts/bolts

* this prevents newly-initializing executor in deactivated topology to show 
high CPU usage
* this is based on the fact that all the tasks in executor are for same 
component


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

Branch: refs/heads/1.1.x-branch
Commit: 8fe49599c3bd3b21cbc1a83564dd9d91fd7aeb3b
Parents: f690791
Author: Jungtaek Lim 
Authored: Thu Feb 1 10:08:48 2018 +0900
Committer: Jungtaek Lim 
Committed: Fri Feb 2 13:18:10 2018 +0900

--
 storm-core/src/clj/org/apache/storm/daemon/executor.clj | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/8fe49599/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 2473e1a..5f768c6 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/executor.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/executor.clj
@@ -345,7 +345,7 @@
  (when (seq data-points)
(task/send-unanchored task-data Constants/METRICS_STREAM_ID [task-info 
data-points]
 
-(defn setup-ticks! [worker executor-data]
+(defn setup-ticks! [executor-data]
   (let [storm-conf (:storm-conf executor-data)
 comp-id (:component-id executor-data)
 tick-time-secs (storm-conf TOPOLOGY-TICK-TUPLE-FREQ-SECS)
@@ -357,7 +357,7 @@
(= :spout (:type executor-data
 (log-message "Timeouts disabled for executor " comp-id ":" 
(:executor-id executor-data))
 (schedule-recurring
-  (:user-timer worker)
+  (:user-timer (:worker executor-data))
   tick-time-secs
   tick-time-secs
   (fn []
@@ -385,14 +385,13 @@
   (.setLowWaterMark ((:storm-conf executor-data) 
BACKPRESSURE-DISRUPTOR-LOW-WATERMARK))
   (.setEnableBackpressure ((:storm-conf executor-data) 
TOPOLOGY-BACKPRESSURE-ENABLE)))
 
-;; starting the batch-transfer->worker ensures that anything 
publishing to that queue 
+;; starting the batch-transfer->worker ensures that anything 
publishing to that queue
 ;; doesn't block (because it's a single threaded queue and the 
caching/consumer started
 ;; trick isn't thread-safe)
 system-threads [(start-batch-transfer->worker-handler! worker 
executor-data)]
 handlers (with-error-reaction report-error-and-die
(mk-threads executor-data task-datas initial-credentials))
-threads (concat handlers system-threads)]
-(setup-ticks! worker executor-data)
+threads (concat handlers system-threads)]
 
 (log-message "Finished loading executor " component-id ":" (pr-str 
executor-id))
 ;; TODO: add method here to get rendered stats... have worker call that 
when heartbeating
@@ -622,6 +621,7 @@
   )
 (reset! open-or-prepare-was-called? true) 
 (log-message "Opened spout " component-id ":" (keys task-datas))
+(setup-ticks! executor-data)
 (setup-metrics! executor-data)
 
 (fn []
@@ -845,6 +845,7 @@
  )
 (reset! open-or-prepare-was-called? true)
 (log-message "Prepared bolt " component-id ":" (keys task-datas))
+(setup-ticks! executor-data)
 (setup-metrics! executor-data)
 
 (let [receive-queue (:receive-queue executor-data)

[1/2] storm git commit: STORM-2853 Initialize tick tuple after initializing spouts/bolts

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/1.0.x-branch 174f4862f -> 5b507eaf0


STORM-2853 Initialize tick tuple after initializing spouts/bolts

* this prevents newly-initializing executor in deactivated topology to show 
high CPU usage
* this is based on the fact that all the tasks in executor are for same 
component


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

Branch: refs/heads/1.0.x-branch
Commit: 4841475a7e642e8148d67b320941a6bdd8e4a230
Parents: 174f486
Author: Jungtaek Lim 
Authored: Thu Feb 1 10:08:48 2018 +0900
Committer: Jungtaek Lim 
Committed: Fri Feb 2 13:18:50 2018 +0900

--
 storm-core/src/clj/org/apache/storm/daemon/executor.clj | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/4841475a/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 e0c048f..98fc747 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/executor.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/executor.clj
@@ -345,7 +345,7 @@
  (when (seq data-points)
(task/send-unanchored task-data Constants/METRICS_STREAM_ID [task-info 
data-points]
 
-(defn setup-ticks! [worker executor-data]
+(defn setup-ticks! [executor-data]
   (let [storm-conf (:storm-conf executor-data)
 comp-id (:component-id executor-data)
 tick-time-secs (storm-conf TOPOLOGY-TICK-TUPLE-FREQ-SECS)
@@ -357,7 +357,7 @@
(= :spout (:type executor-data
 (log-message "Timeouts disabled for executor " comp-id ":" 
(:executor-id executor-data))
 (schedule-recurring
-  (:user-timer worker)
+  (:user-timer (:worker executor-data))
   tick-time-secs
   tick-time-secs
   (fn []
@@ -385,14 +385,13 @@
   (.setLowWaterMark ((:storm-conf executor-data) 
BACKPRESSURE-DISRUPTOR-LOW-WATERMARK))
   (.setEnableBackpressure ((:storm-conf executor-data) 
TOPOLOGY-BACKPRESSURE-ENABLE)))
 
-;; starting the batch-transfer->worker ensures that anything 
publishing to that queue 
+;; starting the batch-transfer->worker ensures that anything 
publishing to that queue
 ;; doesn't block (because it's a single threaded queue and the 
caching/consumer started
 ;; trick isn't thread-safe)
 system-threads [(start-batch-transfer->worker-handler! worker 
executor-data)]
 handlers (with-error-reaction report-error-and-die
(mk-threads executor-data task-datas initial-credentials))
-threads (concat handlers system-threads)]
-(setup-ticks! worker executor-data)
+threads (concat handlers system-threads)]
 
 (log-message "Finished loading executor " component-id ":" (pr-str 
executor-id))
 ;; TODO: add method here to get rendered stats... have worker call that 
when heartbeating
@@ -622,6 +621,7 @@
   )
 (reset! open-or-prepare-was-called? true) 
 (log-message "Opened spout " component-id ":" (keys task-datas))
+(setup-ticks! executor-data)
 (setup-metrics! executor-data)
 
 (fn []
@@ -845,6 +845,7 @@
  )
 (reset! open-or-prepare-was-called? true)
 (log-message "Prepared bolt " component-id ":" (keys task-datas))
+(setup-ticks! executor-data)
 (setup-metrics! executor-data)
 
 (let [receive-queue (:receive-queue executor-data)

[2/4] storm git commit: STORM-2910: have metrics reported in the background

[bobby]

STORM-2910: have metrics reported in the background


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

Branch: refs/heads/master
Commit: 48c2fda867aa1d1123f6ba9c9f623ae80c9df280
Parents: ed0548e
Author: Robert (Bobby) Evans 
Authored: Thu Jan 25 09:49:20 2018 -0600
Committer: Robert (Bobby) Evans 
Committed: Thu Jan 25 09:49:20 2018 -0600

--
 .../storm/daemon/supervisor/Container.java  | 18 ---
 .../daemon/supervisor/OnlyLatestExecutor.java   | 55 
 .../daemon/supervisor/ReadClusterState.java |  6 ++-
 .../apache/storm/daemon/supervisor/Slot.java| 33 +++-
 .../storm/daemon/supervisor/Supervisor.java | 16 +-
 .../storm/daemon/supervisor/SlotTest.java   | 15 +++---
 6 files changed, 112 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/48c2fda8/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Container.java
--
diff --git 
a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Container.java 
b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Container.java
index f45ce25..a06e44c 100644
--- 
a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Container.java
+++ 
b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Container.java
@@ -50,6 +50,7 @@ import org.apache.storm.utils.NimbusClient;
 import org.apache.storm.utils.ServerConfigUtils;
 import org.apache.storm.utils.ServerUtils;
 import org.apache.storm.utils.Utils;
+import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.Yaml;
@@ -709,7 +710,7 @@ public abstract class Container implements Killable {
 /**
  * Send worker metrics to Nimbus.
  */
-void processMetrics() {
+void processMetrics(OnlyLatestExecutor exec) {
 try {
 if (_usedMemory.get(_port) != null) {
 // Make sure we don't process too frequently.
@@ -725,20 +726,23 @@ public abstract class Container implements Killable {
 long timestamp = System.currentTimeMillis();
 double value = _usedMemory.get(_port).memory;
 WorkerMetricPoint workerMetric = new 
WorkerMetricPoint(MEMORY_USED_METRIC, timestamp, value, SYSTEM_COMPONENT_ID,
-INVALID_EXECUTOR_ID, INVALID_STREAM_ID);
+INVALID_EXECUTOR_ID, INVALID_STREAM_ID);
 
 WorkerMetricList metricList = new WorkerMetricList();
 metricList.add_to_metrics(workerMetric);
 WorkerMetrics metrics = new WorkerMetrics(_topologyId, _port, 
hostname, metricList);
 
-try (NimbusClient client = 
NimbusClient.getConfiguredClient(_conf)) {
-client.getClient().processWorkerMetrics(metrics);
-}
-
-this.lastMetricProcessTime = currentTimeMsec;
+exec.execute(_port, () -> {
+try (NimbusClient client = 
NimbusClient.getConfiguredClient(_conf)) {
+client.getClient().processWorkerMetrics(metrics);
+} catch (Exception e) {
+LOG.error("Failed to process metrics", e);
+}
+});
 }
 } catch (Exception e) {
 LOG.error("Failed to process metrics", e);
+} finally {
 this.lastMetricProcessTime = System.currentTimeMillis();
 }
 }

http://git-wip-us.apache.org/repos/asf/storm/blob/48c2fda8/storm-server/src/main/java/org/apache/storm/daemon/supervisor/OnlyLatestExecutor.java
--
diff --git 
a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/OnlyLatestExecutor.java
 
b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/OnlyLatestExecutor.java
new file mode 100644
index 000..bd73766
--- /dev/null
+++ 
b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/OnlyLatestExecutor.java
@@ -0,0 +1,55 @@
+/*
+ * 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
+ 

[4/4] storm git commit: Merge branch 'STORM-2910' of https://github.com/revans2/incubator-storm into STORM-2910

[bobby]

Merge branch 'STORM-2910' of https://github.com/revans2/incubator-storm into 
STORM-2910

STORM-2910: Fix metrics reporting from supervisor

This closes #2534


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

Branch: refs/heads/master
Commit: abf0f8a22b665117c88e2b2dccdc588d72f12403
Parents: d68416b 77be31b
Author: Robert Evans 
Authored: Thu Feb 1 12:44:06 2018 -0600
Committer: Robert Evans 
Committed: Thu Feb 1 12:44:06 2018 -0600

--
 .../java/org/apache/storm/LocalCluster.java | 13 -
 .../storm/daemon/supervisor/Container.java  | 18 +++---
 .../daemon/supervisor/OnlyLatestExecutor.java   | 60 
 .../daemon/supervisor/ReadClusterState.java |  6 +-
 .../apache/storm/daemon/supervisor/Slot.java| 33 ++-
 .../storm/daemon/supervisor/Supervisor.java | 16 +-
 .../storm/daemon/supervisor/SlotTest.java   | 15 +++--
 7 files changed, 129 insertions(+), 32 deletions(-)
--

[3/4] storm git commit: Addressed review comments

[bobby]

Addressed review comments


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

Branch: refs/heads/master
Commit: 77be31bc4533cb9437242261ff89d1a750eef5c4
Parents: 48c2fda
Author: Robert (Bobby) Evans 
Authored: Wed Jan 31 10:17:43 2018 -0600
Committer: Robert (Bobby) Evans 
Committed: Wed Jan 31 10:17:43 2018 -0600

--
 .../apache/storm/daemon/supervisor/OnlyLatestExecutor.java  | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/77be31bc/storm-server/src/main/java/org/apache/storm/daemon/supervisor/OnlyLatestExecutor.java
--
diff --git 
a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/OnlyLatestExecutor.java
 
b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/OnlyLatestExecutor.java
index bd73766..7dc9b0b 100644
--- 
a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/OnlyLatestExecutor.java
+++ 
b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/OnlyLatestExecutor.java
@@ -21,12 +21,15 @@ package org.apache.storm.daemon.supervisor;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.Executor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This allows you to submit a Runnable with a key.  If the previous 
submission for that key has not yet run,
  * it will be replaced with the latest one.
  */
 public class OnlyLatestExecutor {
+private static final Logger LOG = 
LoggerFactory.getLogger(OnlyLatestExecutor.class);
 private final Executor exec;
 private final ConcurrentMap latest;
 
@@ -47,9 +50,11 @@ public class OnlyLatestExecutor {
 exec.execute(() -> {
 Runnable run = latest.remove(key);
 if (run != null) {
-run.run();;
+run.run();
 }
 });
-}
+} else {
+LOG.debug("Replacing runnable for {} - {}", key, r);
+   }
 }
 }

[1/4] storm git commit: STORM-2910: Override local nimbus client by default

[bobby]

Repository: storm
Updated Branches:
  refs/heads/master d68416b24 -> abf0f8a22


STORM-2910:  Override local nimbus client by default


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

Branch: refs/heads/master
Commit: ed0548e8b61a8ea67007d906953406a264b15c99
Parents: fc4ac8e
Author: Robert (Bobby) Evans 
Authored: Wed Jan 24 14:47:01 2018 -0600
Committer: Robert (Bobby) Evans 
Committed: Wed Jan 24 14:48:12 2018 -0600

--
 .../src/main/java/org/apache/storm/LocalCluster.java   | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/ed0548e8/storm-server/src/main/java/org/apache/storm/LocalCluster.java
--
diff --git a/storm-server/src/main/java/org/apache/storm/LocalCluster.java 
b/storm-server/src/main/java/org/apache/storm/LocalCluster.java
index 502f454..20a46a3 100644
--- a/storm-server/src/main/java/org/apache/storm/LocalCluster.java
+++ b/storm-server/src/main/java/org/apache/storm/LocalCluster.java
@@ -368,6 +368,7 @@ public class LocalCluster implements 
ILocalClusterTrackedTopologyAware, Iface {
 private final String trackId;
 private final StormCommonInstaller commonInstaller;
 private final SimulatedTime time;
+private final NimbusClient.LocalOverride nimbusOverride;
 
 /**
  * Create a default LocalCluster.
@@ -476,6 +477,13 @@ public class LocalCluster implements 
ILocalClusterTrackedTopologyAware, Iface {
 } catch (Exception e) {
 //Ignore any exceptions we might be doing a test for 
authentication 
 }
+if (thriftServer == null) {
+//We don't want to override the client if there is a thrift 
server up and running, or we would not test any
+// Of the actual thrift code
+this.nimbusOverride = new NimbusClient.LocalOverride(this);
+} else {
+this.nimbusOverride = null;
+}
 success = true;
 } finally {
 if (!success) {
@@ -658,6 +666,9 @@ public class LocalCluster implements 
ILocalClusterTrackedTopologyAware, Iface {
 
 @Override
 public synchronized void close() throws Exception {
+if (nimbusOverride != null) {
+nimbusOverride.close();
+}
 if (nimbus != null) {
 nimbus.shutdown();
 }
@@ -1098,6 +1109,7 @@ public class LocalCluster implements 
ILocalClusterTrackedTopologyAware, Iface {
 
 /**
  * Run c with a local mode cluster overriding the NimbusClient and 
DRPCClient calls.
+ * NOTE local mode override happens by default now unless netty is turned 
on for the local cluster.
  * @param c the callable to run in this mode
  * @param ttlSec the number of seconds to let the cluster run after c has 
completed
  * @return the result of calling C
@@ -1106,7 +1118,6 @@ public class LocalCluster implements 
ILocalClusterTrackedTopologyAware, Iface {
 public static  T withLocalModeOverride(Callable c, long ttlSec) 
throws Exception {
 LOG.info("\n\n\t\tSTARTING LOCAL MODE CLUSTER\n\n");
 try (LocalCluster local = new LocalCluster();
-NimbusClient.LocalOverride nimbusOverride = new 
NimbusClient.LocalOverride(local);
 LocalDRPC drpc = new LocalDRPC();
 DRPCClient.LocalOverride drpcOverride = new 
DRPCClient.LocalOverride(drpc)) {
 

[2/2] storm git commit: Revert "[maven-release-plugin] prepare release v1.2.0"

[ptgoetz]

Revert "[maven-release-plugin] prepare release v1.2.0"

This reverts commit 458aa1cb696097cf07d4466aa7417c7b89662221.


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

Branch: refs/heads/1.x-branch
Commit: d4247d759e2c5f1b8f560c0436d300407bd8ce35
Parents: dcb2949
Author: P. Taylor Goetz 
Authored: Thu Feb 1 14:36:57 2018 -0500
Committer: P. Taylor Goetz 
Committed: Thu Feb 1 14:36:57 2018 -0500

--
 examples/storm-elasticsearch-examples/pom.xml | 2 +-
 examples/storm-hbase-examples/pom.xml | 2 +-
 examples/storm-hdfs-examples/pom.xml  | 2 +-
 examples/storm-hive-examples/pom.xml  | 2 +-
 examples/storm-jdbc-examples/pom.xml  | 2 +-
 examples/storm-jms-examples/pom.xml   | 2 +-
 examples/storm-kafka-client-examples/pom.xml  | 2 +-
 examples/storm-kafka-examples/pom.xml | 2 +-
 examples/storm-mongodb-examples/pom.xml   | 2 +-
 examples/storm-mqtt-examples/pom.xml  | 2 +-
 examples/storm-opentsdb-examples/pom.xml  | 2 +-
 examples/storm-perf/pom.xml   | 2 +-
 examples/storm-pmml-examples/pom.xml  | 2 +-
 examples/storm-redis-examples/pom.xml | 2 +-
 examples/storm-solr-examples/pom.xml  | 2 +-
 examples/storm-starter/pom.xml| 2 +-
 external/flux/flux-core/pom.xml   | 2 +-
 external/flux/flux-wrappers/pom.xml   | 2 +-
 external/flux/pom.xml | 2 +-
 external/sql/pom.xml  | 2 +-
 external/sql/storm-sql-core/pom.xml   | 2 +-
 external/sql/storm-sql-external/storm-sql-hdfs/pom.xml| 2 +-
 external/sql/storm-sql-external/storm-sql-kafka/pom.xml   | 2 +-
 external/sql/storm-sql-external/storm-sql-mongodb/pom.xml | 2 +-
 external/sql/storm-sql-external/storm-sql-redis/pom.xml   | 2 +-
 external/sql/storm-sql-runtime/pom.xml| 2 +-
 external/storm-autocreds/pom.xml  | 6 --
 external/storm-cassandra/pom.xml  | 2 +-
 external/storm-druid/pom.xml  | 2 +-
 external/storm-elasticsearch/pom.xml  | 2 +-
 external/storm-eventhubs/pom.xml  | 2 +-
 external/storm-hbase/pom.xml  | 2 +-
 external/storm-hdfs/pom.xml   | 2 +-
 external/storm-hive/pom.xml   | 2 +-
 external/storm-jdbc/pom.xml   | 2 +-
 external/storm-jms/pom.xml| 2 +-
 external/storm-kafka-client/pom.xml   | 2 +-
 external/storm-kafka-monitor/pom.xml  | 2 +-
 external/storm-kafka/pom.xml  | 2 +-
 external/storm-kinesis/pom.xml| 2 +-
 external/storm-metrics/pom.xml| 2 +-
 external/storm-mongodb/pom.xml| 2 +-
 external/storm-mqtt/pom.xml   | 2 +-
 external/storm-opentsdb/pom.xml   | 2 +-
 external/storm-pmml/pom.xml   | 2 +-
 external/storm-redis/pom.xml  | 2 +-
 external/storm-solr/pom.xml   | 2 +-
 external/storm-submit-tools/pom.xml   | 2 +-
 pom.xml   | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml  | 2 +-
 storm-buildtools/storm-maven-plugins/pom.xml  | 2 +-
 storm-core/pom.xml| 2 +-
 storm-dist/binary/pom.xml | 2 +-
 storm-dist/source/pom.xml | 2 +-
 storm-multilang/javascript/pom.xml| 2 +-
 storm-multilang/python/pom.xml| 2 +-
 storm-multilang/ruby/pom.xml  | 2 +-
 storm-rename-hack/pom.xml | 2 +-
 58 files changed, 62 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/d4247d75/examples/storm-elasticsearch-examples/pom.xml
--
diff --git a/examples/storm-elasticsearch-examples/pom.xml 
b/examples/storm-elasticsearch-examples/pom.xml
index 598c71f..0f4a515 100644
--- 

[1/2] storm git commit: Revert "[maven-release-plugin] prepare for next development iteration"

[ptgoetz]

Repository: storm
Updated Branches:
  refs/heads/1.x-branch 1b0e88e2f -> d4247d759


Revert "[maven-release-plugin] prepare for next development iteration"

This reverts commit 34a220c952f8db2b1e90297021511e27cfde8a4b.


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

Branch: refs/heads/1.x-branch
Commit: dcb2949bc13a2730dee73b17a8fe1235c0a4182d
Parents: 1b0e88e
Author: P. Taylor Goetz 
Authored: Thu Feb 1 14:36:55 2018 -0500
Committer: P. Taylor Goetz 
Committed: Thu Feb 1 14:36:55 2018 -0500

--
 examples/storm-elasticsearch-examples/pom.xml | 2 +-
 examples/storm-hbase-examples/pom.xml | 2 +-
 examples/storm-hdfs-examples/pom.xml  | 2 +-
 examples/storm-hive-examples/pom.xml  | 2 +-
 examples/storm-jdbc-examples/pom.xml  | 2 +-
 examples/storm-jms-examples/pom.xml   | 2 +-
 examples/storm-kafka-client-examples/pom.xml  | 2 +-
 examples/storm-kafka-examples/pom.xml | 2 +-
 examples/storm-mongodb-examples/pom.xml   | 2 +-
 examples/storm-mqtt-examples/pom.xml  | 2 +-
 examples/storm-opentsdb-examples/pom.xml  | 2 +-
 examples/storm-perf/pom.xml   | 2 +-
 examples/storm-pmml-examples/pom.xml  | 2 +-
 examples/storm-redis-examples/pom.xml | 2 +-
 examples/storm-solr-examples/pom.xml  | 2 +-
 examples/storm-starter/pom.xml| 2 +-
 external/flux/flux-core/pom.xml   | 2 +-
 external/flux/flux-wrappers/pom.xml   | 2 +-
 external/flux/pom.xml | 2 +-
 external/sql/pom.xml  | 2 +-
 external/sql/storm-sql-core/pom.xml   | 2 +-
 external/sql/storm-sql-external/storm-sql-hdfs/pom.xml| 2 +-
 external/sql/storm-sql-external/storm-sql-kafka/pom.xml   | 2 +-
 external/sql/storm-sql-external/storm-sql-mongodb/pom.xml | 2 +-
 external/sql/storm-sql-external/storm-sql-redis/pom.xml   | 2 +-
 external/sql/storm-sql-runtime/pom.xml| 2 +-
 external/storm-autocreds/pom.xml  | 2 +-
 external/storm-cassandra/pom.xml  | 2 +-
 external/storm-druid/pom.xml  | 2 +-
 external/storm-elasticsearch/pom.xml  | 2 +-
 external/storm-eventhubs/pom.xml  | 2 +-
 external/storm-hbase/pom.xml  | 2 +-
 external/storm-hdfs/pom.xml   | 2 +-
 external/storm-hive/pom.xml   | 2 +-
 external/storm-jdbc/pom.xml   | 2 +-
 external/storm-jms/pom.xml| 2 +-
 external/storm-kafka-client/pom.xml   | 2 +-
 external/storm-kafka-monitor/pom.xml  | 2 +-
 external/storm-kafka/pom.xml  | 2 +-
 external/storm-kinesis/pom.xml| 2 +-
 external/storm-metrics/pom.xml| 2 +-
 external/storm-mongodb/pom.xml| 2 +-
 external/storm-mqtt/pom.xml   | 2 +-
 external/storm-opentsdb/pom.xml   | 2 +-
 external/storm-pmml/pom.xml   | 2 +-
 external/storm-redis/pom.xml  | 2 +-
 external/storm-solr/pom.xml   | 2 +-
 external/storm-submit-tools/pom.xml   | 2 +-
 pom.xml   | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml  | 2 +-
 storm-buildtools/storm-maven-plugins/pom.xml  | 2 +-
 storm-core/pom.xml| 2 +-
 storm-dist/binary/pom.xml | 2 +-
 storm-dist/source/pom.xml | 2 +-
 storm-multilang/javascript/pom.xml| 2 +-
 storm-multilang/python/pom.xml| 2 +-
 storm-multilang/ruby/pom.xml  | 2 +-
 storm-rename-hack/pom.xml | 2 +-
 58 files changed, 59 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/dcb2949b/examples/storm-elasticsearch-examples/pom.xml
--
diff --git 

[storm] Git Push Summary

[ptgoetz]

Repository: storm
Updated Tags:  refs/tags/v1.2.0 [deleted] cc837731b

[2/2] storm git commit: Revert "[maven-release-plugin] prepare release v1.1.2"

[ptgoetz]

Revert "[maven-release-plugin] prepare release v1.1.2"

This reverts commit 5d2eecf3d282a535541ac7520a88b47f01153da1.


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

Branch: refs/heads/1.1.x-branch
Commit: f6907912e38388fc983254e204b46e8ecabf9b25
Parents: 45fe29e
Author: P. Taylor Goetz 
Authored: Thu Feb 1 14:34:21 2018 -0500
Committer: P. Taylor Goetz 
Committed: Thu Feb 1 14:34:21 2018 -0500

--
 examples/storm-elasticsearch-examples/pom.xml | 2 +-
 examples/storm-hbase-examples/pom.xml | 2 +-
 examples/storm-hdfs-examples/pom.xml  | 2 +-
 examples/storm-hive-examples/pom.xml  | 2 +-
 examples/storm-jdbc-examples/pom.xml  | 2 +-
 examples/storm-jms-examples/pom.xml   | 2 +-
 examples/storm-kafka-client-examples/pom.xml  | 2 +-
 examples/storm-kafka-examples/pom.xml | 2 +-
 examples/storm-mongodb-examples/pom.xml   | 2 +-
 examples/storm-mqtt-examples/pom.xml  | 2 +-
 examples/storm-opentsdb-examples/pom.xml  | 2 +-
 examples/storm-perf/pom.xml   | 2 +-
 examples/storm-pmml-examples/pom.xml  | 2 +-
 examples/storm-redis-examples/pom.xml | 2 +-
 examples/storm-solr-examples/pom.xml  | 2 +-
 examples/storm-starter/pom.xml| 2 +-
 external/flux/flux-core/pom.xml   | 2 +-
 external/flux/flux-wrappers/pom.xml   | 2 +-
 external/flux/pom.xml | 2 +-
 external/sql/pom.xml  | 2 +-
 external/sql/storm-sql-core/pom.xml   | 2 +-
 external/sql/storm-sql-external/storm-sql-hdfs/pom.xml| 2 +-
 external/sql/storm-sql-external/storm-sql-kafka/pom.xml   | 2 +-
 external/sql/storm-sql-external/storm-sql-mongodb/pom.xml | 2 +-
 external/sql/storm-sql-external/storm-sql-redis/pom.xml   | 2 +-
 external/sql/storm-sql-runtime/pom.xml| 2 +-
 external/storm-cassandra/pom.xml  | 2 +-
 external/storm-druid/pom.xml  | 2 +-
 external/storm-elasticsearch/pom.xml  | 2 +-
 external/storm-eventhubs/pom.xml  | 2 +-
 external/storm-hbase/pom.xml  | 2 +-
 external/storm-hdfs/pom.xml   | 2 +-
 external/storm-hive/pom.xml   | 2 +-
 external/storm-jdbc/pom.xml   | 2 +-
 external/storm-jms/pom.xml| 2 +-
 external/storm-kafka-client/pom.xml   | 2 +-
 external/storm-kafka-monitor/pom.xml  | 2 +-
 external/storm-kafka/pom.xml  | 2 +-
 external/storm-kinesis/pom.xml| 2 +-
 external/storm-metrics/pom.xml| 2 +-
 external/storm-mongodb/pom.xml| 2 +-
 external/storm-mqtt/pom.xml   | 2 +-
 external/storm-opentsdb/pom.xml   | 2 +-
 external/storm-pmml/pom.xml   | 2 +-
 external/storm-redis/pom.xml  | 2 +-
 external/storm-solr/pom.xml   | 2 +-
 external/storm-submit-tools/pom.xml   | 2 +-
 pom.xml   | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml  | 2 +-
 storm-buildtools/storm-maven-plugins/pom.xml  | 2 +-
 storm-core/pom.xml| 2 +-
 storm-dist/binary/pom.xml | 2 +-
 storm-dist/source/pom.xml | 2 +-
 storm-multilang/javascript/pom.xml| 2 +-
 storm-multilang/python/pom.xml| 2 +-
 storm-multilang/ruby/pom.xml  | 2 +-
 storm-rename-hack/pom.xml | 2 +-
 57 files changed, 58 insertions(+), 58 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/f6907912/examples/storm-elasticsearch-examples/pom.xml
--
diff --git a/examples/storm-elasticsearch-examples/pom.xml 
b/examples/storm-elasticsearch-examples/pom.xml
index 3e3a9fe..348637a 100644
--- a/examples/storm-elasticsearch-examples/pom.xml
+++ 

[1/2] storm git commit: Revert "[maven-release-plugin] prepare for next development iteration"

[ptgoetz]

Repository: storm
Updated Branches:
  refs/heads/1.1.x-branch eb63a842c -> f6907912e


Revert "[maven-release-plugin] prepare for next development iteration"

This reverts commit c34f1bf4c800715372f5772b68781b96b71c4218.


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

Branch: refs/heads/1.1.x-branch
Commit: 45fe29e84796015f3cfd10f0c2a3f9ddd150fba2
Parents: eb63a84
Author: P. Taylor Goetz 
Authored: Thu Feb 1 14:34:18 2018 -0500
Committer: P. Taylor Goetz 
Committed: Thu Feb 1 14:34:18 2018 -0500

--
 examples/storm-elasticsearch-examples/pom.xml | 2 +-
 examples/storm-hbase-examples/pom.xml | 2 +-
 examples/storm-hdfs-examples/pom.xml  | 2 +-
 examples/storm-hive-examples/pom.xml  | 2 +-
 examples/storm-jdbc-examples/pom.xml  | 2 +-
 examples/storm-jms-examples/pom.xml   | 2 +-
 examples/storm-kafka-client-examples/pom.xml  | 2 +-
 examples/storm-kafka-examples/pom.xml | 2 +-
 examples/storm-mongodb-examples/pom.xml   | 2 +-
 examples/storm-mqtt-examples/pom.xml  | 2 +-
 examples/storm-opentsdb-examples/pom.xml  | 2 +-
 examples/storm-perf/pom.xml   | 2 +-
 examples/storm-pmml-examples/pom.xml  | 2 +-
 examples/storm-redis-examples/pom.xml | 2 +-
 examples/storm-solr-examples/pom.xml  | 2 +-
 examples/storm-starter/pom.xml| 2 +-
 external/flux/flux-core/pom.xml   | 2 +-
 external/flux/flux-wrappers/pom.xml   | 2 +-
 external/flux/pom.xml | 2 +-
 external/sql/pom.xml  | 2 +-
 external/sql/storm-sql-core/pom.xml   | 2 +-
 external/sql/storm-sql-external/storm-sql-hdfs/pom.xml| 2 +-
 external/sql/storm-sql-external/storm-sql-kafka/pom.xml   | 2 +-
 external/sql/storm-sql-external/storm-sql-mongodb/pom.xml | 2 +-
 external/sql/storm-sql-external/storm-sql-redis/pom.xml   | 2 +-
 external/sql/storm-sql-runtime/pom.xml| 2 +-
 external/storm-cassandra/pom.xml  | 2 +-
 external/storm-druid/pom.xml  | 2 +-
 external/storm-elasticsearch/pom.xml  | 2 +-
 external/storm-eventhubs/pom.xml  | 2 +-
 external/storm-hbase/pom.xml  | 2 +-
 external/storm-hdfs/pom.xml   | 2 +-
 external/storm-hive/pom.xml   | 2 +-
 external/storm-jdbc/pom.xml   | 2 +-
 external/storm-jms/pom.xml| 2 +-
 external/storm-kafka-client/pom.xml   | 2 +-
 external/storm-kafka-monitor/pom.xml  | 2 +-
 external/storm-kafka/pom.xml  | 2 +-
 external/storm-kinesis/pom.xml| 2 +-
 external/storm-metrics/pom.xml| 2 +-
 external/storm-mongodb/pom.xml| 2 +-
 external/storm-mqtt/pom.xml   | 2 +-
 external/storm-opentsdb/pom.xml   | 2 +-
 external/storm-pmml/pom.xml   | 2 +-
 external/storm-redis/pom.xml  | 2 +-
 external/storm-solr/pom.xml   | 2 +-
 external/storm-submit-tools/pom.xml   | 2 +-
 pom.xml   | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml  | 2 +-
 storm-buildtools/storm-maven-plugins/pom.xml  | 2 +-
 storm-core/pom.xml| 2 +-
 storm-dist/binary/pom.xml | 2 +-
 storm-dist/source/pom.xml | 2 +-
 storm-multilang/javascript/pom.xml| 2 +-
 storm-multilang/python/pom.xml| 2 +-
 storm-multilang/ruby/pom.xml  | 2 +-
 storm-rename-hack/pom.xml | 2 +-
 57 files changed, 58 insertions(+), 58 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/45fe29e8/examples/storm-elasticsearch-examples/pom.xml
--
diff --git a/examples/storm-elasticsearch-examples/pom.xml 
b/examples/storm-elasticsearch-examples/pom.xml

[storm] Git Push Summary

[ptgoetz]

Repository: storm
Updated Tags:  refs/tags/v1.1.2 [deleted] bb1a8f6e7

[1/3] storm git commit: Revert "[maven-release-plugin] prepare for next development iteration"

[ptgoetz]

Repository: storm
Updated Branches:
  refs/heads/1.0.x-branch 67dc3611a -> 174f4862f


Revert "[maven-release-plugin] prepare for next development iteration"

This reverts commit aa32bb742e163e9a6468a60510dc952ccdfb43ed.


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

Branch: refs/heads/1.0.x-branch
Commit: f887e534e72fba8731493dd69cc97553f994a1fe
Parents: aa32bb7
Author: P. Taylor Goetz 
Authored: Thu Feb 1 14:31:55 2018 -0500
Committer: P. Taylor Goetz 
Committed: Thu Feb 1 14:31:55 2018 -0500

--
 examples/storm-starter/pom.xml   | 2 +-
 external/flux/flux-core/pom.xml  | 2 +-
 external/flux/flux-examples/pom.xml  | 2 +-
 external/flux/flux-wrappers/pom.xml  | 2 +-
 external/flux/pom.xml| 2 +-
 external/sql/pom.xml | 2 +-
 external/sql/storm-sql-core/pom.xml  | 2 +-
 external/sql/storm-sql-kafka/pom.xml | 2 +-
 external/sql/storm-sql-runtime/pom.xml   | 2 +-
 external/storm-cassandra/pom.xml | 2 +-
 external/storm-elasticsearch/pom.xml | 2 +-
 external/storm-eventhubs/pom.xml | 4 ++--
 external/storm-hbase/pom.xml | 2 +-
 external/storm-hdfs/pom.xml  | 2 +-
 external/storm-hive/pom.xml  | 2 +-
 external/storm-jdbc/pom.xml  | 2 +-
 external/storm-jms/core/pom.xml  | 2 +-
 external/storm-jms/examples/pom.xml  | 2 +-
 external/storm-jms/pom.xml   | 2 +-
 external/storm-kafka-client/pom.xml  | 2 +-
 external/storm-kafka/pom.xml | 2 +-
 external/storm-metrics/pom.xml   | 2 +-
 external/storm-mongodb/pom.xml   | 2 +-
 external/storm-mqtt/core/pom.xml | 2 +-
 external/storm-mqtt/examples/pom.xml | 2 +-
 external/storm-mqtt/pom.xml  | 2 +-
 external/storm-redis/pom.xml | 2 +-
 external/storm-solr/pom.xml  | 2 +-
 pom.xml  | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-buildtools/storm-maven-plugins/pom.xml | 2 +-
 storm-core/pom.xml   | 2 +-
 storm-dist/binary/pom.xml| 2 +-
 storm-dist/source/pom.xml| 2 +-
 storm-multilang/javascript/pom.xml   | 2 +-
 storm-multilang/python/pom.xml   | 2 +-
 storm-multilang/ruby/pom.xml | 2 +-
 storm-rename-hack/pom.xml| 2 +-
 38 files changed, 40 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/f887e534/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index ff61bca..d53be60 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   
   storm
   org.apache.storm
-  1.0.7-SNAPSHOT
+  1.0.6
   ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/storm/blob/f887e534/external/flux/flux-core/pom.xml
--
diff --git a/external/flux/flux-core/pom.xml b/external/flux/flux-core/pom.xml
index 0fdef1e..c2a77df 100644
--- a/external/flux/flux-core/pom.xml
+++ b/external/flux/flux-core/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-1.0.7-SNAPSHOT
+1.0.6
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/f887e534/external/flux/flux-examples/pom.xml
--
diff --git a/external/flux/flux-examples/pom.xml 
b/external/flux/flux-examples/pom.xml
index d9cb2e0..b02c4fd 100644
--- a/external/flux/flux-examples/pom.xml
+++ b/external/flux/flux-examples/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-1.0.7-SNAPSHOT
+1.0.6
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/f887e534/external/flux/flux-wrappers/pom.xml

[2/3] storm git commit: Revert "[maven-release-plugin] prepare release v1.0.6"

[ptgoetz]

Revert "[maven-release-plugin] prepare release v1.0.6"

This reverts commit fe9819275e566a164d90cca6c46e7f06d4b7706c.


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

Branch: refs/heads/1.0.x-branch
Commit: 773cded3bdabc82e977c73e4137bfac4fca2192d
Parents: f887e53
Author: P. Taylor Goetz 
Authored: Thu Feb 1 14:31:58 2018 -0500
Committer: P. Taylor Goetz 
Committed: Thu Feb 1 14:31:58 2018 -0500

--
 examples/storm-starter/pom.xml   | 2 +-
 external/flux/flux-core/pom.xml  | 2 +-
 external/flux/flux-examples/pom.xml  | 2 +-
 external/flux/flux-wrappers/pom.xml  | 2 +-
 external/flux/pom.xml| 2 +-
 external/sql/pom.xml | 2 +-
 external/sql/storm-sql-core/pom.xml  | 2 +-
 external/sql/storm-sql-kafka/pom.xml | 2 +-
 external/sql/storm-sql-runtime/pom.xml   | 2 +-
 external/storm-cassandra/pom.xml | 2 +-
 external/storm-elasticsearch/pom.xml | 2 +-
 external/storm-eventhubs/pom.xml | 4 ++--
 external/storm-hbase/pom.xml | 2 +-
 external/storm-hdfs/pom.xml  | 2 +-
 external/storm-hive/pom.xml  | 2 +-
 external/storm-jdbc/pom.xml  | 2 +-
 external/storm-jms/core/pom.xml  | 2 +-
 external/storm-jms/examples/pom.xml  | 2 +-
 external/storm-jms/pom.xml   | 2 +-
 external/storm-kafka-client/pom.xml  | 2 +-
 external/storm-kafka/pom.xml | 2 +-
 external/storm-metrics/pom.xml   | 2 +-
 external/storm-mongodb/pom.xml   | 2 +-
 external/storm-mqtt/core/pom.xml | 2 +-
 external/storm-mqtt/examples/pom.xml | 2 +-
 external/storm-mqtt/pom.xml  | 2 +-
 external/storm-redis/pom.xml | 2 +-
 external/storm-solr/pom.xml  | 2 +-
 pom.xml  | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-buildtools/storm-maven-plugins/pom.xml | 2 +-
 storm-core/pom.xml   | 2 +-
 storm-dist/binary/pom.xml| 2 +-
 storm-dist/source/pom.xml| 2 +-
 storm-multilang/javascript/pom.xml   | 2 +-
 storm-multilang/python/pom.xml   | 2 +-
 storm-multilang/ruby/pom.xml | 2 +-
 storm-rename-hack/pom.xml| 2 +-
 38 files changed, 40 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/773cded3/examples/storm-starter/pom.xml
--
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index d53be60..28a0036 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   
   storm
   org.apache.storm
-  1.0.6
+  1.0.6-SNAPSHOT
   ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/storm/blob/773cded3/external/flux/flux-core/pom.xml
--
diff --git a/external/flux/flux-core/pom.xml b/external/flux/flux-core/pom.xml
index c2a77df..823a921 100644
--- a/external/flux/flux-core/pom.xml
+++ b/external/flux/flux-core/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-1.0.6
+1.0.6-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/773cded3/external/flux/flux-examples/pom.xml
--
diff --git a/external/flux/flux-examples/pom.xml 
b/external/flux/flux-examples/pom.xml
index b02c4fd..ee78297 100644
--- a/external/flux/flux-examples/pom.xml
+++ b/external/flux/flux-examples/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.storm
 flux
-1.0.6
+1.0.6-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/storm/blob/773cded3/external/flux/flux-wrappers/pom.xml
--
diff --git a/external/flux/flux-wrappers/pom.xml 

[3/3] storm git commit: Merge branch '1.0.x-branch' of https://git-wip-us.apache.org/repos/asf/storm into 1.0.x-branch

[ptgoetz]

Merge branch '1.0.x-branch' of https://git-wip-us.apache.org/repos/asf/storm 
into 1.0.x-branch


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

Branch: refs/heads/1.0.x-branch
Commit: 174f4862f175b57a1888e239800a6fdd43159089
Parents: 773cded 67dc361
Author: P. Taylor Goetz 
Authored: Thu Feb 1 14:32:26 2018 -0500
Committer: P. Taylor Goetz 
Committed: Thu Feb 1 14:32:26 2018 -0500

--
 conf/defaults.yaml  |   1 +
 storm-core/src/jvm/org/apache/storm/Config.java |   7 +
 .../org/apache/storm/utils/NimbusClient.java|  13 +-
 storm-core/src/ui/public/component.html |  22 +--
 storm-core/src/ui/public/index.html | 146 +--
 storm-core/src/ui/public/topology.html  |  22 +--
 6 files changed, 112 insertions(+), 99 deletions(-)
--

[storm] Git Push Summary

[ptgoetz]

Repository: storm
Updated Tags:  refs/tags/v1.0.6 [deleted] 93e013caa

[2/2] storm git commit: Merge branch 'STORM-2877-1.x' of https://github.com/srishtyagrawal/storm into STORM-2877-1.x-merge

[kabhwan]

Merge branch 'STORM-2877-1.x' of https://github.com/srishtyagrawal/storm into 
STORM-2877-1.x-merge


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

Branch: refs/heads/1.x-branch
Commit: 1b0e88e2f5fc5919089cb613d16eb8ff3f0838d9
Parents: 3da2a49 075f9e1
Author: Jungtaek Lim 
Authored: Fri Feb 2 00:27:29 2018 +0900
Committer: Jungtaek Lim 
Committed: Fri Feb 2 00:27:29 2018 +0900

--
 conf/defaults.yaml  |   1 +
 storm-core/src/jvm/org/apache/storm/Config.java |   7 +
 storm-core/src/ui/public/component.html |  22 +--
 storm-core/src/ui/public/index.html | 148 +--
 storm-core/src/ui/public/topology.html  |  22 +--
 5 files changed, 106 insertions(+), 94 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/1b0e88e2/conf/defaults.yaml
--

http://git-wip-us.apache.org/repos/asf/storm/blob/1b0e88e2/storm-core/src/jvm/org/apache/storm/Config.java
--

[2/2] storm git commit: Merge branch 'STORM-2877-1.1.x-merge' into 1.1.x-branch

[kabhwan]

Merge branch 'STORM-2877-1.1.x-merge' into 1.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/eb63a842
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/eb63a842
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/eb63a842

Branch: refs/heads/1.1.x-branch
Commit: eb63a842c943762e3d3cb63c61471f2f4bdfe795
Parents: f94ecf9 f327c98
Author: Jungtaek Lim 
Authored: Fri Feb 2 00:29:53 2018 +0900
Committer: Jungtaek Lim 
Committed: Fri Feb 2 00:29:53 2018 +0900

--
 conf/defaults.yaml  |   1 +
 storm-core/src/jvm/org/apache/storm/Config.java |   7 +
 storm-core/src/ui/public/component.html |  22 +--
 storm-core/src/ui/public/index.html | 148 +--
 storm-core/src/ui/public/topology.html  |  22 +--
 5 files changed, 106 insertions(+), 94 deletions(-)
--

[1/2] storm git commit: STORM-2877: Add an option to configure pagination in Storm UI

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/1.x-branch 3da2a4966 -> 1b0e88e2f


STORM-2877: Add an option to configure pagination in Storm UI


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

Branch: refs/heads/1.x-branch
Commit: 075f9e1666eac72534ba7fdf4fff718fd52b4c3d
Parents: c335ad3
Author: Srishty Agrawal 
Authored: Thu Jan 25 12:45:11 2018 -0800
Committer: Srishty Agrawal 
Committed: Thu Jan 25 13:47:13 2018 -0800

--
 conf/defaults.yaml  |   1 +
 storm-core/src/jvm/org/apache/storm/Config.java |   7 +
 storm-core/src/ui/public/component.html |  22 +--
 storm-core/src/ui/public/index.html | 148 +--
 storm-core/src/ui/public/topology.html  |  22 +--
 5 files changed, 106 insertions(+), 94 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/075f9e16/conf/defaults.yaml
--
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 435a7e8..46d08ac 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -92,6 +92,7 @@ ui.users: null
 ui.header.buffer.bytes: 4096
 ui.http.creds.plugin: 
org.apache.storm.security.auth.DefaultHttpCredentialsPlugin
 ui.http.x-frame-options: DENY
+ui.pagination: 20
 
 logviewer.port: 8000
 logviewer.childopts: "-Xmx128m"

http://git-wip-us.apache.org/repos/asf/storm/blob/075f9e16/storm-core/src/jvm/org/apache/storm/Config.java
--
diff --git a/storm-core/src/jvm/org/apache/storm/Config.java 
b/storm-core/src/jvm/org/apache/storm/Config.java
index 35b4fbd..cb1cca7 100644
--- a/storm-core/src/jvm/org/apache/storm/Config.java
+++ b/storm-core/src/jvm/org/apache/storm/Config.java
@@ -735,6 +735,13 @@ public class Config extends HashMap {
 public static final String UI_CENTRAL_LOGGING_URL = 
"ui.central.logging.url";
 
 /**
+ * Storm UI drop-down pagination value. Set ui.pagination to be a positive 
integer
+ * or -1 (displays all entries). Valid values: -1, 10, 20, 25 etc.
+ */
+@isInteger
+public static final String UI_PAGINATION = "ui.pagination";
+
+/**
  * HTTP UI port for log viewer
  */
 @isInteger

http://git-wip-us.apache.org/repos/asf/storm/blob/075f9e16/storm-core/src/ui/public/component.html
--
diff --git a/storm-core/src/ui/public/component.html 
b/storm-core/src/ui/public/component.html
index 942b12d..64bc84d 100644
--- a/storm-core/src/ui/public/component.html
+++ b/storm-core/src/ui/public/component.html
@@ -140,16 +140,18 @@ $(document).ready(function() {
 var url = 
"/api/v1/topology/"+topologyId+"/component/"+componentId+"?sys="+sys;
 if(window) url += "="+window;
 
-$.extend( $.fn.dataTable.defaults, {
-  stateSave: true,
-  stateSaveCallback: function (oSettings, oData) {
-sessionStorage.setItem( oSettings.sTableId.concat(tableStateKey), 
JSON.stringify(oData) );
-  },
-  stateLoadCallback: function (oSettings) {
-return JSON.parse( 
sessionStorage.getItem(oSettings.sTableId.concat(tableStateKey)) );
-  },
-  lengthMenu: [[20,40,60,100,-1], [20, 40, 60, 100, "All"]],
-  pageLength: 20
+$.getJSON("/api/v1/cluster/configuration",function(response,status,jqXHR) {
+$.extend( $.fn.dataTable.defaults, {
+  stateSave: true,
+  stateSaveCallback: function (oSettings, oData) {
+sessionStorage.setItem( oSettings.sTableId.concat(tableStateKey), 
JSON.stringify(oData) );
+  },
+  stateLoadCallback: function (oSettings) {
+return JSON.parse( 
sessionStorage.getItem(oSettings.sTableId.concat(tableStateKey)) );
+  },
+  lengthMenu: [[20,40,60,100,-1], [20, 40, 60, 100, "All"]],
+  pageLength: response["ui.pagination"]
+});
 });
 
 renderToggleSys($("#toggle-switch"));

http://git-wip-us.apache.org/repos/asf/storm/blob/075f9e16/storm-core/src/ui/public/index.html
--
diff --git a/storm-core/src/ui/public/index.html 
b/storm-core/src/ui/public/index.html
index 69081d4..62cfdbf 100644
--- a/storm-core/src/ui/public/index.html
+++ b/storm-core/src/ui/public/index.html
@@ -97,92 +97,92 @@ $(document).ajaxStart(function(){
 $.blockUI({ message: ' Loading 
summary...'});
 });
 $(document).ready(function() {
-$.extend( $.fn.dataTable.defaults, {
-  stateSave: true,
-  lengthMenu: 

[2/2] storm git commit: Merge branch 'STORM-2877-1.0.x' of https://github.com/srishtyagrawal/storm into STORM-2877-1.0.x-merge

[kabhwan]

Merge branch 'STORM-2877-1.0.x' of https://github.com/srishtyagrawal/storm into 
STORM-2877-1.0.x-merge


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

Branch: refs/heads/1.0.x-branch
Commit: 67dc3611a228d44ef13c511bb447f9cdfaeb82c4
Parents: 2a01ac7 70e1112
Author: Jungtaek Lim 
Authored: Fri Feb 2 00:30:23 2018 +0900
Committer: Jungtaek Lim 
Committed: Fri Feb 2 00:30:23 2018 +0900

--
 conf/defaults.yaml  |   1 +
 storm-core/src/jvm/org/apache/storm/Config.java |   7 +
 storm-core/src/ui/public/component.html |  22 +--
 storm-core/src/ui/public/index.html | 146 +--
 storm-core/src/ui/public/topology.html  |  22 +--
 5 files changed, 105 insertions(+), 93 deletions(-)
--

[1/2] storm git commit: STORM-2877: Add an option to configure pagination in Storm UI

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/1.1.x-branch f94ecf954 -> eb63a842c


STORM-2877: Add an option to configure pagination in Storm UI


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

Branch: refs/heads/1.1.x-branch
Commit: f327c98349fbbacc90fbd4839f0fabe29d2cb562
Parents: f94ecf9
Author: Srishty Agrawal 
Authored: Thu Jan 25 12:45:11 2018 -0800
Committer: Jungtaek Lim 
Committed: Fri Feb 2 00:29:47 2018 +0900

--
 conf/defaults.yaml  |   1 +
 storm-core/src/jvm/org/apache/storm/Config.java |   7 +
 storm-core/src/ui/public/component.html |  22 +--
 storm-core/src/ui/public/index.html | 148 +--
 storm-core/src/ui/public/topology.html  |  22 +--
 5 files changed, 106 insertions(+), 94 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/f327c983/conf/defaults.yaml
--
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index f89211b..46a4d87 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -92,6 +92,7 @@ ui.users: null
 ui.header.buffer.bytes: 4096
 ui.http.creds.plugin: 
org.apache.storm.security.auth.DefaultHttpCredentialsPlugin
 ui.http.x-frame-options: DENY
+ui.pagination: 20
 
 logviewer.port: 8000
 logviewer.childopts: "-Xmx128m"

http://git-wip-us.apache.org/repos/asf/storm/blob/f327c983/storm-core/src/jvm/org/apache/storm/Config.java
--
diff --git a/storm-core/src/jvm/org/apache/storm/Config.java 
b/storm-core/src/jvm/org/apache/storm/Config.java
index ba543be..370d027 100644
--- a/storm-core/src/jvm/org/apache/storm/Config.java
+++ b/storm-core/src/jvm/org/apache/storm/Config.java
@@ -732,6 +732,13 @@ public class Config extends HashMap {
 public static final String UI_CENTRAL_LOGGING_URL = 
"ui.central.logging.url";
 
 /**
+ * Storm UI drop-down pagination value. Set ui.pagination to be a positive 
integer
+ * or -1 (displays all entries). Valid values: -1, 10, 20, 25 etc.
+ */
+@isInteger
+public static final String UI_PAGINATION = "ui.pagination";
+
+/**
  * HTTP UI port for log viewer
  */
 @isInteger

http://git-wip-us.apache.org/repos/asf/storm/blob/f327c983/storm-core/src/ui/public/component.html
--
diff --git a/storm-core/src/ui/public/component.html 
b/storm-core/src/ui/public/component.html
index 942b12d..64bc84d 100644
--- a/storm-core/src/ui/public/component.html
+++ b/storm-core/src/ui/public/component.html
@@ -140,16 +140,18 @@ $(document).ready(function() {
 var url = 
"/api/v1/topology/"+topologyId+"/component/"+componentId+"?sys="+sys;
 if(window) url += "="+window;
 
-$.extend( $.fn.dataTable.defaults, {
-  stateSave: true,
-  stateSaveCallback: function (oSettings, oData) {
-sessionStorage.setItem( oSettings.sTableId.concat(tableStateKey), 
JSON.stringify(oData) );
-  },
-  stateLoadCallback: function (oSettings) {
-return JSON.parse( 
sessionStorage.getItem(oSettings.sTableId.concat(tableStateKey)) );
-  },
-  lengthMenu: [[20,40,60,100,-1], [20, 40, 60, 100, "All"]],
-  pageLength: 20
+$.getJSON("/api/v1/cluster/configuration",function(response,status,jqXHR) {
+$.extend( $.fn.dataTable.defaults, {
+  stateSave: true,
+  stateSaveCallback: function (oSettings, oData) {
+sessionStorage.setItem( oSettings.sTableId.concat(tableStateKey), 
JSON.stringify(oData) );
+  },
+  stateLoadCallback: function (oSettings) {
+return JSON.parse( 
sessionStorage.getItem(oSettings.sTableId.concat(tableStateKey)) );
+  },
+  lengthMenu: [[20,40,60,100,-1], [20, 40, 60, 100, "All"]],
+  pageLength: response["ui.pagination"]
+});
 });
 
 renderToggleSys($("#toggle-switch"));

http://git-wip-us.apache.org/repos/asf/storm/blob/f327c983/storm-core/src/ui/public/index.html
--
diff --git a/storm-core/src/ui/public/index.html 
b/storm-core/src/ui/public/index.html
index 69081d4..62cfdbf 100644
--- a/storm-core/src/ui/public/index.html
+++ b/storm-core/src/ui/public/index.html
@@ -97,92 +97,92 @@ $(document).ajaxStart(function(){
 $.blockUI({ message: ' Loading 
summary...'});
 });
 $(document).ready(function() {
-$.extend( $.fn.dataTable.defaults, {
-  stateSave: true,
-  lengthMenu: [[20,40,60,100,-1], 

[1/2] storm git commit: STORM-2877: Add an option to configure pagination in Storm UI

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/1.0.x-branch 2a01ac782 -> 67dc3611a


STORM-2877: Add an option to configure pagination in Storm UI


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

Branch: refs/heads/1.0.x-branch
Commit: 70e111204227b351132a2924d72800a598147017
Parents: ec6eef7
Author: Srishty Agrawal 
Authored: Thu Jan 25 12:20:17 2018 -0800
Committer: Srishty Agrawal 
Committed: Thu Jan 25 13:43:44 2018 -0800

--
 conf/defaults.yaml  |   1 +
 storm-core/src/jvm/org/apache/storm/Config.java |   7 +
 storm-core/src/ui/public/component.html |  22 +--
 storm-core/src/ui/public/index.html | 146 +--
 storm-core/src/ui/public/topology.html  |  22 +--
 5 files changed, 105 insertions(+), 93 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/70e11120/conf/defaults.yaml
--
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 4c42eb1..ceabd59 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -91,6 +91,7 @@ ui.users: null
 ui.header.buffer.bytes: 4096
 ui.http.creds.plugin: 
org.apache.storm.security.auth.DefaultHttpCredentialsPlugin
 ui.http.x-frame-options: DENY
+ui.pagination: 20
 
 logviewer.port: 8000
 logviewer.childopts: "-Xmx128m"

http://git-wip-us.apache.org/repos/asf/storm/blob/70e11120/storm-core/src/jvm/org/apache/storm/Config.java
--
diff --git a/storm-core/src/jvm/org/apache/storm/Config.java 
b/storm-core/src/jvm/org/apache/storm/Config.java
index 7427d1b..b626495 100644
--- a/storm-core/src/jvm/org/apache/storm/Config.java
+++ b/storm-core/src/jvm/org/apache/storm/Config.java
@@ -725,6 +725,13 @@ public class Config extends HashMap {
 public static final String UI_CENTRAL_LOGGING_URL = 
"ui.central.logging.url";
 
 /**
+ * Storm UI drop-down pagination value. Set ui.pagination to be a positive 
integer
+ * or -1 (displays all entries). Valid values: -1, 10, 20, 25 etc.
+ */
+@isInteger
+public static final String UI_PAGINATION = "ui.pagination";
+
+/**
  * HTTP UI port for log viewer
  */
 @isInteger

http://git-wip-us.apache.org/repos/asf/storm/blob/70e11120/storm-core/src/ui/public/component.html
--
diff --git a/storm-core/src/ui/public/component.html 
b/storm-core/src/ui/public/component.html
index f009fc1..641ccaf 100644
--- a/storm-core/src/ui/public/component.html
+++ b/storm-core/src/ui/public/component.html
@@ -140,16 +140,18 @@ $(document).ready(function() {
 var url = 
"/api/v1/topology/"+topologyId+"/component/"+componentId+"?sys="+sys;
 if(window) url += "="+window;
 
-$.extend( $.fn.dataTable.defaults, {
-  stateSave: true,
-  stateSaveCallback: function (oSettings, oData) {
-sessionStorage.setItem( oSettings.sTableId.concat(tableStateKey), 
JSON.stringify(oData) );
-  },
-  stateLoadCallback: function (oSettings) {
-return JSON.parse( 
sessionStorage.getItem(oSettings.sTableId.concat(tableStateKey)) );
-  },
-  lengthMenu: [[20,40,60,100,-1], [20, 40, 60, 100, "All"]],
-  pageLength: 20
+$.getJSON("/api/v1/cluster/configuration",function(response,status,jqXHR) {
+$.extend( $.fn.dataTable.defaults, {
+  stateSave: true,
+  stateSaveCallback: function (oSettings, oData) {
+sessionStorage.setItem( oSettings.sTableId.concat(tableStateKey), 
JSON.stringify(oData) );
+  },
+  stateLoadCallback: function (oSettings) {
+return JSON.parse( 
sessionStorage.getItem(oSettings.sTableId.concat(tableStateKey)) );
+  },
+  lengthMenu: [[20,40,60,100,-1], [20, 40, 60, 100, "All"]],
+  pageLength: response["ui.pagination"]
+});
 });
 
 renderToggleSys($("#toggle-switch"));

http://git-wip-us.apache.org/repos/asf/storm/blob/70e11120/storm-core/src/ui/public/index.html
--
diff --git a/storm-core/src/ui/public/index.html 
b/storm-core/src/ui/public/index.html
index 52900a5..c6105ab 100644
--- a/storm-core/src/ui/public/index.html
+++ b/storm-core/src/ui/public/index.html
@@ -86,87 +86,87 @@ $(document).ajaxStart(function(){
 $.blockUI({ message: ' Loading 
summary...'});
 });
 $(document).ready(function() {
-$.extend( $.fn.dataTable.defaults, {
-  stateSave: true,
-  lengthMenu: 

[3/3] storm git commit: Merge branch 'STORM-2916' of https://github.com/Ethanlm/storm into STORM-2916-merge

[kabhwan]

Merge branch 'STORM-2916' of https://github.com/Ethanlm/storm into 
STORM-2916-merge


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

Branch: refs/heads/master
Commit: d68416b2447756e2fdf31ef63cbd3428eb299899
Parents: 18045a3 f58d472
Author: Jungtaek Lim 
Authored: Fri Feb 2 00:24:05 2018 +0900
Committer: Jungtaek Lim 
Committed: Fri Feb 2 00:24:05 2018 +0900

--
 external/storm-blobstore-migration/pom.xml  |   2 +-
 external/storm-hdfs-blobstore/pom.xml   | 251 +
 .../storm/hdfs/blobstore/HdfsBlobStore.java | 394 ++
 .../storm/hdfs/blobstore/HdfsBlobStoreFile.java | 196 +++
 .../storm/hdfs/blobstore/HdfsBlobStoreImpl.java | 312 +++
 .../hdfs/blobstore/HdfsClientBlobStore.java | 130 +
 .../storm/hdfs/blobstore/BlobStoreTest.java | 540 ++
 .../hdfs/blobstore/HdfsBlobStoreImplTest.java   | 224 
 .../storm/hdfs/blobstore/HdfsBlobStore.java | 395 --
 .../storm/hdfs/blobstore/HdfsBlobStoreFile.java | 196 ---
 .../storm/hdfs/blobstore/HdfsBlobStoreImpl.java | 312 ---
 .../hdfs/blobstore/HdfsClientBlobStore.java | 130 -
 .../storm/hdfs/blobstore/BlobStoreTest.java | 544 ---
 .../hdfs/blobstore/HdfsBlobStoreImplTest.java   | 226 
 pom.xml |   1 +
 15 files changed, 2049 insertions(+), 1804 deletions(-)
--

[1/3] storm git commit: [STORM-2916] separate hdfs-blobstore from storm-hdfs

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/master 18045a3fc -> d68416b24


http://git-wip-us.apache.org/repos/asf/storm/blob/f58d4729/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java
--
diff --git 
a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java
 
b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java
deleted file mode 100644
index 7130153..000
--- 
a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/**
- * 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.hdfs.blobstore;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import javax.security.auth.Subject;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.storm.Config;
-import org.apache.storm.blobstore.AtomicOutputStream;
-import org.apache.storm.blobstore.BlobStore;
-import org.apache.storm.blobstore.BlobStoreAclHandler;
-import org.apache.storm.blobstore.BlobStoreFile;
-import org.apache.storm.blobstore.InputStreamWithMeta;
-import org.apache.storm.generated.AuthorizationException;
-import org.apache.storm.generated.KeyAlreadyExistsException;
-import org.apache.storm.generated.KeyNotFoundException;
-import org.apache.storm.generated.ReadableBlobMeta;
-import org.apache.storm.generated.SettableBlobMeta;
-import org.apache.storm.nimbus.NimbusInfo;
-import org.apache.storm.utils.Utils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.apache.storm.blobstore.BlobStoreAclHandler.ADMIN;
-import static org.apache.storm.blobstore.BlobStoreAclHandler.READ;
-import static org.apache.storm.blobstore.BlobStoreAclHandler.WRITE;
-
-/**
- * Provides a HDFS file system backed blob store implementation.
- * Note that this provides an api for having HDFS be the backing store for the 
blobstore,
- * it is not a service/daemon.
- *
- * We currently have NIMBUS_ADMINS and SUPERVISOR_ADMINS configuration. 
NIMBUS_ADMINS are given READ, WRITE and ADMIN
- * access whereas the SUPERVISOR_ADMINS are given READ access in order to read 
and download the blobs form the nimbus.
- *
- * The ACLs for the blob store are validated against whether the subject is a 
NIMBUS_ADMIN, SUPERVISOR_ADMIN or USER
- * who has read, write or admin privileges in order to perform respective 
operations on the blob.
- *
- * For hdfs blob store
- * 1. The USER interacts with nimbus to upload and access blobs through 
NimbusBlobStore Client API. Here, unlike
- * local blob store which stores the blobs locally, the nimbus talks to HDFS 
to upload the blobs.
- * 2. The USER sets the ACLs, and the blob access is validated against these 
ACLs.
- * 3. The SUPERVISOR interacts with nimbus through HdfsClientBlobStore to 
download the blobs. Here, unlike local
- * blob store the supervisor interacts with HDFS directly to download the 
blobs. The call to HdfsBlobStore is made as a "null"
- * subject. The blobstore gets the hadoop user and validates permissions for 
the supervisor.
- */
-public class HdfsBlobStore extends BlobStore {
-public static final Logger LOG = 
LoggerFactory.getLogger(HdfsBlobStore.class);
-private static final String DATA_PREFIX = "data_";
-private static final String META_PREFIX = "meta_";
-private static final HashMap alreadyLoggedInUsers = new 
HashMap<>();
-
-private BlobStoreAclHandler aclHandler;
-private HdfsBlobStoreImpl hbs;
-private Subject localSubject;
-private Map conf;
-
-/**
- * Get the subject from Hadoop so we can use it to validate the acls. 
There is no direct
- * interface from UserGroupInformation to get the subject, so do a doAs 
and get the context.
- * We could probably run everything 

[2/3] storm git commit: [STORM-2916] separate hdfs-blobstore from storm-hdfs

[kabhwan]

[STORM-2916] separate hdfs-blobstore from storm-hdfs


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

Branch: refs/heads/master
Commit: f58d472994297d240af8a478d660c3be8a69bd97
Parents: f37a6bd
Author: Ethan Li 
Authored: Mon Jan 29 16:15:01 2018 -0600
Committer: Ethan Li 
Committed: Tue Jan 30 15:05:38 2018 -0600

--
 external/storm-blobstore-migration/pom.xml  |   2 +-
 external/storm-hdfs-blobstore/pom.xml   | 251 +
 .../storm/hdfs/blobstore/HdfsBlobStore.java | 394 ++
 .../storm/hdfs/blobstore/HdfsBlobStoreFile.java | 196 +++
 .../storm/hdfs/blobstore/HdfsBlobStoreImpl.java | 312 +++
 .../hdfs/blobstore/HdfsClientBlobStore.java | 130 +
 .../storm/hdfs/blobstore/BlobStoreTest.java | 540 ++
 .../hdfs/blobstore/HdfsBlobStoreImplTest.java   | 224 
 .../storm/hdfs/blobstore/HdfsBlobStore.java | 395 --
 .../storm/hdfs/blobstore/HdfsBlobStoreFile.java | 196 ---
 .../storm/hdfs/blobstore/HdfsBlobStoreImpl.java | 312 ---
 .../hdfs/blobstore/HdfsClientBlobStore.java | 130 -
 .../storm/hdfs/blobstore/BlobStoreTest.java | 544 ---
 .../hdfs/blobstore/HdfsBlobStoreImplTest.java   | 226 
 pom.xml |   1 +
 15 files changed, 2049 insertions(+), 1804 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/f58d4729/external/storm-blobstore-migration/pom.xml
--
diff --git a/external/storm-blobstore-migration/pom.xml 
b/external/storm-blobstore-migration/pom.xml
index c530eec..bd1af90 100644
--- a/external/storm-blobstore-migration/pom.xml
+++ b/external/storm-blobstore-migration/pom.xml
@@ -47,7 +47,7 @@ limitations under the License.
 
 
 org.apache.storm
-storm-hdfs
+storm-hdfs-blobstore
 ${project.version}
 
 
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+
+storm
+org.apache.storm
+2.0.0-SNAPSHOT
+../../pom.xml
+
+
+storm-hdfs-blobstore
+
+
+
+ptgoetz
+P. Taylor Goetz
+ptgo...@gmail.com
+
+
+
+
+
+org.apache.storm
+storm-client
+${project.version}
+${provided.scope}
+
+
+
+org.slf4j
+log4j-over-slf4j
+
+
+
+
+org.apache.hadoop
+hadoop-hdfs
+${hadoop.version}
+
+
+junit
+junit
+
+
+org.mockito
+mockito-all
+
+
+org.mortbay.jetty
+jetty-util
+
+
+org.mortbay.jetty
+jetty
+
+
+javax.servlet
+servlet-api
+
+
+com.sun.jersey
+jersey-core
+
+
+com.sun.jersey
+jersey-server
+
+
+javax.servlet.jsp
+jsp-api
+
+
+org.slf4j
+slf4j-api
+
+
+commons-codec
+commons-codec
+
+
+log4j
+log4j
+
+
+org.slf4j
+slf4j-log4j12
+
+
+org.apache.hadoop
+hadoop-minikdc
+
+
+org.apache.directory.server
+apacheds-kerberos-codec
+
+
+log4j
+log4j
+
+
+org.apache.httpcomponents
+httpclient
+
+
+
+
+org.apache.hadoop
+

[1/2] storm git commit: STORM-2917: Check the derecated config nimbus.host

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/1.0.x-branch aa32bb742 -> 2a01ac782


STORM-2917: Check the derecated config nimbus.host

There is a situation: the deployer wants to use the new nimbus 
config(nimbus.seeds), but still leave the blank deprecated config(nimbus.host) 
in storm.yaml. It will not work.

Fixed merge conflict by Jungtaek Lim 

To avoid this, the program should at least check whether the deprecated config 
is blank.


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

Branch: refs/heads/1.0.x-branch
Commit: 08a0d41d80ac09f9df651a2f57231f2f46703281
Parents: aa32bb7
Author: MichealShin 
Authored: Tue Jan 30 17:42:38 2018 +0800
Committer: Jungtaek Lim 
Committed: Fri Feb 2 00:22:31 2018 +0900

--
 .../src/jvm/org/apache/storm/utils/NimbusClient.java   | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/08a0d41d/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java
--
diff --git a/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java 
b/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java
index e8cef09..3f49f1d 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java
@@ -17,6 +17,12 @@
  */
 package org.apache.storm.utils;
 
+import com.google.common.collect.Lists;
+import java.security.Principal;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
 import org.apache.storm.Config;
 import org.apache.storm.generated.ClusterSummary;
 import org.apache.storm.generated.Nimbus;
@@ -24,15 +30,10 @@ import org.apache.storm.generated.NimbusSummary;
 import org.apache.storm.security.auth.ReqContext;
 import org.apache.storm.security.auth.ThriftClient;
 import org.apache.storm.security.auth.ThriftConnectionType;
-import com.google.common.collect.Lists;
 import org.apache.thrift.transport.TTransportException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.security.Principal;
-import java.util.List;
-import java.util.Map;
-
 public class NimbusClient extends ThriftClient {
 private Nimbus.Client _client;
 private static final Logger LOG = 
LoggerFactory.getLogger(NimbusClient.class);
@@ -68,7 +69,7 @@ public class NimbusClient extends ThriftClient {
 }
 
 List seeds;
-if(conf.containsKey(Config.NIMBUS_HOST)) {
+if (conf.containsKey(Config.NIMBUS_HOST) && 
StringUtils.isNotBlank(conf.get(Config.NIMBUS_HOST).toString())) {
 LOG.warn("Using deprecated config {} for backward compatibility. 
Please update your storm.yaml so it only has config {}",
 Config.NIMBUS_HOST, Config.NIMBUS_SEEDS);
 seeds = 
Lists.newArrayList(conf.get(Config.NIMBUS_HOST).toString());

[2/2] storm git commit: Merge branch 'STORM-2917-1.0.x-merge' into 1.0.x-branch

[kabhwan]

Merge branch 'STORM-2917-1.0.x-merge' into 1.0.x-branch


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

Branch: refs/heads/1.0.x-branch
Commit: 2a01ac78203582774e45f46a874c7f1a8893e4b4
Parents: aa32bb7 08a0d41
Author: Jungtaek Lim 
Authored: Fri Feb 2 00:22:35 2018 +0900
Committer: Jungtaek Lim 
Committed: Fri Feb 2 00:22:35 2018 +0900

--
 .../src/jvm/org/apache/storm/utils/NimbusClient.java   | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)
--

[2/2] storm git commit: Merge branch 'STORM-2917-1.1.x-merge' into 1.1.x-branch

[kabhwan]

Merge branch 'STORM-2917-1.1.x-merge' into 1.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/f94ecf95
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f94ecf95
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f94ecf95

Branch: refs/heads/1.1.x-branch
Commit: f94ecf9541984cab04641bf12c278494359ee0ed
Parents: c34f1bf 49476be
Author: Jungtaek Lim 
Authored: Fri Feb 2 00:22:15 2018 +0900
Committer: Jungtaek Lim 
Committed: Fri Feb 2 00:22:15 2018 +0900

--
 .../src/jvm/org/apache/storm/utils/NimbusClient.java   | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)
--

[1/2] storm git commit: STORM-2917: Check the derecated config nimbus.host

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/1.1.x-branch c34f1bf4c -> f94ecf954


STORM-2917: Check the derecated config nimbus.host

There is a situation: the deployer wants to use the new nimbus 
config(nimbus.seeds), but still leave the blank deprecated config(nimbus.host) 
in storm.yaml. It will not work.

Fixed merge conflict by Jungtaek Lim 

To avoid this, the program should at least check whether the deprecated config 
is blank.


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

Branch: refs/heads/1.1.x-branch
Commit: 49476be60cf525bf04a2bf6bc3ce3107ff390e25
Parents: c34f1bf
Author: MichealShin 
Authored: Tue Jan 30 17:42:38 2018 +0800
Committer: Jungtaek Lim 
Committed: Fri Feb 2 00:22:07 2018 +0900

--
 .../src/jvm/org/apache/storm/utils/NimbusClient.java   | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/49476be6/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java
--
diff --git a/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java 
b/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java
index 6699ba8..091357e 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java
@@ -17,21 +17,22 @@
  */
 package org.apache.storm.utils;
 
+import com.google.common.collect.Lists;
+import java.security.Principal;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
 import org.apache.storm.Config;
 import org.apache.storm.generated.Nimbus;
 import org.apache.storm.generated.NimbusSummary;
 import org.apache.storm.security.auth.ReqContext;
 import org.apache.storm.security.auth.ThriftClient;
 import org.apache.storm.security.auth.ThriftConnectionType;
-import com.google.common.collect.Lists;
 import org.apache.thrift.transport.TTransportException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.security.Principal;
-import java.util.List;
-import java.util.Map;
-
 public class NimbusClient extends ThriftClient {
 private Nimbus.Client _client;
 private static final Logger LOG = 
LoggerFactory.getLogger(NimbusClient.class);
@@ -67,7 +68,7 @@ public class NimbusClient extends ThriftClient {
 }
 
 List seeds;
-if(conf.containsKey(Config.NIMBUS_HOST)) {
+if (conf.containsKey(Config.NIMBUS_HOST) && 
StringUtils.isNotBlank(conf.get(Config.NIMBUS_HOST).toString())) {
 LOG.warn("Using deprecated config {} for backward compatibility. 
Please update your storm.yaml so it only has config {}",
  Config.NIMBUS_HOST, Config.NIMBUS_SEEDS);
 seeds = 
Lists.newArrayList(conf.get(Config.NIMBUS_HOST).toString());

storm git commit: STORM-2917: Check the derecated config nimbus.host

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/master 1c7361982 -> 18045a3fc


STORM-2917: Check the derecated config nimbus.host

There is a situation: the deployer wants to use the new nimbus 
config(nimbus.seeds), but still leave the blank deprecated config(nimbus.host) 
in storm.yaml. It will not work.

To avoid this, the program should at least check whether the deprecated config 
is blank.

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

Branch: refs/heads/master
Commit: 18045a3fca0c2cc2f5f7cc0241233c25b17432fe
Parents: 1c73619
Author: MichealShin 
Authored: Tue Jan 30 17:42:38 2018 +0800
Committer: Jungtaek Lim 
Committed: Fri Feb 2 00:09:02 2018 +0900

--
 storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/18045a3f/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java
--
diff --git a/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java 
b/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java
index 2f4f6dd..e27304a 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/NimbusClient.java
@@ -23,6 +23,8 @@ import java.security.Principal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
 import org.apache.storm.Config;
 import org.apache.storm.generated.Nimbus;
 import org.apache.storm.generated.NimbusSummary;
@@ -131,7 +133,7 @@ public class NimbusClient extends ThriftClient {
 }
 
 List seeds;
-if (conf.containsKey(Config.NIMBUS_HOST)) {
+if (conf.containsKey(Config.NIMBUS_HOST) && 
StringUtils.isNotBlank(conf.get(Config.NIMBUS_HOST).toString())) {
 LOG.warn("Using deprecated config {} for backward compatibility. 
Please update your storm.yaml so it only has config {}",
  Config.NIMBUS_HOST, Config.NIMBUS_SEEDS);
 seeds = 
Lists.newArrayList(conf.get(Config.NIMBUS_HOST).toString());

[1/2] storm git commit: STORM-2917: Check the derecated config nimbus.host

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/1.x-branch 1c771c243 -> 3da2a4966


STORM-2917: Check the derecated config nimbus.host

There is a situation: the deployer wants to use the new nimbus 
config(nimbus.seeds), but still leave the blank deprecated config(nimbus.host) 
in storm.yaml. It will not work.

Fixed merge conflict by Jungtaek Lim 

To avoid this, the program should at least check whether the deprecated config 
is blank.


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

Branch: refs/heads/1.x-branch
Commit: 2f869cd4df2d4a1683e9802b87befed2e02e451d
Parents: 1c771c2
Author: MichealShin 
Authored: Tue Jan 30 17:42:38 2018 +0800
Committer: Jungtaek Lim 
Committed: Fri Feb 2 00:16:47 2018 +0900

--
 .../src/jvm/org/apache/storm/utils/NimbusClient.java   | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/2f869cd4/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java
--
diff --git a/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java 
b/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java
index 765362c..7c6f77a 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/NimbusClient.java
@@ -17,21 +17,22 @@
  */
 package org.apache.storm.utils;
 
+import com.google.common.collect.Lists;
+import java.security.Principal;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
 import org.apache.storm.Config;
 import org.apache.storm.generated.Nimbus;
 import org.apache.storm.generated.NimbusSummary;
 import org.apache.storm.security.auth.ReqContext;
 import org.apache.storm.security.auth.ThriftClient;
 import org.apache.storm.security.auth.ThriftConnectionType;
-import com.google.common.collect.Lists;
 import org.apache.thrift.transport.TTransportException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.security.Principal;
-import java.util.List;
-import java.util.Map;
-
 public class NimbusClient extends ThriftClient {
 private Nimbus.Client _client;
 private static final Logger LOG = 
LoggerFactory.getLogger(NimbusClient.class);
@@ -75,7 +76,7 @@ public class NimbusClient extends ThriftClient {
 }
 
 List seeds;
-if(conf.containsKey(Config.NIMBUS_HOST)) {
+if (conf.containsKey(Config.NIMBUS_HOST) && 
StringUtils.isNotBlank(conf.get(Config.NIMBUS_HOST).toString())) {
 LOG.warn("Using deprecated config {} for backward compatibility. 
Please update your storm.yaml so it only has config {}",
  Config.NIMBUS_HOST, Config.NIMBUS_SEEDS);
 seeds = 
Lists.newArrayList(conf.get(Config.NIMBUS_HOST).toString());

[2/2] storm git commit: Merge branch 'STORM-2917-1.x-merge' into 1.x-branch

[kabhwan]

Merge branch 'STORM-2917-1.x-merge' 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/3da2a496
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3da2a496
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3da2a496

Branch: refs/heads/1.x-branch
Commit: 3da2a496613e2ba1ae128fa925c07b838cefd28f
Parents: 1c771c2 2f869cd
Author: Jungtaek Lim 
Authored: Fri Feb 2 00:17:27 2018 +0900
Committer: Jungtaek Lim 
Committed: Fri Feb 2 00:17:27 2018 +0900

--
 .../src/jvm/org/apache/storm/utils/NimbusClient.java   | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)
--

[1/2] storm git commit: STORM-2907: Exclude curator dependencies from storm-core in storm-autocreds pom

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/1.x-branch 33f543cf6 -> 1c771c243


STORM-2907: Exclude curator dependencies from storm-core in storm-autocreds pom


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

Branch: refs/heads/1.x-branch
Commit: deb960fd43e5d1be26fa68e6c4571d24848c587f
Parents: f04b7a3
Author: Arun Mahadevan 
Authored: Tue Jan 23 14:13:20 2018 -0800
Committer: Arun Mahadevan 
Committed: Tue Jan 23 14:13:20 2018 -0800

--
 external/storm-autocreds/pom.xml | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/deb960fd/external/storm-autocreds/pom.xml
--
diff --git a/external/storm-autocreds/pom.xml b/external/storm-autocreds/pom.xml
index 30c10e7..81b869e 100644
--- a/external/storm-autocreds/pom.xml
+++ b/external/storm-autocreds/pom.xml
@@ -40,6 +40,18 @@
 org.slf4j
 log4j-over-slf4j
 
+
+org.apache.curator
+curator-client
+
+
+org.apache.curator
+curator-recipes
+
+
+org.apache.curator
+curator-framework
+
 
 
 
@@ -144,4 +156,4 @@
 
 
 
-
\ No newline at end of file
+

[2/2] storm git commit: Merge branch 'STORM-2907' of https://github.com/arunmahadevan/storm into STORM-2907-1.x-merge

[kabhwan]

Merge branch 'STORM-2907' of https://github.com/arunmahadevan/storm into 
STORM-2907-1.x-merge


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

Branch: refs/heads/1.x-branch
Commit: 1c771c24370d57c271d5151c4712bfe085963598
Parents: 33f543c deb960f
Author: Jungtaek Lim 
Authored: Fri Feb 2 00:02:00 2018 +0900
Committer: Jungtaek Lim 
Committed: Fri Feb 2 00:02:00 2018 +0900

--
 external/storm-autocreds/pom.xml | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/1c771c24/external/storm-autocreds/pom.xml
--

[2/3] storm git commit: Use 1.7 compatible Long size

[kabhwan]

Use 1.7 compatible Long size


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

Branch: refs/heads/1.x-branch
Commit: 14cb3a94a65136d016da25973d82e7177b2538ce
Parents: dd04a55
Author: Kishor Patil 
Authored: Tue Jan 23 12:39:46 2018 -0500
Committer: Kishor Patil 
Committed: Tue Jan 23 12:50:53 2018 -0500

--
 storm-core/src/clj/org/apache/storm/cluster.clj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/14cb3a94/storm-core/src/clj/org/apache/storm/cluster.clj
--
diff --git a/storm-core/src/clj/org/apache/storm/cluster.clj 
b/storm-core/src/clj/org/apache/storm/cluster.clj
index eafa40b..731a0b9 100644
--- a/storm-core/src/clj/org/apache/storm/cluster.clj
+++ b/storm-core/src/clj/org/apache/storm/cluster.clj
@@ -511,10 +511,10 @@
   existed (.node_exists cluster-state path false)]
   (if existed
 (if-not (<= timestamp 0)
-  (let [bytes (.. (ByteBuffer/allocate (Long/BYTES)) (putLong 
timestamp) (array))]
+  (let [bytes (.. (ByteBuffer/allocate (/ (Long/SIZE) 8)) (putLong 
timestamp) (array))]
 (.set_data cluster-state path bytes acls)))
 (when timestamp
-  (let [bytes (.. (ByteBuffer/allocate (Long/BYTES)) (putLong 
timestamp) (array))]
+  (let [bytes (.. (ByteBuffer/allocate (/ (Long/SIZE) 8)) (putLong 
timestamp) (array))]
 (.set_ephemeral_node cluster-state path bytes acls)) ;; 
create the znode since worker is congested
 
   (topology-backpressure

[3/3] storm git commit: Merge branch 'storm2873-1.x-branch' of https://github.com/kishorvpatil/incubator-storm into STORM-2873-1.x-merge

[kabhwan]

Merge branch 'storm2873-1.x-branch' of 
https://github.com/kishorvpatil/incubator-storm into STORM-2873-1.x-merge


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

Branch: refs/heads/1.x-branch
Commit: 33f543cf6211f8109d968bb27fecd40ae1f3a9d9
Parents: 49c2fc3 14cb3a9
Author: Jungtaek Lim 
Authored: Thu Feb 1 23:35:54 2018 +0900
Committer: Jungtaek Lim 
Committed: Thu Feb 1 23:35:54 2018 +0900

--
 conf/defaults.yaml  |  2 +
 storm-core/src/clj/org/apache/storm/cluster.clj | 63 ++
 .../src/clj/org/apache/storm/daemon/worker.clj  | 68 
 storm-core/src/jvm/org/apache/storm/Config.java | 17 +
 .../test/clj/org/apache/storm/cluster_test.clj  | 15 +
 5 files changed, 123 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/33f543cf/conf/defaults.yaml
--

http://git-wip-us.apache.org/repos/asf/storm/blob/33f543cf/storm-core/src/clj/org/apache/storm/daemon/worker.clj
--

http://git-wip-us.apache.org/repos/asf/storm/blob/33f543cf/storm-core/src/jvm/org/apache/storm/Config.java
--

[1/3] storm git commit: Adding backpressure timeout, backpressure znodes cleanup, Do not delete backpressure ephemeral node frequently

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/1.x-branch 49c2fc39f -> 33f543cf6


Adding backpressure timeout, backpressure znodes cleanup, Do not delete 
backpressure ephemeral node frequently


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

Branch: refs/heads/1.x-branch
Commit: dd04a5563317fa6f57d3d7ec32190940b98454d7
Parents: 58ae04b
Author: Kishor Patil 
Authored: Mon Jan 22 15:47:42 2018 -0500
Committer: Kishor Patil 
Committed: Mon Jan 22 15:47:52 2018 -0500

--
 conf/defaults.yaml  |  2 +
 storm-core/src/clj/org/apache/storm/cluster.clj | 63 ++
 .../src/clj/org/apache/storm/daemon/worker.clj  | 68 
 storm-core/src/jvm/org/apache/storm/Config.java | 17 +
 .../test/clj/org/apache/storm/cluster_test.clj  | 15 +
 5 files changed, 123 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/dd04a556/conf/defaults.yaml
--
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index f89211b..2bd7855 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -194,6 +194,8 @@ task.backpressure.poll.secs: 30
 topology.backpressure.enable: false
 backpressure.disruptor.high.watermark: 0.9
 backpressure.disruptor.low.watermark: 0.4
+backpressure.znode.timeout.secs: 30
+backpressure.znode.update.freq.secs: 15
 
 zmq.threads: 1
 zmq.linger.millis: 5000

http://git-wip-us.apache.org/repos/asf/storm/blob/dd04a556/storm-core/src/clj/org/apache/storm/cluster.clj
--
diff --git a/storm-core/src/clj/org/apache/storm/cluster.clj 
b/storm-core/src/clj/org/apache/storm/cluster.clj
index 810b3c3..eafa40b 100644
--- a/storm-core/src/clj/org/apache/storm/cluster.clj
+++ b/storm-core/src/clj/org/apache/storm/cluster.clj
@@ -18,7 +18,8 @@
   (:import [org.apache.zookeeper.data Stat ACL Id]
[org.apache.storm.generated SupervisorInfo Assignment StormBase 
ClusterWorkerHeartbeat ErrorInfo Credentials NimbusSummary
 LogConfig ProfileAction ProfileRequest NodeInfo]
-   [java.io Serializable])
+   [java.io Serializable]
+   [java.nio ByteBuffer])
   (:import [org.apache.zookeeper KeeperException 
KeeperException$NoNodeException ZooDefs ZooDefs$Ids ZooDefs$Perms])
   (:import [org.apache.curator.framework CuratorFramework])
   (:import [org.apache.storm.utils Utils])
@@ -80,7 +81,7 @@
   (remove-worker-heartbeat! [this storm-id node port])
   (supervisor-heartbeat! [this supervisor-id info])
   (worker-backpressure! [this storm-id node port info])
-  (topology-backpressure [this storm-id callback])
+  (topology-backpressure [this storm-id timeout-ms callback])
   (setup-backpressure! [this storm-id])
   (remove-backpressure! [this storm-id])
   (remove-worker-backpressure! [this storm-id node port])
@@ -172,6 +173,10 @@
   [storm-id node port]
   (str (backpressure-storm-root storm-id) "/" node "-" port))
 
+(defn backpressure-full-path
+  [storm-id short-path]
+  (str (backpressure-storm-root storm-id) "/" short-path))
+
 (defn error-storm-root
   [storm-id]
   (str ERRORS-SUBTREE "/" storm-id))
@@ -242,6 +247,20 @@
   :stats (get executor-stats t)}})))
  (into {}
 
+
+(defn max-timestamp
+  "Reduces the timestamps (e.g. those set by worker-backpressure!)
+  to the most recent timestamp"
+  [cluster-state storm-id paths]
+  (reduce (fn [acc path]
+(let [data (.get_data cluster-state (backpressure-full-path 
storm-id path) false)
+  timestamp (if data
+  (.. (ByteBuffer/wrap data) (getLong))
+  0)]
+  (Math/max acc timestamp)))
+  0
+  paths))
+
 ;; Watches should be used for optimization. When ZK is reconnecting, they're 
not guaranteed to be called.
 (defnk mk-storm-cluster-state
   [cluster-state-spec :acls nil :context (ClusterStateContext.)]
@@ -483,27 +502,37 @@
 (log-warn-error e "Could not teardown heartbeats for " storm-id
 
   (worker-backpressure!
-[this storm-id node port on?]
-"if znode exists and to be not on?, delete; if exists and on?, do 
nothing;
-if not exists and to be on?, create; if not exists and not on?, do 
nothing"
+[this storm-id node port timestamp]
+"If znode exists and timestamp is non-positive, ignore;
+ if exists and timestamp is larger than 0, update the timestamp;
+ if not exists and timestamp is larger than 0, create 

[2/2] storm git commit: Merge branch 'reuse-zk-1.x' of https://github.com/danny0405/storm into STORM-2901-1.x-merge

[kabhwan]

Merge branch 'reuse-zk-1.x' of https://github.com/danny0405/storm into 
STORM-2901-1.x-merge


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

Branch: refs/heads/1.x-branch
Commit: 49c2fc39fa62467d7fcc4f7e0c2eeec86e5e8d4c
Parents: c1a1511 60dfa7d
Author: Jungtaek Lim 
Authored: Thu Feb 1 23:21:26 2018 +0900
Committer: Jungtaek Lim 
Committed: Thu Feb 1 23:21:26 2018 +0900

--
 .../apache/storm/command/shell_submission.clj   |  7 +++-
 .../src/clj/org/apache/storm/daemon/nimbus.clj  | 36 ++--
 .../src/clj/org/apache/storm/zookeeper.clj  | 10 +++---
 .../apache/storm/blobstore/BlobStoreUtils.java  |  6 ++--
 .../storm/blobstore/BlobSynchronizer.java   | 16 -
 .../storm/blobstore/KeySequenceNumber.java  | 25 +-
 .../storm/zookeeper/LeaderElectorImp.java   |  3 +-
 .../org/apache/storm/zookeeper/Zookeeper.java   | 22 
 8 files changed, 72 insertions(+), 53 deletions(-)
--

[1/2] storm git commit: STORM-2901: Reuse ZK connection for Nimbus for 1.x-branch

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/1.x-branch c1a1511f1 -> 49c2fc39f


STORM-2901: Reuse ZK connection for Nimbus for 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/60dfa7d1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/60dfa7d1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/60dfa7d1

Branch: refs/heads/1.x-branch
Commit: 60dfa7d1b3c8e2500a64db3de38393354046
Parents: 25fa9dd
Author: chenyuzhao 
Authored: Tue Jan 23 12:42:46 2018 +0800
Committer: chenyuzhao 
Committed: Tue Jan 23 12:42:46 2018 +0800

--
 .../apache/storm/command/shell_submission.clj   |  7 +++-
 .../src/clj/org/apache/storm/daemon/nimbus.clj  | 36 ++--
 .../src/clj/org/apache/storm/zookeeper.clj  | 10 +++---
 .../apache/storm/blobstore/BlobStoreUtils.java  |  6 ++--
 .../storm/blobstore/BlobSynchronizer.java   | 16 -
 .../storm/blobstore/KeySequenceNumber.java  | 25 +-
 .../storm/zookeeper/LeaderElectorImp.java   |  3 +-
 .../org/apache/storm/zookeeper/Zookeeper.java   | 22 
 8 files changed, 72 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/60dfa7d1/storm-core/src/clj/org/apache/storm/command/shell_submission.clj
--
diff --git a/storm-core/src/clj/org/apache/storm/command/shell_submission.clj 
b/storm-core/src/clj/org/apache/storm/command/shell_submission.clj
index 887ab3b..3efcc14 100644
--- a/storm-core/src/clj/org/apache/storm/command/shell_submission.clj
+++ b/storm-core/src/clj/org/apache/storm/command/shell_submission.clj
@@ -23,7 +23,12 @@
 (defn -main [^String tmpjarpath & args]
   (let [conf (read-storm-config)
 ; since this is not a purpose to add to leader lock queue, passing nil 
as blob-store is ok
-zk-leader-elector (zk-leader-elector conf nil)
+zk (mk-client conf
+  (conf STORM-ZOOKEEPER-SERVERS)
+  (conf STORM-ZOOKEEPER-PORT)
+  :root (conf STORM-ZOOKEEPER-ROOT)
+  :auth-conf conf)
+zk-leader-elector (zk-leader-elector conf zk nil)
 leader-nimbus (.getLeader zk-leader-elector)
 host (.getHost leader-nimbus)
 port (.getPort leader-nimbus)

http://git-wip-us.apache.org/repos/asf/storm/blob/60dfa7d1/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
--
diff --git a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj 
b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
index 7607b1b..bc72b29 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
@@ -133,6 +133,13 @@
 scheduler
 ))
 
+(defn mk-zk-client [conf]
+  (let [zk-servers (conf STORM-ZOOKEEPER-SERVERS)
+zk-port (conf STORM-ZOOKEEPER-PORT)
+zk-root (conf STORM-ZOOKEEPER-ROOT)]
+(if (and zk-servers zk-port)
+  (mk-client conf zk-servers zk-port :root zk-root :auth-conf conf
+
 (defmulti blob-sync cluster-mode)
 
 (defnk is-leader [nimbus :throw-exception true]
@@ -183,7 +190,8 @@
 
 (defn nimbus-data [conf inimbus]
   (let [forced-scheduler (.getForcedScheduler inimbus)
-blob-store (Utils/getNimbusBlobStore conf (NimbusInfo/fromConf conf))]
+blob-store (Utils/getNimbusBlobStore conf (NimbusInfo/fromConf conf))
+zk-client (mk-zk-client conf)]
 {:conf conf
  :nimbus-host-port-info (NimbusInfo/fromConf conf)
  :inimbus inimbus
@@ -213,7 +221,8 @@
  (exit-process! 20 "Error when processing an 
event")
  ))
  :scheduler (mk-scheduler conf inimbus)
- :leader-elector (zk-leader-elector conf blob-store)
+ :zk-client zk-client
+ :leader-elector (zk-leader-elector conf zk-client blob-store)
  :id->sched-status (atom {})
  :node-id->resources (atom {}) ;;resources of supervisors
  :id->resources (atom {}) ;;resources of topologies
@@ -452,9 +461,9 @@
   supervisor-ids))
)))
 
-(defn- get-version-for-key [key nimbus-host-port-info conf]
+(defn- get-version-for-key [key nimbus-host-port-info zk-client]
   (let [version (KeySequenceNumber. key nimbus-host-port-info)]
-(.getKeySequenceNumber version conf)))
+(.getKeySequenceNumber version zk-client)))
 
 (defn get-key-seq-from-blob-store [blob-store]
   (let [key-iter (.listKeys blob-store)]
@@ -464,6 +473,7 @@
   (let [subject (get-subject)
 storm-cluster-state (:storm-cluster-state nimbus)
 blob-store (:blob-store nimbus)
+zk-client (:zk-client nimbus)
 jar-key 

[1/2] storm git commit: STORM-2906 Pick HBase delegation token properly while handling HBase auth via delegation token

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/1.x-branch 5be414d08 -> c1a1511f1


STORM-2906 Pick HBase delegation token properly while handling HBase auth via 
delegation token


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

Branch: refs/heads/1.x-branch
Commit: 12a03e3899b2c4c4377d2db26d95f8fbc22458f6
Parents: 5be414d
Author: Jungtaek Lim 
Authored: Tue Jan 23 13:34:22 2018 +0900
Committer: Jungtaek Lim 
Committed: Thu Feb 1 23:16:59 2018 +0900

--
 .../org/apache/storm/hbase/common/Utils.java| 26 +---
 1 file changed, 23 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/12a03e38/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
--
diff --git 
a/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java 
b/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
index b4851f8..31ac655 100644
--- 
a/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
+++ 
b/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
@@ -33,6 +33,7 @@ import java.security.PrivilegedExceptionAction;
 
 public class Utils {
 private static final Logger LOG = LoggerFactory.getLogger(Utils.class);
+public static final String TOKEN_KIND_HBASE_AUTH_TOKEN = 
"HBASE_AUTH_TOKEN";
 
 private Utils(){}
 
@@ -47,14 +48,33 @@ public class Utils {
 ugi = UserGroupInformation.getCurrentUser();
 
 LOG.debug("UGI for current USER : {}", ugi.getUserName());
+boolean foundHBaseAuthToken = false;
 for (Token token : ugi.getTokens()) {
 LOG.debug("Token in UGI (delegation token): {} / {}", 
token.toString(),
 token.decodeIdentifier().getUser());
 
-// use UGI from token
-ugi = token.decodeIdentifier().getUser();
-ugi.addToken(token);
+// token.getKind() = Text, Text is annotated by @Stringable
+// which ensures toString() implementation
+if 
(token.getKind().toString().equals(TOKEN_KIND_HBASE_AUTH_TOKEN)) {
+// use UGI from token
+if (!foundHBaseAuthToken) {
+LOG.debug("Found HBASE_AUTH_TOKEN - using the token to 
replace current user.");
+
+ugi = token.decodeIdentifier().getUser();
+ugi.addToken(token);
+
+foundHBaseAuthToken = true;
+} else {
+LOG.warn("Found multiple HBASE_AUTH_TOKEN - will use 
already found token. " +
+"Please enable DEBUG log level to track 
delegation tokens.");
+}
+}
 }
+
+if (!foundHBaseAuthToken) {
+LOG.warn("Can't find HBase auth token in delegation tokens.");
+}
+
 }
 
 return ugi.doAs(new PrivilegedExceptionAction() {

[2/2] storm git commit: Merge branch 'STORM-2906-1.x-merge' into 1.x-branch

[kabhwan]

Merge branch 'STORM-2906-1.x-merge' 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/c1a1511f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c1a1511f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c1a1511f

Branch: refs/heads/1.x-branch
Commit: c1a1511f164d2f4fd27b4c54595086f4aec25ef2
Parents: 5be414d 12a03e3
Author: Jungtaek Lim 
Authored: Thu Feb 1 23:17:11 2018 +0900
Committer: Jungtaek Lim 
Committed: Thu Feb 1 23:17:11 2018 +0900

--
 .../org/apache/storm/hbase/common/Utils.java| 26 +---
 1 file changed, 23 insertions(+), 3 deletions(-)
--

[2/3] storm git commit: STORM-2906 Pick HBase delegation token properly while handling HBase auth via delegation token

[kabhwan]

STORM-2906 Pick HBase delegation token properly while handling HBase auth via 
delegation token

* log to warn if there's more than one HBase auth tokens


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

Branch: refs/heads/master
Commit: 609a4a78f2a762f784648a6a57af060abd089d7c
Parents: d291f39
Author: Jungtaek Lim 
Authored: Wed Jan 24 14:40:15 2018 +0900
Committer: Jungtaek Lim 
Committed: Wed Jan 24 14:40:15 2018 +0900

--
 .../main/java/org/apache/storm/hbase/common/Utils.java | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/609a4a78/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
--
diff --git 
a/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java 
b/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
index f56f9e0..981d4ff 100644
--- 
a/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
+++ 
b/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
@@ -57,12 +57,17 @@ public class Utils {
 // which ensures toString() implementation
 if 
(token.getKind().toString().equals(TOKEN_KIND_HBASE_AUTH_TOKEN)) {
 // use UGI from token
-LOG.debug("Found HBASE_AUTH_TOKEN - using the token to 
replace current user.");
+if (!foundHBaseAuthToken) {
+LOG.debug("Found HBASE_AUTH_TOKEN - using the token to 
replace current user.");
 
-ugi = token.decodeIdentifier().getUser();
-ugi.addToken(token);
+ugi = token.decodeIdentifier().getUser();
+ugi.addToken(token);
 
-foundHBaseAuthToken = true;
+foundHBaseAuthToken = true;
+} else {
+LOG.warn("Found multiple HBASE_AUTH_TOKEN - will use 
already found token. " +
+"Please enable DEBUG log level to track 
delegation tokens.");
+}
 }
 }
 

[1/3] storm git commit: STORM-2906 Pick HBase delegation token properly while handling HBase auth via delegation token

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/master d3a74eec5 -> 1c7361982


STORM-2906 Pick HBase delegation token properly while handling HBase auth via 
delegation token


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

Branch: refs/heads/master
Commit: d291f39c9aa6e29184a2712797e956b42cae3293
Parents: e6a423d
Author: Jungtaek Lim 
Authored: Tue Jan 23 13:34:22 2018 +0900
Committer: Jungtaek Lim 
Committed: Tue Jan 23 13:34:22 2018 +0900

--
 .../org/apache/storm/hbase/common/Utils.java| 21 +---
 1 file changed, 18 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/d291f39c/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
--
diff --git 
a/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java 
b/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
index ab1ec37..f56f9e0 100644
--- 
a/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
+++ 
b/external/storm-hbase/src/main/java/org/apache/storm/hbase/common/Utils.java
@@ -33,6 +33,7 @@ import java.security.PrivilegedExceptionAction;
 
 public class Utils {
 private static final Logger LOG = LoggerFactory.getLogger(Utils.class);
+public static final String TOKEN_KIND_HBASE_AUTH_TOKEN = 
"HBASE_AUTH_TOKEN";
 
 private Utils(){}
 
@@ -47,14 +48,28 @@ public class Utils {
 ugi = UserGroupInformation.getCurrentUser();
 
 LOG.debug("UGI for current USER : {}", ugi.getUserName());
+boolean foundHBaseAuthToken = false;
 for (Token token : ugi.getTokens()) {
 LOG.debug("Token in UGI (delegation token): {} / {}", 
token.toString(),
 token.decodeIdentifier().getUser());
 
-// use UGI from token
-ugi = token.decodeIdentifier().getUser();
-ugi.addToken(token);
+// token.getKind() = Text, Text is annotated by @Stringable
+// which ensures toString() implementation
+if 
(token.getKind().toString().equals(TOKEN_KIND_HBASE_AUTH_TOKEN)) {
+// use UGI from token
+LOG.debug("Found HBASE_AUTH_TOKEN - using the token to 
replace current user.");
+
+ugi = token.decodeIdentifier().getUser();
+ugi.addToken(token);
+
+foundHBaseAuthToken = true;
+}
 }
+
+if (!foundHBaseAuthToken) {
+LOG.warn("Can't find HBase auth token in delegation tokens.");
+}
+
 }
 
 return ugi.doAs(new PrivilegedExceptionAction() {

[3/3] storm git commit: Merge branch 'STORM-2906' of https://github.com/HeartSaVioR/storm into STORM-2906-merge

[kabhwan]

Merge branch 'STORM-2906' of https://github.com/HeartSaVioR/storm into 
STORM-2906-merge


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

Branch: refs/heads/master
Commit: 1c7361982873fc8a84ed2b217b39ff634b35375b
Parents: d3a74ee 609a4a7
Author: Jungtaek Lim 
Authored: Thu Feb 1 23:15:55 2018 +0900
Committer: Jungtaek Lim 
Committed: Thu Feb 1 23:15:55 2018 +0900

--
 .../org/apache/storm/hbase/common/Utils.java| 26 +---
 1 file changed, 23 insertions(+), 3 deletions(-)
--

[2/2] storm git commit: Merge branch 'STORM-2903-1.x' of https://github.com/omkreddy/storm into STORM-2903-1.x-merge

[kabhwan]

Merge branch 'STORM-2903-1.x' of https://github.com/omkreddy/storm into 
STORM-2903-1.x-merge


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

Branch: refs/heads/1.x-branch
Commit: 5be414d087af1143edc682d53d7ac4da084fe6ee
Parents: 34a220c 05890ef
Author: Jungtaek Lim 
Authored: Thu Feb 1 23:06:57 2018 +0900
Committer: Jungtaek Lim 
Committed: Thu Feb 1 23:06:57 2018 +0900

--
 .../main/java/org/apache/storm/common/AbstractAutoCreds.java   | 6 ++
 1 file changed, 6 insertions(+)
--

[1/2] storm git commit: STORM-2903: (follow up) Log token identifier and username associated with token identifier

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/1.x-branch 34a220c95 -> 5be414d08


STORM-2903: (follow up) Log token identifier and username associated with token 
identifier


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

Branch: refs/heads/1.x-branch
Commit: 05890efcf0a509f6fabd2e89c4027eaffd497d68
Parents: 25fa9dd
Author: Manikumar Reddy 
Authored: Mon Jan 22 15:48:08 2018 +0530
Committer: Manikumar Reddy 
Committed: Mon Jan 22 16:01:23 2018 +0530

--
 .../main/java/org/apache/storm/common/AbstractAutoCreds.java   | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/05890efc/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractAutoCreds.java
--
diff --git 
a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractAutoCreds.java
 
b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractAutoCreds.java
index eb383f4..7b2fc2d 100644
--- 
a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractAutoCreds.java
+++ 
b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractAutoCreds.java
@@ -224,6 +224,12 @@ public abstract class AbstractAutoCreds implements 
IAutoCredentials, ICredential
 LOG.debug("Current user: {}", 
UserGroupInformation.getCurrentUser());
 LOG.debug("Token from Credentials : {}", 
token);
 
+TokenIdentifier tokenId = 
token.decodeIdentifier();
+if (tokenId != null) {
+LOG.debug("Token identifier : {}", 
tokenId);
+LOG.debug("Username in token identifier : 
{}", tokenId.getUser());
+}
+
 
UserGroupInformation.getCurrentUser().addToken(token);
 LOG.info("Added delegation tokens to UGI.");
 } catch (IOException e) {

[2/2] storm git commit: Merge branch 'STORM-2903' of https://github.com/omkreddy/storm into STORM-2903-merge

[kabhwan]

Merge branch 'STORM-2903' of https://github.com/omkreddy/storm into 
STORM-2903-merge


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

Branch: refs/heads/master
Commit: d3a74eec58a918fbc9414f59edc1189e40d38650
Parents: f37a6bd 8415861
Author: Jungtaek Lim 
Authored: Thu Feb 1 23:04:32 2018 +0900
Committer: Jungtaek Lim 
Committed: Thu Feb 1 23:04:32 2018 +0900

--
 .../java/org/apache/storm/common/AbstractHadoopAutoCreds.java  | 6 ++
 1 file changed, 6 insertions(+)
--

[1/2] storm git commit: STORM-2903: (follow up) Log token identifier and username associated with token identifier

[kabhwan]

Repository: storm
Updated Branches:
  refs/heads/master f37a6bd99 -> d3a74eec5


STORM-2903: (follow up) Log token identifier and username associated with token 
identifier


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

Branch: refs/heads/master
Commit: 841586151e241beb87a42d55f5a7a500428b0c99
Parents: 05771ba
Author: Manikumar Reddy 
Authored: Mon Jan 22 15:40:10 2018 +0530
Committer: Manikumar Reddy 
Committed: Mon Jan 22 15:59:46 2018 +0530

--
 .../java/org/apache/storm/common/AbstractHadoopAutoCreds.java  | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/storm/blob/84158615/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java
--
diff --git 
a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java
 
b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java
index 936d1fc..2f62ee5 100644
--- 
a/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java
+++ 
b/external/storm-autocreds/src/main/java/org/apache/storm/common/AbstractHadoopAutoCreds.java
@@ -121,6 +121,12 @@ public abstract class AbstractHadoopAutoCreds implements 
IAutoCredentials, Crede
 LOG.debug("Current user: {}", 
UserGroupInformation.getCurrentUser());
 LOG.debug("Token from Credentials : {}", 
token);
 
+TokenIdentifier tokenId = 
token.decodeIdentifier();
+if (tokenId != null) {
+LOG.debug("Token identifier : {}", 
tokenId);
+LOG.debug("Username in token identifier : 
{}", tokenId.getUser());
+}
+
 
UserGroupInformation.getCurrentUser().addToken(token);
 LOG.info("Added delegation tokens to UGI.");
 } catch (IOException e) {