You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/08/07 18:31:58 UTC

[1/6] git commit: STORM-87 fail fast on ShellBolt exception

Repository: incubator-storm
Updated Branches:
  refs/heads/master b1c5e7eae -> 2ebdbfa7c


STORM-87 fail fast on ShellBolt exception


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

Branch: refs/heads/master
Commit: b1ccc153d924a971d2f1303023b969f8c975b238
Parents: 017d73f
Author: Kang Xiao <kx...@gmail.com>
Authored: Wed Mar 12 00:17:58 2014 +0800
Committer: Kang Xiao <kx...@gmail.com>
Committed: Wed Mar 12 00:17:58 2014 +0800

----------------------------------------------------------------------
 storm-core/src/jvm/backtype/storm/task/ShellBolt.java | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/b1ccc153/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/task/ShellBolt.java b/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
index 118e90e..f34d465 100644
--- a/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
+++ b/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
@@ -241,5 +241,8 @@ public class ShellBolt implements IBolt {
 
     private void die(Throwable exception) {
         _exception = exception;
+        LOG.info("Halting process: ShellBolt died.", exception);
+        _collector.reportError(exception);
+        Runtime.getRuntime().halt(11);
     }
 }


[4/6] git commit: use log-error instead of log-message in exit-process!

Posted by bo...@apache.org.
use log-error instead of log-message in exit-process!


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

Branch: refs/heads/master
Commit: b60feb7407b77b0a70f00340d13c287324c53480
Parents: 1e3a2b8
Author: Kang Xiao <kx...@gmail.com>
Authored: Fri Aug 8 00:12:29 2014 +0800
Committer: Kang Xiao <kx...@gmail.com>
Committed: Fri Aug 8 00:12:29 2014 +0800

----------------------------------------------------------------------
 storm-core/src/clj/backtype/storm/util.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/b60feb74/storm-core/src/clj/backtype/storm/util.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/util.clj b/storm-core/src/clj/backtype/storm/util.clj
