You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/08/15 18:38:09 UTC

[1/7] storm git commit: change ShellProcess#getErrorsStream so that it checks that there is actually something to read.

Repository: storm
Updated Branches:
  refs/heads/0.9.x-branch d9f188117 -> d0db61a87


change ShellProcess#getErrorsStream so that it checks that there is actually something to read.


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

Branch: refs/heads/0.9.x-branch
Commit: 6127edc3933be7587cab9c0d2af3141ca0247333
Parents: e9cffee
Author: JuDasheng <ju...@meituan.com>
Authored: Thu Oct 30 11:46:21 2014 +0800
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Jul 20 13:29:41 2016 -0400

----------------------------------------------------------------------
 .../src/jvm/backtype/storm/utils/ShellProcess.java       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/6127edc3/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java b/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java
index 6bcdf26..811d5b9 100644
--- a/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java
+++ b/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java
@@ -135,7 +135,14 @@ public class ShellProcess implements Serializable {
     public String getErrorsString() {
         if (processErrorStream != null) {
             try {
-                return IOUtils.toString(processErrorStream);
+                StringBuilder sb = new StringBuilder();
+                while (processErrorStream.available() > 0) {
+                    int bufferSize = processErrorStream.available();
+                    byte[] errorReadingBuffer = new byte[bufferSize];
+                    processErrorStream.read(errorReadingBuffer, 0, bufferSize);
+                    sb.append(new String(errorReadingBuffer));
+                }
+                return sb.toString();
             } catch (IOException e) {
                 return "(Unable to capture error stream)";
             }
@@ -179,4 +186,4 @@ public class ShellProcess implements Serializable {
     public String getProcessTerminationInfoString() {
         return String.format(" exitCode:%s, errorString:%s ", getExitCode(), getErrorsString());
     }
-}
\ No newline at end of file
+}


[5/7] storm git commit: [maven-release-plugin] prepare release v0.9.7

Posted by pt...@apache.org.
[maven-release-plugin] prepare release v0.9.7


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

Branch: refs/heads/0.9.x-branch
Commit: ead1452f75212129deec76efbde737a2fdc85387
Parents: 938a92e
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Mon Aug 15 14:36:35 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Mon Aug 15 14:36:35 2016 -0400

----------------------------------------------------------------------
 examples/storm-starter/pom.xml                           | 2 +-
 external/storm-hbase/pom.xml                             | 2 +-
 external/storm-hdfs/pom.xml                              | 2 +-
 external/storm-kafka/pom.xml                             | 2 +-
 pom.xml                                                  | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-core/pom.xml                                       | 2 +-
 storm-dist/binary/pom.xml                                | 2 +-
 storm-dist/source/pom.xml                                | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/ead1452f/examples/storm-starter/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 96442b1..35fef08 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   <parent>
       <artifactId>storm</artifactId>
       <groupId>org.apache.storm</groupId>
-      <version>0.9.7-SNAPSHOT</version>
+      <version>0.9.7</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/ead1452f/external/storm-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index 6a68a17..3db31b2 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>0.9.7-SNAPSHOT</version>
+        <version>0.9.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/ead1452f/external/storm-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 5a97fc2..159b1ce 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>0.9.7-SNAPSHOT</version>
+        <version>0.9.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/ead1452f/external/storm-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 4f9bf4b..9fe8110 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>0.9.7-SNAPSHOT</version>
+        <version>0.9.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/ead1452f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9676f86..459bd7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
     <groupId>org.apache.storm</groupId>
     <artifactId>storm</artifactId>
-    <version>0.9.7-SNAPSHOT</version>
+    <version>0.9.7</version>
     <packaging>pom</packaging>
     <name>Storm</name>
     <description>Distributed and fault-tolerant realtime computation</description>
@@ -166,7 +166,7 @@
     <scm>
         <connection>scm:git:https://git-wip-us.apache.org/repos/asf/storm.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/storm.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>v0.9.7</tag>
         <url>https://git-wip-us.apache.org/repos/asf/storm</url>
     </scm>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/ead1452f/storm-buildtools/maven-shade-clojure-transformer/pom.xml
----------------------------------------------------------------------
diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
index 735301b..6e14fc6 100644
--- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml
+++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>0.9.7-SNAPSHOT</version>
+        <version>0.9.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/ead1452f/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index d21a634..b7d0d18 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>0.9.7-SNAPSHOT</version>
+        <version>0.9.7</version>
     </parent>
     <groupId>org.apache.storm</groupId>
     <artifactId>storm-core</artifactId>

http://git-wip-us.apache.org/repos/asf/storm/blob/ead1452f/storm-dist/binary/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/pom.xml b/storm-dist/binary/pom.xml
index 9aa84ac..5e04c70 100644
--- a/storm-dist/binary/pom.xml
+++ b/storm-dist/binary/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>0.9.7-SNAPSHOT</version>
+        <version>0.9.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>org.apache.storm</groupId>

http://git-wip-us.apache.org/repos/asf/storm/blob/ead1452f/storm-dist/source/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/source/pom.xml b/storm-dist/source/pom.xml
index a468153..7ec8918 100644
--- a/storm-dist/source/pom.xml
+++ b/storm-dist/source/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>0.9.7-SNAPSHOT</version>
+        <version>0.9.7</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>org.apache.storm</groupId>


[4/7] storm git commit: add STORM-1928, STORM-442 to changelog

Posted by pt...@apache.org.
add STORM-1928, STORM-442 to changelog


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

Branch: refs/heads/0.9.x-branch
Commit: 938a92e137e09d1118c2efb471d169f597a17581
Parents: 2a9dd46
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Mon Aug 15 13:47:16 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Mon Aug 15 13:47:16 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/storm/blob/938a92e1/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fb3313..afef702 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.7
+ * STORM-442: multilang ShellBolt/ShellSpout die() can be hang when Exception happened
+ * STORM-1928: ShellSpout should check heartbeat while ShellSpout is waiting for subprocess to sync
+
 ## 0.9.6
  * STORM-1027: Use overflow buffer for emitting metrics
  * STORM-996: netty-unit-tests/test-batch demonstrates out-of-order delivery


[3/7] storm git commit: fix missing import

Posted by pt...@apache.org.
fix missing import


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

Branch: refs/heads/0.9.x-branch
Commit: 2a9dd46bba41d2f44efd3cd7cf8fe38b11e8414a
Parents: c1d78c7
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Jul 20 14:32:36 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Jul 20 14:32:36 2016 -0400

----------------------------------------------------------------------
 storm-core/src/jvm/backtype/storm/spout/ShellSpout.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/2a9dd46b/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java b/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
index 9198862..dca7579 100644
--- a/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
+++ b/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
@@ -25,6 +25,8 @@ import backtype.storm.multilang.ShellMsg;
 import backtype.storm.multilang.SpoutMsg;
 import backtype.storm.task.TopologyContext;
 import backtype.storm.utils.ShellProcess;
+
+import java.util.Arrays;
 import java.util.Map;
 import java.util.List;
 import java.util.TimerTask;


[2/7] storm git commit: STORM-1928 ShellSpout should only check heartbeat while ShellSpout is waiting for subprocess to sync

Posted by pt...@apache.org.
STORM-1928 ShellSpout should only check heartbeat while ShellSpout is waiting for subprocess to sync

* only check heartbeat while ShellSpout is waiting for subprocess to sync
* change ShellSpout.die logic similar to ShellBolt
  * ShellSpout's die message is logged but worker is not died after logging
  * Confirmed that worker becomes died when die has been called
* rename method to more meaningful name
* mark waiting subprocess first to check heartbeat while also sending spout message to subprocess


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

Branch: refs/heads/0.9.x-branch
Commit: c1d78c7faa56547a7851aec5f807049907e34d4e
Parents: 6127edc
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Jun 28 00:07:59 2016 +0900
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Jul 20 14:31:57 2016 -0400

----------------------------------------------------------------------
 .../jvm/backtype/storm/spout/ShellSpout.java    | 54 ++++++++++++++++----
 1 file changed, 44 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/c1d78c7f/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java b/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
index ece11ee..9198862 100644
--- a/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
+++ b/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
@@ -31,6 +31,7 @@ import java.util.TimerTask;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
 import clojure.lang.RT;
@@ -45,7 +46,9 @@ public class ShellSpout implements ISpout {
     private SpoutOutputCollector _collector;
     private String[] _command;
     private ShellProcess _process;
-    
+    private volatile boolean _running = true;
+    private volatile RuntimeException _exception;
+
     private TopologyContext _context;
     
     private SpoutMsg _spoutMsg;
@@ -53,6 +56,7 @@ public class ShellSpout implements ISpout {
     private int workerTimeoutMills;
     private ScheduledExecutorService heartBeatExecutorService;
     private AtomicLong lastHeartbeatTimestamp = new AtomicLong();
+    private AtomicBoolean waitingOnSubprocess = new AtomicBoolean(false);
 
     public ShellSpout(ShellComponent component) {
         this(component.get_execution_command(), component.get_script());
@@ -80,9 +84,14 @@ public class ShellSpout implements ISpout {
     public void close() {
         heartBeatExecutorService.shutdownNow();
         _process.destroy();
+        _running = false;
     }
 
     public void nextTuple() {
+        if (_exception != null) {
+            throw _exception;
+        }
+
         if (_spoutMsg == null) {
             _spoutMsg = new SpoutMsg();
         }
@@ -92,6 +101,10 @@ public class ShellSpout implements ISpout {
     }
 
     public void ack(Object msgId) {
+        if (_exception != null) {
+            throw _exception;
+        }
+
         if (_spoutMsg == null) {
             _spoutMsg = new SpoutMsg();
         }
@@ -101,6 +114,10 @@ public class ShellSpout implements ISpout {
     }
 
     public void fail(Object msgId) {
+        if (_exception != null) {
+            throw _exception;
+        }
+
         if (_spoutMsg == null) {
             _spoutMsg = new SpoutMsg();
         }
@@ -139,6 +156,7 @@ public class ShellSpout implements ISpout {
 
     private void querySubprocess() {
         try {
+            markWaitingSubprocess();
             _process.writeSpoutMsg(_spoutMsg);
 
             while (true) {
@@ -178,9 +196,12 @@ public class ShellSpout implements ISpout {
         } catch (Exception e) {
             String processInfo = _process.getProcessInfoString() + _process.getProcessTerminationInfoString();
             throw new RuntimeException(processInfo, e);
+        } finally {
+            completedWaitingSubprocess();
         }
     }
 
+
     private void handleLog(ShellMsg shellMsg) {
         String msg = shellMsg.getMsg();
         msg = "ShellLog " + _process.getProcessInfoString() + " " + msg;
@@ -233,13 +254,25 @@ public class ShellSpout implements ISpout {
         return lastHeartbeatTimestamp.get();
     }
 
-    private void die(Throwable exception) {
-        heartBeatExecutorService.shutdownNow();
+    private void markWaitingSubprocess() {
+        waitingOnSubprocess.compareAndSet(false, true);
+    }
+
+    private void completedWaitingSubprocess() {
+        waitingOnSubprocess.compareAndSet(true, false);
+    }
 
-        LOG.error("Halting process: ShellSpout died.", exception);
+    private void die(Throwable exception) {
+        String processInfo = _process.getProcessInfoString() + _process.getProcessTerminationInfoString();
+        _exception = new RuntimeException(processInfo, exception);
+        String message = String.format("Halting process: ShellSpout died. Command: %s, ProcessInfo %s",
+            Arrays.toString(_command),
+            processInfo);
+        LOG.error(message, exception);
         _collector.reportError(exception);
-        _process.destroy();
-        System.exit(11);
+        if (_running || (exception instanceof Error)) { //don't exit if not running, unless it is an Error
+            System.exit(11);
+        }
     }
 
     private class SpoutHeartbeatTimerTask extends TimerTask {
@@ -251,13 +284,14 @@ public class ShellSpout implements ISpout {
 
         @Override
         public void run() {
-            long currentTimeMillis = System.currentTimeMillis();
             long lastHeartbeat = getLastHeartbeat();
+            long currentTimestamp = System.currentTimeMillis();
+            boolean isWaitingOnSubprocess = waitingOnSubprocess.get();
 
-            LOG.debug("current time : {}, last heartbeat : {}, worker timeout (ms) : {}",
-                    currentTimeMillis, lastHeartbeat, workerTimeoutMills);
+            LOG.debug("last heartbeat : {}, waiting subprocess now : {}, worker timeout (ms) : {}",
+                    lastHeartbeat, isWaitingOnSubprocess, workerTimeoutMills);
 
-            if (currentTimeMillis - lastHeartbeat > workerTimeoutMills) {
+            if (isWaitingOnSubprocess && currentTimestamp - lastHeartbeat > workerTimeoutMills) {
                 spout.die(new RuntimeException("subprocess heartbeat timeout"));
             }
         }


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

Posted by pt...@apache.org.
Merge branch '0.9.x-branch' of https://git-wip-us.apache.org/repos/asf/storm into 0.9.x-branch


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

Branch: refs/heads/0.9.x-branch
Commit: b75d9b2b6dbfd0fda0b114feafec1384bbfa30aa
Parents: ead1452 d9f1881
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Mon Aug 15 14:37:47 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Mon Aug 15 14:37:47 2016 -0400

----------------------------------------------------------------------
 docs/Concepts.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



[7/7] storm git commit: [maven-release-plugin] prepare for next development iteration

Posted by pt...@apache.org.
[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/d0db61a8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d0db61a8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d0db61a8

Branch: refs/heads/0.9.x-branch
Commit: d0db61a87ea95f945e2ed99073d9c44484f5075c
Parents: b75d9b2
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Mon Aug 15 14:38:15 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Mon Aug 15 14:38:15 2016 -0400

----------------------------------------------------------------------
 examples/storm-starter/pom.xml                           | 2 +-
 external/storm-hbase/pom.xml                             | 2 +-
 external/storm-hdfs/pom.xml                              | 2 +-
 external/storm-kafka/pom.xml                             | 2 +-
 pom.xml                                                  | 4 ++--
 storm-buildtools/maven-shade-clojure-transformer/pom.xml | 2 +-
 storm-core/pom.xml                                       | 2 +-
 storm-dist/binary/pom.xml                                | 2 +-
 storm-dist/source/pom.xml                                | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/d0db61a8/examples/storm-starter/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 35fef08..800ce15 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -20,7 +20,7 @@
   <parent>
       <artifactId>storm</artifactId>
       <groupId>org.apache.storm</groupId>
-      <version>0.9.7</version>
+      <version>0.9.8-SNAPSHOT</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/d0db61a8/external/storm-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index 3db31b2..75b4b02 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>0.9.7</version>
+        <version>0.9.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/d0db61a8/external/storm-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/pom.xml b/external/storm-hdfs/pom.xml
index 159b1ce..a4b2036 100644
--- a/external/storm-hdfs/pom.xml
+++ b/external/storm-hdfs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>0.9.7</version>
+        <version>0.9.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/d0db61a8/external/storm-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index 9fe8110..225a66a 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>0.9.7</version>
+        <version>0.9.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/d0db61a8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 459bd7e..0c7ed2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
     <groupId>org.apache.storm</groupId>
     <artifactId>storm</artifactId>
-    <version>0.9.7</version>
+    <version>0.9.8-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Storm</name>
     <description>Distributed and fault-tolerant realtime computation</description>
@@ -166,7 +166,7 @@
     <scm>
         <connection>scm:git:https://git-wip-us.apache.org/repos/asf/storm.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/storm.git</developerConnection>
-        <tag>v0.9.7</tag>
+        <tag>HEAD</tag>
         <url>https://git-wip-us.apache.org/repos/asf/storm</url>
     </scm>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/d0db61a8/storm-buildtools/maven-shade-clojure-transformer/pom.xml
----------------------------------------------------------------------
diff --git a/storm-buildtools/maven-shade-clojure-transformer/pom.xml b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
index 6e14fc6..3631c40 100644
--- a/storm-buildtools/maven-shade-clojure-transformer/pom.xml
+++ b/storm-buildtools/maven-shade-clojure-transformer/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>0.9.7</version>
+        <version>0.9.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/d0db61a8/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index b7d0d18..de59394 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>0.9.7</version>
+        <version>0.9.8-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.storm</groupId>
     <artifactId>storm-core</artifactId>

http://git-wip-us.apache.org/repos/asf/storm/blob/d0db61a8/storm-dist/binary/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/pom.xml b/storm-dist/binary/pom.xml
index 5e04c70..2df2169 100644
--- a/storm-dist/binary/pom.xml
+++ b/storm-dist/binary/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>0.9.7</version>
+        <version>0.9.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>org.apache.storm</groupId>

http://git-wip-us.apache.org/repos/asf/storm/blob/d0db61a8/storm-dist/source/pom.xml
----------------------------------------------------------------------
diff --git a/storm-dist/source/pom.xml b/storm-dist/source/pom.xml
index 7ec8918..734e88f 100644
--- a/storm-dist/source/pom.xml
+++ b/storm-dist/source/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>storm</artifactId>
         <groupId>org.apache.storm</groupId>
-        <version>0.9.7</version>
+        <version>0.9.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>org.apache.storm</groupId>