[1/2] storm git commit: STORM-3249: Make sure times shut down and so does shut down thread
Repository: storm Updated Branches: refs/heads/master a0f3b1ace -> 22440747a STORM-3249: Make sure times shut down and so does shut down thread Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bbfd7cd4 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bbfd7cd4 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bbfd7cd4 Branch: refs/heads/master Commit: bbfd7cd4050ae80d406daaed9cec882b00be1f98 Parents: 20d5581 Author: Robert (Bobby) Evans Authored: Mon Oct 8 13:25:17 2018 -0500 Committer: Robert (Bobby) Evans Committed: Mon Oct 8 13:25:17 2018 -0500 -- .../org/apache/storm/hdfs/spout/HdfsSpout.java | 2 +- .../org/apache/storm/hive/bolt/HiveBolt.java| 5 ++- .../apache/storm/hive/trident/HiveState.java| 3 +- .../src/jvm/org/apache/storm/utils/Utils.java | 43 .../storm/blobstore/LocalFsBlobStore.java | 5 ++- .../java/org/apache/storm/daemon/drpc/DRPC.java | 6 +-- 6 files changed, 40 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/bbfd7cd4/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java -- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java index 12debe5..bdf9da3 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/spout/HdfsSpout.java @@ -390,7 +390,7 @@ public class HdfsSpout extends BaseRichSpout { public void open(Map conf, TopologyContext context, SpoutOutputCollector collector) { LOG.info("Opening HDFS Spout"); this.conf = conf; -this.commitTimer = new Timer(); +this.commitTimer = new Timer(context.getThisTaskId() + "-commit-timer", true); this.tracker = new ProgressTracker(); this.hdfsConfig = new Configuration(); this.collector = collector; http://git-wip-us.apache.org/repos/asf/storm/blob/bbfd7cd4/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java -- diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java index cfabbd6..180f41b 100644 --- a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java +++ b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java @@ -79,7 +79,7 @@ public class HiveBolt extends BaseRichBolt { new ThreadFactoryBuilder().setNameFormat(timeoutName).build()); sendHeartBeat.set(true); -heartBeatTimer = new Timer(); +heartBeatTimer = new Timer(topologyContext.getThisTaskId() + "-hb-timer", true); setupHeartBeatTimer(); } catch (Exception e) { @@ -151,6 +151,9 @@ public class HiveBolt extends BaseRichBolt { } callTimeoutPool = null; +if (heartBeatTimer != null) { +heartBeatTimer.cancel(); +} super.cleanup(); LOG.info("Hive Bolt stopped"); } http://git-wip-us.apache.org/repos/asf/storm/blob/bbfd7cd4/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java -- diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java b/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java index a698e24..6717329 100644 --- a/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java +++ b/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java @@ -80,7 +80,7 @@ public class HiveState implements State { String timeoutName = "hive-bolt-%d"; this.callTimeoutPool = Executors.newFixedThreadPool(1, new ThreadFactoryBuilder().setNameFormat(timeoutName).build()); -heartBeatTimer = new Timer(); +heartBeatTimer = new Timer("hive-hb-timer", true); setupHeartBeatTimer(); } catch (Exception e) { LOG.warn("unable to make connection to hive ", e); @@ -289,6 +289,7 @@ public class HiveState implements State { LOG.warn("shutdown interrupted on " + execService, ex); } } +heartBeatTimer.cancel(); callTimeoutPool = null; }
[2/2] storm git commit: Merge branch 'STORM-3249' of https://github.com/revans2/incubator-storm into STORM-3249
Merge branch 'STORM-3249' of https://github.com/revans2/incubator-storm into STORM-3249 STORM-3249: Make sure times shut down and so does shut down thread This closes #2867 Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/22440747 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/22440747 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/22440747 Branch: refs/heads/master Commit: 22440747aa0f2ed3f3d26baec9140f79bb82f644 Parents: a0f3b1a bbfd7cd Author: Robert Evans Authored: Tue Oct 9 14:35:30 2018 -0500 Committer: Robert Evans Committed: Tue Oct 9 14:35:30 2018 -0500 -- .../org/apache/storm/hdfs/spout/HdfsSpout.java | 2 +- .../org/apache/storm/hive/bolt/HiveBolt.java| 5 ++- .../apache/storm/hive/trident/HiveState.java| 3 +- .../src/jvm/org/apache/storm/utils/Utils.java | 43 .../storm/blobstore/LocalFsBlobStore.java | 5 ++- .../java/org/apache/storm/daemon/drpc/DRPC.java | 6 +-- 6 files changed, 40 insertions(+), 24 deletions(-) --
svn commit: r29978 - in /dev/storm/apache-storm-2.0.0-rc2: apache-storm-2.0.0.pom apache-storm-2.0.0.pom.asc
Author: ptgoetz Date: Tue Oct 9 20:03:44 2018 New Revision: 29978 Log: remove poms Removed: dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0.pom dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0.pom.asc
svn commit: r29977 [2/3] - /dev/storm/apache-storm-2.0.0-rc2/
Added: dev/storm/apache-storm-2.0.0-rc2/RELEASE_NOTES.html == --- dev/storm/apache-storm-2.0.0-rc2/RELEASE_NOTES.html (added) +++ dev/storm/apache-storm-2.0.0-rc2/RELEASE_NOTES.html Tue Oct 9 19:42:05 2018 @@ -0,0 +1,1058 @@ + + + + +Storm 2.0.0 Release Notes + + +Release Notes for Storm 2.0.0 +JIRA issues addressed in the 2.0.0 release of Storm. Documentation for this +release is available at the http://storm.apache.org/;>Apache Storm +project site. +New Feature + +[https://issues.apache.org/jira/browse/STORM-171;>STORM-171] - Add "progress" method to OutputCollector +[https://issues.apache.org/jira/browse/STORM-1226;>STORM-1226] - Port backtype.storm.util to java +[https://issues.apache.org/jira/browse/STORM-1227;>STORM-1227] - port backtype.storm.config to java +[https://issues.apache.org/jira/browse/STORM-1228;>STORM-1228] - port backtype.storm.fields-test to java +[https://issues.apache.org/jira/browse/STORM-1229;>STORM-1229] - port backtype.storm.metric.testing to java +[https://issues.apache.org/jira/browse/STORM-1230;>STORM-1230] - port backtype.storm.process-simulator to java +[https://issues.apache.org/jira/browse/STORM-1231;>STORM-1231] - port backtype.storm.scheduler.EvenScheduler to java +[https://issues.apache.org/jira/browse/STORM-1232;>STORM-1232] - port backtype.storm.scheduler.DefaultScheduler to java +[https://issues.apache.org/jira/browse/STORM-1233;>STORM-1233] - port backtype.storm.security.auth.AuthUtils-test to java +[https://issues.apache.org/jira/browse/STORM-1234;>STORM-1234] - port backtype.storm.security.auth.DefaultHttpCredentialsPlugin-test to java +[https://issues.apache.org/jira/browse/STORM-1235;>STORM-1235] - port backtype.storm.security.auth.ReqContext-test to java +[https://issues.apache.org/jira/browse/STORM-1236;>STORM-1236] - port backtype.storm.security.auth.SaslTransportPlugin-test to java +[https://issues.apache.org/jira/browse/STORM-1237;>STORM-1237] - port backtype.storm.security.auth.ThriftClient-test to java +[https://issues.apache.org/jira/browse/STORM-1238;>STORM-1238] - port backtype.storm.security.auth.ThriftServer-test to java +[https://issues.apache.org/jira/browse/STORM-1239;>STORM-1239] - port backtype.storm.scheduler.IsolationScheduler to java +[https://issues.apache.org/jira/browse/STORM-1240;>STORM-1240] - port backtype.storm.security.auth.authorizer.DRPCSimpleACLAuthorizer-test to java +[https://issues.apache.org/jira/browse/STORM-1242;>STORM-1242] - migrate backtype.storm.command.config-value to java +[https://issues.apache.org/jira/browse/STORM-1243;>STORM-1243] - port backtype.storm.command.healthcheck to java +[https://issues.apache.org/jira/browse/STORM-1244;>STORM-1244] - port backtype.storm.command.upload-credentials to java +[https://issues.apache.org/jira/browse/STORM-1245;>STORM-1245] - port backtype.storm.daemon.acker to java +[https://issues.apache.org/jira/browse/STORM-1246;>STORM-1246] - port backtype.storm.local-state to java +[https://issues.apache.org/jira/browse/STORM-1247;>STORM-1247] - port backtype.storm.messaging.local to java +[https://issues.apache.org/jira/browse/STORM-1248;>STORM-1248] - port backtype.storm.messaging.loader to java +[https://issues.apache.org/jira/browse/STORM-1249;>STORM-1249] - port backtype.storm.security.serialization.BlowfishTupleSerializer-test to java +[https://issues.apache.org/jira/browse/STORM-1250;>STORM-1250] - port backtype.storm.serialization-test to java +[https://issues.apache.org/jira/browse/STORM-1251;>STORM-1251] - port backtype.storm.serialization.SerializationFactory-test to java +[https://issues.apache.org/jira/browse/STORM-1252;>STORM-1252] - port backtype.storm.stats to java +[https://issues.apache.org/jira/browse/STORM-1253;>STORM-1253] - port backtype.storm.timer to java +[https://issues.apache.org/jira/browse/STORM-1254;>STORM-1254] - port backtype.storm.ui.helpers to java +[https://issues.apache.org/jira/browse/STORM-1255;>STORM-1255] - port backtype.storm.utils-test to java +[https://issues.apache.org/jira/browse/STORM-1256;>STORM-1256] - port backtype.storm.utils.ZookeeperServerCnxnFactory-test to java +[https://issues.apache.org/jira/browse/STORM-1257;>STORM-1257] - port backtype.storm.zookeeper to java +[https://issues.apache.org/jira/browse/STORM-1258;>STORM-1258] - port backtype.storm.thrift to java +[https://issues.apache.org/jira/browse/STORM-1259;>STORM-1259] - Create Clojure API package + tests +[https://issues.apache.org/jira/browse/STORM-1260;>STORM-1260] - port backtype.storm.command.activate to java +[https://issues.apache.org/jira/browse/STORM-1261;>STORM-1261] - port backtype.storm.command.deactivate to java +[https://issues.apache.org/jira/browse/STORM-1262;>STORM-1262] - port backtype.storm.command.dev-zookeeper to java +[https://issues.apache.org/jira/browse/STORM-1263;>STORM-1263] - port
svn commit: r29977 [3/3] - /dev/storm/apache-storm-2.0.0-rc2/
Added: dev/storm/apache-storm-2.0.0-rc2/RELEASE_NOTES.html.asc == --- dev/storm/apache-storm-2.0.0-rc2/RELEASE_NOTES.html.asc (added) +++ dev/storm/apache-storm-2.0.0-rc2/RELEASE_NOTES.html.asc Tue Oct 9 19:42:05 2018 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCAAdFiEErO/hjdIyLh6EWHoUjeA5YugLj/0FAlu9A9IACgkQjeA5YugL +j/3NeAf7BSxoWajRedifA1KLyCooPdAem1fsHm7IzmCGBDxpZakeuU7rSXDQC0pD +8xGNqH+vJjns/QQxLOoG0iCS2K3xZR1gnZXf7o1rIJWPlx8jADTVgUnqq/BQaqqU +7iAOCGxpa/jt13ztN7ByGbnazsFrn7if0TKl7lpb2olsmFqD4L/hNYQd2CttoP3Q +gE6a678KRnvd7yn+C1kRyPu4YB5Zl4Jlo0yCLJbQmrYPQGnlikU+vvhxmEmivt7I +DK5Rs3HB2CzkeonkISSt04o8WlMvwDbfI3S14B/G+bY+2Rg1gif3ZzNACSlZY7v2 +ZSJVsAQ4fdewkQnTdM3+Iqm5dcUkqQ== +=Z62I +-END PGP SIGNATURE- Added: dev/storm/apache-storm-2.0.0-rc2/RELEASE_NOTES.html.md5 == --- dev/storm/apache-storm-2.0.0-rc2/RELEASE_NOTES.html.md5 (added) +++ dev/storm/apache-storm-2.0.0-rc2/RELEASE_NOTES.html.md5 Tue Oct 9 19:42:05 2018 @@ -0,0 +1 @@ +RELEASE_NOTES.html: 5D 34 3A 9F F9 CF 7B 06 A2 5F 04 77 59 9D 20 82 Added: dev/storm/apache-storm-2.0.0-rc2/RELEASE_NOTES.html.sha512 == --- dev/storm/apache-storm-2.0.0-rc2/RELEASE_NOTES.html.sha512 (added) +++ dev/storm/apache-storm-2.0.0-rc2/RELEASE_NOTES.html.sha512 Tue Oct 9 19:42:05 2018 @@ -0,0 +1,3 @@ +RELEASE_NOTES.html: 1D841AA6 8AACA5A3 76E1A7B2 4E10393E 60C40D78 506DC187 +6630AC48 E706447E D434B927 8648529D BE726835 46EA57BF +77EA9109 46505C51 35D01AB5 FD47B2F4 Added: dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.tar.gz == Binary file - no diff available. Propchange: dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.tar.gz.asc == --- dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.tar.gz.asc (added) +++ dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.tar.gz.asc Tue Oct 9 19:42:05 2018 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCAAdFiEErO/hjdIyLh6EWHoUjeA5YugLj/0FAlu9AgcACgkQjeA5YugL +j/0S+wgAsoZtaU7ckSoNvrzezfsOdTGfoyh9eo4zvGxAlm8xgil5FpdDHZhnY71a +U53cT4FcHKdkN4FRTJjtwZwxu2Q0ka8OAhzUhv/0nbjCdSMj4T5vrArsG5wY9a0x +No9xi0wBeikiYRq52tdbhngbRcFnk46g2Oe5+uPdPA3tI8fZlutpgptDEMN8l/cE +gZhHM0iQehKD6SefxsCi6klmjfNYmBV3E9tn6YqIqoKk4qacservzvmh8YjdINz+ +PUq26TR9wiJL5MkCSQuroCcgVrSQBZLTeE3cld2UAcnVZR6U+n1JLHeIu0/qEDwX +VMOtTfJseRvSxRwVv6xJh+BaNMQopQ== +=ey5I +-END PGP SIGNATURE- Added: dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.tar.gz.md5 == --- dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.tar.gz.md5 (added) +++ dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.tar.gz.md5 Tue Oct 9 19:42:05 2018 @@ -0,0 +1 @@ +apache-storm-2.0.0-src.tar.gz: 03 75 F7 E8 45 0F 32 F3 F7 73 74 69 ED 4F 39 D6 Added: dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.tar.gz.sha512 == --- dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.tar.gz.sha512 (added) +++ dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.tar.gz.sha512 Tue Oct 9 19:42:05 2018 @@ -0,0 +1,4 @@ +apache-storm-2.0.0-src.tar.gz: 7F60BBEE BEFD82C2 E6523AFE 16912FF5 FAB3DE33 + 865E12F3 75C0E2E4 1C5C1BE7 94868EC8 86A10438 + 8EFE7141 45C2F570 D56E7169 959A707A 12FD3201 + 00408463 Added: dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.zip == Binary file - no diff available. Propchange: dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.zip -- svn:mime-type = application/octet-stream Added: dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.zip.asc == --- dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.zip.asc (added) +++ dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.zip.asc Tue Oct 9 19:42:05 2018 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCAAdFiEErO/hjdIyLh6EWHoUjeA5YugLj/0FAlu9AggACgkQjeA5YugL +j/2qUgf5AQZjnUbAdhUedktwjFr+AXQ6DTCz/RL0O/60Od8MRiqz1/fJJHB7gdg7 +sUlywvXLCYzcZTC+I/NGx7mGwLMMSW/RKqpVuLwdX7xA7AGdSDX9NYb/tLvQ1KTX
svn commit: r29977 [1/3] - /dev/storm/apache-storm-2.0.0-rc2/
Author: ptgoetz Date: Tue Oct 9 19:42:05 2018 New Revision: 29977 Log: stage Storm 2.0.0-rc2 release Added: dev/storm/apache-storm-2.0.0-rc2/ dev/storm/apache-storm-2.0.0-rc2/RELEASE_NOTES.html dev/storm/apache-storm-2.0.0-rc2/RELEASE_NOTES.html.asc dev/storm/apache-storm-2.0.0-rc2/RELEASE_NOTES.html.md5 dev/storm/apache-storm-2.0.0-rc2/RELEASE_NOTES.html.sha512 dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.tar.gz (with props) dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.tar.gz.asc dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.tar.gz.md5 dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.tar.gz.sha512 dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.zip (with props) dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.zip.asc dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.zip.md5 dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0-src.zip.sha512 dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0.pom dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0.pom.asc dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0.tar.gz (with props) dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0.tar.gz.asc dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0.tar.gz.md5 dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0.tar.gz.sha512 dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0.zip (with props) dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0.zip.asc dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0.zip.md5 dev/storm/apache-storm-2.0.0-rc2/apache-storm-2.0.0.zip.sha512
[3/5] storm git commit: [maven-release-plugin] prepare release v2.0.0
[maven-release-plugin] prepare release v2.0.0 Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6b24ecd0 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6b24ecd0 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6b24ecd0 Branch: refs/heads/master Commit: 6b24ecd0dcb82901e3b7dd1667b29ee15a74c2be Parents: 9d4ccf5 Author: P. Taylor Goetz Authored: Tue Oct 9 14:00:29 2018 -0400 Committer: P. Taylor Goetz Committed: Tue Oct 9 14:00:29 2018 -0400 -- 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-loadgen/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-rocketmq-examples/pom.xml | 2 +- examples/storm-solr-examples/pom.xml | 2 +- examples/storm-starter/pom.xml | 2 +- external/storm-autocreds/pom.xml | 2 +- external/storm-blobstore-migration/pom.xml | 2 +- external/storm-cassandra/pom.xml | 2 +- external/storm-elasticsearch/pom.xml | 2 +- external/storm-eventhubs/pom.xml | 2 +- external/storm-hbase/pom.xml | 2 +- external/storm-hdfs-blobstore/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-migration/pom.xml | 2 +- external/storm-kafka-monitor/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-rocketmq/pom.xml | 2 +- external/storm-solr/pom.xml | 2 +- flux/flux-core/pom.xml | 2 +- flux/flux-examples/pom.xml | 2 +- flux/flux-wrappers/pom.xml | 2 +- flux/pom.xml | 2 +- integration-test/pom.xml | 2 +- pom.xml | 2 +- shaded-deps/pom.xml | 2 +- sql/pom.xml | 2 +- sql/storm-sql-core/pom.xml | 2 +- sql/storm-sql-external/storm-sql-hdfs/pom.xml| 2 +- sql/storm-sql-external/storm-sql-kafka/pom.xml | 2 +- sql/storm-sql-external/storm-sql-mongodb/pom.xml | 2 +- sql/storm-sql-external/storm-sql-redis/pom.xml | 2 +- sql/storm-sql-runtime/pom.xml| 2 +- storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +- storm-buildtools/storm-maven-plugins/pom.xml | 2 +- storm-checkstyle/pom.xml | 2 +- storm-client/pom.xml | 2 +- storm-clojure-test/pom.xml | 2 +- storm-clojure/pom.xml| 2 +- storm-core/pom.xml | 2 +- storm-dist/binary/final-package/pom.xml | 2 +- storm-dist/binary/pom.xml| 2 +- storm-dist/binary/storm-client-bin/pom.xml | 2 +- storm-dist/binary/storm-webapp-bin/pom.xml | 2 +- storm-dist/source/pom.xml| 2 +- storm-multilang/javascript/pom.xml | 2 +- storm-multilang/python/pom.xml
[5/5] storm git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a0f3b1ac Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a0f3b1ac Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a0f3b1ac Branch: refs/heads/master Commit: a0f3b1ace6eb6d2f1838364c7971dd8c91e07768 Parents: f8d0491 Author: P. Taylor Goetz Authored: Tue Oct 9 14:27:08 2018 -0400 Committer: P. Taylor Goetz Committed: Tue Oct 9 14:27:08 2018 -0400 -- 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-loadgen/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-rocketmq-examples/pom.xml | 2 +- examples/storm-solr-examples/pom.xml | 2 +- examples/storm-starter/pom.xml | 2 +- external/storm-autocreds/pom.xml | 2 +- external/storm-blobstore-migration/pom.xml | 2 +- external/storm-cassandra/pom.xml | 2 +- external/storm-elasticsearch/pom.xml | 2 +- external/storm-eventhubs/pom.xml | 2 +- external/storm-hbase/pom.xml | 2 +- external/storm-hdfs-blobstore/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-migration/pom.xml | 2 +- external/storm-kafka-monitor/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-rocketmq/pom.xml | 2 +- external/storm-solr/pom.xml | 2 +- flux/flux-core/pom.xml | 2 +- flux/flux-examples/pom.xml | 2 +- flux/flux-wrappers/pom.xml | 2 +- flux/pom.xml | 2 +- integration-test/pom.xml | 2 +- pom.xml | 2 +- shaded-deps/pom.xml | 2 +- sql/pom.xml | 2 +- sql/storm-sql-core/pom.xml | 2 +- sql/storm-sql-external/storm-sql-hdfs/pom.xml| 2 +- sql/storm-sql-external/storm-sql-kafka/pom.xml | 2 +- sql/storm-sql-external/storm-sql-mongodb/pom.xml | 2 +- sql/storm-sql-external/storm-sql-redis/pom.xml | 2 +- sql/storm-sql-runtime/pom.xml| 2 +- storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +- storm-buildtools/storm-maven-plugins/pom.xml | 2 +- storm-checkstyle/pom.xml | 2 +- storm-client/pom.xml | 2 +- storm-clojure-test/pom.xml | 2 +- storm-clojure/pom.xml| 2 +- storm-core/pom.xml | 2 +- storm-dist/binary/final-package/pom.xml | 2 +- storm-dist/binary/pom.xml| 2 +- storm-dist/binary/storm-client-bin/pom.xml | 2 +- storm-dist/binary/storm-webapp-bin/pom.xml | 2 +- storm-dist/source/pom.xml| 2 +- storm-multilang/javascript/pom.xml | 2 +-
[storm] Git Push Summary
Repository: storm Updated Tags: refs/tags/v2.0.0 [created] 50db97bcb
[1/5] storm git commit: Revert "[maven-release-plugin] prepare for next development iteration"
Repository: storm Updated Branches: refs/heads/master d0a169978 -> a0f3b1ace Revert "[maven-release-plugin] prepare for next development iteration" This reverts commit 94c6a644aeb27b6c689d7b9f68bd2e7adb5c8734. Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fb2a101b Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fb2a101b Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fb2a101b Branch: refs/heads/master Commit: fb2a101b8535e158d8f7ac01c376615cd6ce4275 Parents: 20d5581 Author: P. Taylor Goetz Authored: Tue Oct 9 13:34:18 2018 -0400 Committer: P. Taylor Goetz Committed: Tue Oct 9 13:34:18 2018 -0400 -- 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-loadgen/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-rocketmq-examples/pom.xml | 2 +- examples/storm-solr-examples/pom.xml | 2 +- examples/storm-starter/pom.xml | 2 +- external/storm-autocreds/pom.xml | 2 +- external/storm-blobstore-migration/pom.xml | 2 +- external/storm-cassandra/pom.xml | 2 +- external/storm-elasticsearch/pom.xml | 2 +- external/storm-eventhubs/pom.xml | 2 +- external/storm-hbase/pom.xml | 2 +- external/storm-hdfs-blobstore/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-migration/pom.xml | 2 +- external/storm-kafka-monitor/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-rocketmq/pom.xml | 2 +- external/storm-solr/pom.xml | 2 +- flux/flux-core/pom.xml | 2 +- flux/flux-examples/pom.xml | 2 +- flux/flux-wrappers/pom.xml | 2 +- flux/pom.xml | 2 +- integration-test/pom.xml | 2 +- pom.xml | 4 ++-- shaded-deps/pom.xml | 2 +- sql/pom.xml | 2 +- sql/storm-sql-core/pom.xml | 2 +- sql/storm-sql-external/storm-sql-hdfs/pom.xml| 2 +- sql/storm-sql-external/storm-sql-kafka/pom.xml | 2 +- sql/storm-sql-external/storm-sql-mongodb/pom.xml | 2 +- sql/storm-sql-external/storm-sql-redis/pom.xml | 2 +- sql/storm-sql-runtime/pom.xml| 2 +- storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +- storm-buildtools/storm-maven-plugins/pom.xml | 2 +- storm-checkstyle/pom.xml | 2 +- storm-client/pom.xml | 2 +- storm-clojure-test/pom.xml | 2 +- storm-clojure/pom.xml| 2 +- storm-core/pom.xml | 2 +- storm-dist/binary/final-package/pom.xml | 2 +- storm-dist/binary/pom.xml| 2 +- storm-dist/binary/storm-client-bin/pom.xml | 2 +- storm-dist/binary/storm-webapp-bin/pom.xml | 2
[4/5] storm git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/storm
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/storm Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f8d04910 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f8d04910 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f8d04910 Branch: refs/heads/master Commit: f8d04910dc3fd14534c186232ecf7882d8916f67 Parents: 6b24ecd d0a1699 Author: P. Taylor Goetz Authored: Tue Oct 9 14:26:19 2018 -0400 Committer: P. Taylor Goetz Committed: Tue Oct 9 14:26:19 2018 -0400 -- .../src/main/java/org/apache/storm/daemon/ui/UIHelpers.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --
[1/2] storm git commit: STORM-1311: Fixing outputStats
Repository: storm Updated Branches: refs/heads/master 20d558127 -> d0a169978 STORM-1311: Fixing outputStats Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fe6116a7 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fe6116a7 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fe6116a7 Branch: refs/heads/master Commit: fe6116a7119b1ee8ca55dca247b689ca173aeb53 Parents: 20d5581 Author: Govind Menon Authored: Mon Oct 8 09:45:05 2018 -0500 Committer: Govind Menon Committed: Mon Oct 8 09:46:53 2018 -0500 -- .../src/main/java/org/apache/storm/daemon/ui/UIHelpers.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/storm/blob/fe6116a7/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java -- diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java index 1298b87..ff121ae 100644 --- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java +++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java @@ -1226,7 +1226,7 @@ public class UIHelpers { * @return nullToZero */ private static Long nullToZero(Long value) { -return Objects.isNull(value) ? value : 0; +return !Objects.isNull(value) ? value : 0; } /** @@ -1235,7 +1235,7 @@ public class UIHelpers { * @return nullToZero */ private static Double nullToZero(Double value) { -return Objects.isNull(value) ? value : 0; +return !Objects.isNull(value) ? value : 0; } /**
[2/2] storm git commit: Merge branch 'STORM-1311-OutputStats' of https://github.com/govind-menon/storm into STORM-3248
Merge branch 'STORM-1311-OutputStats' of https://github.com/govind-menon/storm into STORM-3248 STORM-3248: Fixing outputStats This closes #2866 Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d0a16997 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d0a16997 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d0a16997 Branch: refs/heads/master Commit: d0a169978942736556fd0af1b8e4306c0291e107 Parents: 20d5581 fe6116a Author: Robert Evans Authored: Tue Oct 9 12:24:17 2018 -0500 Committer: Robert Evans Committed: Tue Oct 9 12:24:17 2018 -0500 -- .../src/main/java/org/apache/storm/daemon/ui/UIHelpers.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --
[storm] Git Push Summary
Repository: storm Updated Tags: refs/tags/v2.0.0 [deleted] 1c8d5a602