index 3df25b7..7bd4991 100644
--- a/storm-core/src/clj/backtype/storm/util.clj
+++ b/storm-core/src/clj/backtype/storm/util.clj
@@ -316,7 +316,7 @@
 
 (defn exit-process!
   [val & msg]
-  (log-message "Halting process: " msg)
+  (log-error (RuntimeException. msg) "Halting process: " msg)
   (.exit (Runtime/getRuntime) val))
 
 (defn sum


[3/6] git commit: Merge branch 'master' of https://github.com/apache/incubator-storm into STORM-87

Posted by bo...@apache.org.
Merge branch 'master' of https://github.com/apache/incubator-storm into STORM-87

Conflicts:
	storm-core/src/jvm/backtype/storm/task/ShellBolt.java


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

Branch: refs/heads/master
Commit: 1e3a2b80d4ffe3431bae5912ac3ec39cf12a8ab6
Parents: cea872d b1c5e7e
Author: Kang Xiao <kx...@gmail.com>
Authored: Thu Aug 7 23:59:29 2014 +0800
Committer: Kang Xiao <kx...@gmail.com>
Committed: Thu Aug 7 23:59:29 2014 +0800

----------------------------------------------------------------------
 .gitignore                                      |    4 +-
 BYLAWS.md                                       |   96 ++
 CHANGELOG.md                                    |  106 +-
 DEVELOPER.md                                    |  343 +++++
 LICENSE                                         |  154 +-
 NOTICE                                          |    2 +-
 README.markdown                                 |   59 +-
 SECURITY.md                                     |   74 +
 STORM-UI-REST-API.md                            |  565 +++++++
 bin/storm                                       |  134 +-
 bin/storm-config.cmd                            |   27 +-
 bin/storm.cmd                                   |   59 +-
 conf/defaults.yaml                              |   16 +-
 conf/storm.yaml.example                         |    2 +-
 conf/storm_env.ini                              |   30 +
 dev-tools/github/__init__.py                    |  109 ++
 dev-tools/jira-github-join.py                   |   80 +
 dev-tools/jira/__init__.py                      |  232 +++
 examples/storm-starter/README.markdown          |  155 ++
 .../multilang/resources/splitsentence.py        |   24 +
 .../multilang/resources/splitsentence.rb        |   26 +
 .../storm-starter/multilang/resources/storm.py  |  221 +++
 .../storm-starter/multilang/resources/storm.rb  |  200 +++
 examples/storm-starter/pom.xml                  |  165 ++
 .../src/clj/storm/starter/clj/word_count.clj    |   95 ++
 .../jvm/storm/starter/BasicDRPCTopology.java    |   78 +
 .../jvm/storm/starter/ExclamationTopology.java  |   87 ++
 .../src/jvm/storm/starter/ManualDRPC.java       |   68 +
 .../jvm/storm/starter/PrintSampleStream.java    |   58 +
 .../src/jvm/storm/starter/ReachTopology.java    |  196 +++
 .../src/jvm/storm/starter/RollingTopWords.java  |  132 ++
 .../jvm/storm/starter/SingleJoinExample.java    |   64 +
 .../storm/starter/TransactionalGlobalCount.java |  173 +++
 .../jvm/storm/starter/TransactionalWords.java   |  246 +++
 .../jvm/storm/starter/WordCountTopology.java    |  107 ++
 .../storm/starter/bolt/AbstractRankerBolt.java  |  110 ++
 .../starter/bolt/IntermediateRankingsBolt.java  |   58 +
 .../src/jvm/storm/starter/bolt/PrinterBolt.java |   37 +
 .../storm/starter/bolt/RollingCountBolt.java    |  142 ++
 .../jvm/storm/starter/bolt/SingleJoinBolt.java  |  114 ++
 .../storm/starter/bolt/TotalRankingsBolt.java   |   59 +
 .../starter/spout/RandomSentenceSpout.java      |   64 +
 .../storm/starter/spout/TwitterSampleSpout.java |  164 ++
 .../tools/NthLastModifiedTimeTracker.java       |   70 +
 .../src/jvm/storm/starter/tools/Rankable.java   |   32 +
 .../starter/tools/RankableObjectWithFields.java |  148 ++
 .../src/jvm/storm/starter/tools/Rankings.java   |  156 ++
 .../starter/tools/SlidingWindowCounter.java     |  119 ++
 .../storm/starter/tools/SlotBasedCounter.java   |  118 ++
 .../jvm/storm/starter/trident/TridentReach.java |  156 ++
 .../storm/starter/trident/TridentWordCount.java |   85 +
 .../src/jvm/storm/starter/util/StormRunner.java |   47 +
 .../jvm/storm/starter/util/TupleHelpers.java    |   33 +
 .../bolt/IntermediateRankingsBoltTest.java      |  146 ++
 .../starter/bolt/RollingCountBoltTest.java      |  113 ++
 .../starter/bolt/TotalRankingsBoltTest.java     |  147 ++
 .../storm/starter/tools/MockTupleHelpers.java   |   40 +
 .../tools/NthLastModifiedTimeTrackerTest.java   |  125 ++
 .../tools/RankableObjectWithFieldsTest.java     |  252 +++
 .../jvm/storm/starter/tools/RankingsTest.java   |  368 +++++
 .../starter/tools/SlidingWindowCounterTest.java |  106 ++
 .../starter/tools/SlotBasedCounterTest.java     |  181 +++
 external/storm-kafka/CHANGELOG.md               |   13 +
 external/storm-kafka/README.md                  |   49 +
 external/storm-kafka/pom.xml                    |  119 ++
 .../storm-kafka/src/jvm/storm/kafka/Broker.java |   86 ++
 .../src/jvm/storm/kafka/BrokerHosts.java        |   25 +
 .../jvm/storm/kafka/DynamicBrokersReader.java   |  147 ++
 .../kafka/DynamicPartitionConnections.java      |   94 ++
 .../jvm/storm/kafka/FailedFetchException.java   |   29 +
 .../src/jvm/storm/kafka/KafkaConfig.java        |   52 +
 .../src/jvm/storm/kafka/KafkaError.java         |   43 +
 .../src/jvm/storm/kafka/KafkaSpout.java         |  195 +++
 .../src/jvm/storm/kafka/KafkaUtils.java         |  243 +++
 .../src/jvm/storm/kafka/KeyValueScheme.java     |   28 +
 .../kafka/KeyValueSchemeAsMultiScheme.java      |   37 +
 .../src/jvm/storm/kafka/Partition.java          |   69 +
 .../jvm/storm/kafka/PartitionCoordinator.java   |   28 +
 .../src/jvm/storm/kafka/PartitionManager.java   |  265 ++++
 .../src/jvm/storm/kafka/SpoutConfig.java        |   36 +
 .../src/jvm/storm/kafka/StaticCoordinator.java  |   51 +
 .../src/jvm/storm/kafka/StaticHosts.java        |   38 +
 .../storm/kafka/StaticPartitionConnections.java |   52 +
 .../jvm/storm/kafka/StringKeyValueScheme.java   |   37 +
 .../src/jvm/storm/kafka/StringScheme.java       |   46 +
 .../src/jvm/storm/kafka/ZkCoordinator.java      |  113 ++
 .../src/jvm/storm/kafka/ZkHosts.java            |   36 +
 .../src/jvm/storm/kafka/ZkState.java            |  116 ++
 .../src/jvm/storm/kafka/bolt/KafkaBolt.java     |   89 ++
 .../jvm/storm/kafka/trident/Coordinator.java    |   50 +
 .../storm/kafka/trident/DefaultCoordinator.java |   31 +
 .../trident/GlobalPartitionInformation.java     |   98 ++
 .../storm/kafka/trident/IBatchCoordinator.java  |   26 +
 .../jvm/storm/kafka/trident/IBrokerReader.java  |   25 +
 .../src/jvm/storm/kafka/trident/MaxMetric.java  |   40 +
 .../kafka/trident/OpaqueTridentKafkaSpout.java  |   59 +
 .../storm/kafka/trident/StaticBrokerReader.java |   36 +
 .../trident/TransactionalTridentKafkaSpout.java |   58 +
 .../storm/kafka/trident/TridentKafkaConfig.java |   37 +
 .../kafka/trident/TridentKafkaEmitter.java      |  268 ++++
 .../jvm/storm/kafka/trident/ZkBrokerReader.java |   70 +
 .../storm/kafka/DynamicBrokersReaderTest.java   |  172 +++
 .../src/test/storm/kafka/KafkaErrorTest.java    |   56 +
 .../src/test/storm/kafka/KafkaTestBroker.java   |   92 ++
 .../src/test/storm/kafka/KafkaUtilsTest.java    |  242 +++
 .../storm/kafka/StringKeyValueSchemeTest.java   |   55 +
 .../src/test/storm/kafka/TestUtils.java         |   37 +
 .../src/test/storm/kafka/ZkCoordinatorTest.java |  147 ++
 .../test/storm/kafka/bolt/KafkaBoltTest.java    |  188 +++
 logback/cluster.xml                             |    2 +-
 pom.xml                                         |  121 +-
 .../maven-shade-clojure-transformer/pom.xml     |    2 +-
 storm-core/pom.xml                              |   60 +-
 .../src/clj/backtype/storm/LocalCluster.clj     |   76 +-
 storm-core/src/clj/backtype/storm/LocalDRPC.clj |    5 +-
 storm-core/src/clj/backtype/storm/bootstrap.clj |    9 +-
 storm-core/src/clj/backtype/storm/clojure.clj   |   10 +-
 storm-core/src/clj/backtype/storm/cluster.clj   |  460 +++---
 .../src/clj/backtype/storm/command/monitor.clj  |   37 +
 .../clj/backtype/storm/command/rebalance.clj    |    7 +-
 storm-core/src/clj/backtype/storm/config.clj    |  145 +-
 .../src/clj/backtype/storm/daemon/common.clj    |    8 +-
 .../src/clj/backtype/storm/daemon/drpc.clj      |  139 +-
 .../src/clj/backtype/storm/daemon/executor.clj  |   46 +-
 .../src/clj/backtype/storm/daemon/logviewer.clj |  182 ++-
 .../src/clj/backtype/storm/daemon/nimbus.clj    |   19 +-
 .../clj/backtype/storm/daemon/supervisor.clj    |  157 +-
 .../src/clj/backtype/storm/daemon/worker.clj    |  101 +-
 storm-core/src/clj/backtype/storm/disruptor.clj |   89 +-
 storm-core/src/clj/backtype/storm/event.clj     |   49 +-
 storm-core/src/clj/backtype/storm/log.clj       |   22 +-
 .../src/clj/backtype/storm/messaging/loader.clj |   81 +-
 .../src/clj/backtype/storm/messaging/local.clj  |   20 +-
 .../clj/backtype/storm/process_simulator.clj    |   27 +-
 storm-core/src/clj/backtype/storm/stats.clj     |  289 ++--
 storm-core/src/clj/backtype/storm/testing.clj   |  545 +++----
 storm-core/src/clj/backtype/storm/testing4j.clj |   58 +-
 storm-core/src/clj/backtype/storm/thrift.clj    |  255 +--
 storm-core/src/clj/backtype/storm/timer.clj     |  109 +-
 storm-core/src/clj/backtype/storm/tuple.clj     |    7 +-
 storm-core/src/clj/backtype/storm/ui/core.clj   | 1453 ++++++++----------
 .../src/clj/backtype/storm/ui/helpers.clj       |   13 +-
 storm-core/src/clj/backtype/storm/util.clj      |  779 +++++-----
 storm-core/src/clj/backtype/storm/zookeeper.clj |  191 ++-
 .../src/dev/resources/tester_bolt_metrics.py    |   35 +
 .../src/dev/resources/tester_spout_metrics.py   |   51 +
 storm-core/src/jvm/backtype/storm/Config.java   |  182 ++-
 .../jvm/backtype/storm/ConfigValidation.java    |   87 ++
 .../src/jvm/backtype/storm/StormSubmitter.java  |  176 ++-
 .../jvm/backtype/storm/generated/ErrorInfo.java |  188 ++-
 .../backtype/storm/messaging/IConnection.java   |   15 +-
 .../backtype/storm/messaging/netty/Client.java  |  332 ++--
 .../backtype/storm/messaging/netty/Context.java |   57 +-
 .../storm/messaging/netty/ControlMessage.java   |    6 +-
 .../storm/messaging/netty/MessageBatch.java     |   52 +-
 .../storm/messaging/netty/MessageDecoder.java   |  108 +-
 .../netty/NettyRenameThreadFactory.java         |   52 +
 .../backtype/storm/messaging/netty/Server.java  |  147 +-
 .../netty/StormClientErrorHandler.java          |   41 +
 .../messaging/netty/StormClientHandler.java     |  121 --
 .../netty/StormClientPipelineFactory.java       |    2 +-
 .../messaging/netty/StormServerHandler.java     |   40 +-
 .../metric/api/rpc/AssignableShellMetric.java   |   30 +
 .../metric/api/rpc/CombinedShellMetric.java     |   31 +
 .../storm/metric/api/rpc/CountShellMetric.java  |   38 +
 .../storm/metric/api/rpc/IShellMetric.java      |   31 +
 .../metric/api/rpc/ReducedShellMetric.java      |   32 +
 .../jvm/backtype/storm/multilang/BoltMsg.java   |   80 +
 .../backtype/storm/multilang/ISerializer.java   |   82 +
 .../storm/multilang/JsonSerializer.java         |  194 +++
 .../storm/multilang/NoOutputException.java      |   40 +
 .../jvm/backtype/storm/multilang/ShellMsg.java  |  168 ++
 .../jvm/backtype/storm/multilang/SpoutMsg.java  |   51 +
 .../src/jvm/backtype/storm/spout/ISpout.java    |    2 +-
 .../jvm/backtype/storm/spout/ShellSpout.java    |  155 +-
 .../src/jvm/backtype/storm/task/ShellBolt.java  |  180 ++-
 .../backtype/storm/task/TopologyContext.java    |   50 +-
 .../storm/testing/PythonShellMetricsBolt.java   |   32 +
 .../storm/testing/PythonShellMetricsSpout.java  |   35 +
 .../storm/testing/TestEventLogSpout.java        |  139 ++
 .../storm/testing/TestEventOrderCheckBolt.java  |   76 +
 .../transactional/state/TransactionalState.java |    2 +-
 .../storm/ui/InvalidRequestException.java       |   20 +
 .../backtype/storm/utils/DisruptorQueue.java    |  121 +-
 .../src/jvm/backtype/storm/utils/Monitor.java   |  249 +++
 .../jvm/backtype/storm/utils/ShellProcess.java  |  195 ++-
 .../src/jvm/backtype/storm/utils/Time.java      |   18 +-
 .../backtype/storm/utils/TransferDrainer.java   |  113 ++
 .../src/jvm/backtype/storm/utils/Utils.java     |  120 +-
 storm-core/src/jvm/storm/trident/Stream.java    |    5 +-
 .../trident/spout/RichSpoutBatchTriggerer.java  |    1 +
 .../jvm/storm/trident/state/map/OpaqueMap.java  |    6 +-
 .../trident/state/map/RemovableMapState.java    |   25 +
 .../storm/trident/testing/MemoryMapState.java   |   27 +-
 .../topology/MasterBatchCoordinator.java        |    4 +
 .../topology/state/TransactionalState.java      |    2 +-
 .../jvm/storm/trident/util/TridentUtils.java    |   14 +-
 storm-core/src/multilang/py/storm.py            |   30 +-
 storm-core/src/multilang/rb/storm.rb            |   24 +-
 storm-core/src/py/storm/ttypes.py               |   28 +-
 storm-core/src/storm.thrift                     |    2 +
 storm-core/src/ui/public/component.html         |  125 ++
 storm-core/src/ui/public/css/style.css          |    1 +
 storm-core/src/ui/public/index.html             |   89 ++
 storm-core/src/ui/public/js/arbor-graphics.js   |   51 +
 storm-core/src/ui/public/js/arbor-tween.js      |   86 ++
 storm-core/src/ui/public/js/arbor.js            |   67 +
 storm-core/src/ui/public/js/jquery.mustache.js  |  592 +++++++
 .../src/ui/public/js/jquery.tablesorter.min.js  |    9 +-
 storm-core/src/ui/public/js/moment.min.js       |    6 +
 storm-core/src/ui/public/js/purl.js             |  267 ++++
 storm-core/src/ui/public/js/script.js           |   60 +-
 storm-core/src/ui/public/js/visualization.js    |  421 +++++
 .../templates/component-page-template.html      |  173 +++
 .../public/templates/index-page-template.html   |   78 +
 .../public/templates/json-error-template.html   |   20 +
 .../templates/topology-page-template.html       |  152 ++
 storm-core/src/ui/public/topology.html          |  119 ++
 .../test/clj/backtype/storm/cluster_test.clj    |   11 +-
 .../test/clj/backtype/storm/config_test.clj     |   61 +-
 .../test/clj/backtype/storm/drpc_test.clj       |   27 +-
 .../clj/backtype/storm/integration_test.clj     |    9 +-
 .../storm/messaging/netty_unit_test.clj         |   46 +-
 .../test/clj/backtype/storm/messaging_test.clj  |   35 +-
 .../test/clj/backtype/storm/metrics_test.clj    |  218 ++-
 .../test/clj/backtype/storm/multilang_test.clj  |    6 +-
 .../test/clj/backtype/storm/nimbus_test.clj     |   16 +-
 .../test/clj/backtype/storm/supervisor_test.clj |  184 ++-
 .../test/clj/backtype/storm/utils_test.clj      |    2 +-
 .../test/clj/storm/trident/integration_test.clj |    2 +-
 .../test/clj/storm/trident/state_test.clj       |   33 +-
 .../storm/utils/DisruptorQueueTest.java         |  152 ++
 storm-dist/binary/LICENSE                       |  154 +-
 storm-dist/binary/NOTICE                        |    4 +-
 storm-dist/binary/pom.xml                       |   42 +-
 storm-dist/binary/src/main/assembly/binary.xml  |   41 +
 storm-dist/source/pom.xml                       |   40 +-
 237 files changed, 20880 insertions(+), 3536 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/1e3a2b80/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
----------------------------------------------------------------------
diff --cc storm-core/src/jvm/backtype/storm/task/ShellBolt.java
index 17938dc,4f8bca5..e677699
--- a/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
+++ b/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
@@@ -240,9 -290,8 +290,11 @@@ public class ShellBolt implements IBol
      }
  
      private void die(Throwable exception) {
-         _exception = exception;
+         String processInfo = _process.getProcessInfoString() + _process.getProcessTerminationInfoString();
+         _exception = new RuntimeException(processInfo, exception);
 +        LOG.error("Halting process: ShellBolt died.", exception);
 +        _collector.reportError(exception);
 +        System.exit(11);
      }
