You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/03/25 10:08:59 UTC
[1/3] storm git commit: STORM-1655 Flux doesn't set return code to
non-zero when there's any exception while deploying topology to remote
cluster
Repository: storm
Updated Branches:
refs/heads/master 4264bfc2a -> 915ce3848
STORM-1655 Flux doesn't set return code to non-zero when there's any exception while deploying topology to remote cluster
* Modify Flux.runCli() to not catching exceptions so that exception can be propagated to main()
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ba238588
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ba238588
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ba238588
Branch: refs/heads/master
Commit: ba2385882e705ebf5c33f5a03b67dc3b14781460
Parents: df3867f
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Mar 24 16:45:24 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Mar 24 16:45:24 2016 +0900
----------------------------------------------------------------------
.../main/java/org/apache/storm/flux/Flux.java | 22 ++++++++------------
1 file changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ba238588/external/flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java
----------------------------------------------------------------------
diff --git a/external/flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java b/external/flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java
index cdebd01..5848d2f 100644
--- a/external/flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java
+++ b/external/flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java
@@ -159,20 +159,16 @@ public class Flux {
if(!cmd.hasOption(OPTION_DRY_RUN)) {
if (cmd.hasOption(OPTION_REMOTE)) {
LOG.info("Running remotely...");
- try {
- // should the topology be active or inactive
- SubmitOptions submitOptions = null;
- if(cmd.hasOption(OPTION_INACTIVE)){
- LOG.info("Deploying topology in an INACTIVE state...");
- submitOptions = new SubmitOptions(TopologyInitialStatus.INACTIVE);
- } else {
- LOG.info("Deploying topology in an ACTIVE state...");
- submitOptions = new SubmitOptions(TopologyInitialStatus.ACTIVE);
- }
- StormSubmitter.submitTopology(topologyName, conf, topology, submitOptions, null);
- } catch (Exception e) {
- LOG.warn("Unable to deploy topology to remote cluster.", e);
+ // should the topology be active or inactive
+ SubmitOptions submitOptions = null;
+ if(cmd.hasOption(OPTION_INACTIVE)){
+ LOG.info("Deploying topology in an INACTIVE state...");
+ submitOptions = new SubmitOptions(TopologyInitialStatus.INACTIVE);
+ } else {
+ LOG.info("Deploying topology in an ACTIVE state...");
+ submitOptions = new SubmitOptions(TopologyInitialStatus.ACTIVE);
}
+ StormSubmitter.submitTopology(topologyName, conf, topology, submitOptions, null);
} else {
LOG.info("Running in local mode...");
[3/3] storm git commit: add STORM-1655 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-1655 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/915ce384
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/915ce384
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/915ce384
Branch: refs/heads/master
Commit: 915ce3848d11328005337e16f1c2f47a6773c1d9
Parents: 2e10566
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Mar 25 18:08:43 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Mar 25 18:08:43 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/915ce384/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4161389..b47e6a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,8 +65,9 @@
* STORM-1521: When using Kerberos login from keytab with multiple bolts/executors ticket is not renewed in hbase bolt.
## 1.0.0
+ * STORM-1655: Flux doesn't set return code to non-zero when there's any exception while deploying topology to remote cluster
* STORM-1537: Upgrade to kryo3 in master
- * STORM-1654 HBaseBolt creates tick tuples with no interval when we don't set flushIntervalSecs
+ * STORM-1654: HBaseBolt creates tick tuples with no interval when we don't set flushIntervalSecs
* STORM-1625: Move storm-sql dependencies out of lib folder
* STORM-1556: nimbus.clj/wait-for-desired-code-replication wrong reset for current-replication-count-jar in local mode
* STORM-1636: Supervisor shutdown with worker id pass in being nil
[2/3] storm git commit: Merge branch 'STORM-1655'
Posted by ka...@apache.org.
Merge branch 'STORM-1655'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2e105664
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2e105664
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2e105664
Branch: refs/heads/master
Commit: 2e1056648add8c4535d780afb44e04201eff3e52
Parents: 4264bfc ba23858
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Mar 25 18:08:05 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Mar 25 18:08:05 2016 +0900
----------------------------------------------------------------------
.../main/java/org/apache/storm/flux/Flux.java | 22 ++++++++------------
1 file changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------