+ 
  }


[2/6] git commit: STORM-87 code change accorrding to comments 1. log level change to error 2. use exit instead of halt to terminate jvm

Posted by bo...@apache.org.
STORM-87 code change accorrding to comments
1. log level change to error
2. use exit instead of halt to terminate jvm


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

Branch: refs/heads/master
Commit: cea872d4e9317601eed60f7fa0a9a831446f41be
Parents: b1ccc15
Author: Kang Xiao <kx...@gmail.com>
Authored: Sun Jul 20 00:40:15 2014 +0800
Committer: Kang Xiao <kx...@gmail.com>
Committed: Sun Jul 20 00:40:15 2014 +0800

----------------------------------------------------------------------
 storm-core/src/jvm/backtype/storm/task/ShellBolt.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/cea872d4/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/task/ShellBolt.java b/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
index f34d465..17938dc 100644
--- a/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
+++ b/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
@@ -241,8 +241,8 @@ public class ShellBolt implements IBolt {
 
     private void die(Throwable exception) {
         _exception = exception;
-        LOG.info("Halting process: ShellBolt died.", exception);
+        LOG.error("Halting process: ShellBolt died.", exception);
         _collector.reportError(exception);
-        Runtime.getRuntime().halt(11);
+        System.exit(11);
     }
 }


[5/6] git commit: Merge branch 'STORM-87' of https://github.com/xiaokang/incubator-storm into STORM-87

Posted by bo...@apache.org.
Merge branch 'STORM-87' of https://github.com/xiaokang/incubator-storm into STORM-87

STORM-87: fail fast on ShellBolt exception


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

Branch: refs/heads/master
Commit: aff8d651ee32bec8f39baf32f2ff15595e3e0106
Parents: b1c5e7e b60feb7
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Thu Aug 7 11:26:25 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Thu Aug 7 11:26:25 2014 -0500

----------------------------------------------------------------------
 storm-core/src/clj/backtype/storm/util.clj            | 2 +-
 storm-core/src/jvm/backtype/storm/task/ShellBolt.java | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



[6/6] git commit: Added STORM-87 to Changelog

Posted by bo...@apache.org.
Added STORM-87 to Changelog


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

Branch: refs/heads/master
Commit: 2ebdbfa7c746e7c75f3aa34866e1c42d9c0fa340
Parents: aff8d65
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Thu Aug 7 11:27:10 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Thu Aug 7 11:27:10 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/2ebdbfa7/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9599e25..f4c20f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@
  * STORM-369: topology summary page displays wrong order.
  * STORM-350: LMAX Disruptor 3.2.1
  * STORM-239: Allow supervisor to operate in paths with spaces in them
+ * STORM-87: fail fast on ShellBolt exception
 
 ## 0.9.2-incubating
  * STORM-66: send taskid on initial handshake