release 0.9.3.1 rc

alibaba · May 15, 2014 · 97abe5e · 97abe5e
1 parent f85dd69
commit 97abe5e
Show file tree

Hide file tree

Showing 87 changed files with 21,694 additions and 24,251 deletions.
diff --git a/README.md b/README.md
diff --git a/example/sequence-split-merge/conf/conf.prop b/example/sequence-split-merge/conf/conf.prop
@@ -1,6 +1,6 @@
 topology.name=SequenceTest
 topology.workers=8
-topology.max.spout.pending=1000
+topology.max.spout.pending=10000
 topology.acker.executors=1
 topology.debug=false
 
@@ -14,4 +14,4 @@ check.sequence=true
 kryo.enable=false
 fall.back.on.java.serialization=true
 
-enable.split=false
+enable.split=false
diff --git a/example/sequence-split-merge/pom.xml b/example/sequence-split-merge/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>storm</groupId>
 	<artifactId>sequence-split-merge</artifactId>
-	<version>1.0.6</version>
+	<version>1.0.7</version>
 	<packaging>jar</packaging>
 
 	<name>sequence-split-merge</name>
@@ -33,21 +33,21 @@
 		<dependency>
 			<groupId>com.alibaba.jstorm</groupId>
 			<artifactId>jstorm-client</artifactId>
-			<version>0.9.2</version>
+			<version>0.9.3.1</version>
 			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>com.alibaba.jstorm</groupId>
 			<artifactId>jstorm-client-extension</artifactId>
-			<version>0.9.2</version>
+			<version>0.9.3.1</version>
 			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>com.alibaba.jstorm</groupId>
 			<artifactId>jstorm-server</artifactId>
-			<version>0.9.2</version>
+			<version>0.9.3.1</version>
 			<scope>provided</scope>
 		</dependency>
 

diff --git a/...quence-split-merge/src/main/java/com/alipay/dw/jstorm/example/drpc/TestReachTopology.java b/...quence-split-merge/src/main/java/com/alipay/dw/jstorm/example/drpc/TestReachTopology.java
@@ -1,10 +1,11 @@
 package com.alipay.dw.jstorm.example.drpc;
 
-import org.apache.thrift.TException;
+import org.apache.thrift7.TException;
 
 import backtype.storm.generated.DRPCExecutionException;
 import backtype.storm.utils.DRPCClient;
 
+
 public class TestReachTopology {
 
     /**

diff --git a/example/sequence-split-merge/start.sh b/example/sequence-split-merge/start.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-jstorm jar target/sequence-split-merge-1.0.6-jar-with-dependencies.jar com.alipay.dw.jstorm.example.sequence.SequenceTopology conf/conf.prop
+jstorm jar target/sequence-split-merge-1.0.7-jar-with-dependencies.jar com.alipay.dw.jstorm.example.sequence.SequenceTopology conf/conf.prop
diff --git a/history.md b/history.md
@@ -1,5 +1,12 @@
 [JStorm 0.9.0 ½éÉÜ](http://wenku.baidu.com/view/59e81017dd36a32d7375818b.html)
 
+#Release 0.9.3.1
+
+## Enhancement
+1. switch apache thrift7 to storm thrift7
+2. set defatult acker number is 1
+3. add "spout.single.thread" setting
+
 #Release 0.9.3
 ## New feature
 1. Support Aliyun Apsara/Hadoop Yarn
@@ -38,7 +45,7 @@
 2. Support CGroups, assigning CPU in hardware level.
 3. Support simple logview
 
-## Bug fix
+## Bug fix or enhancement
 1. Change SpoutExecutor's RotatingMap to TimeCacheMap, when putting too much timeout tuple is easy to cause deadlock in spout acker thread
 2. Tunning gc parameter, improve performance and avoid full GC
 3. Improve Topology's own gc priority, make it higher than JStorm system setting.
@@ -81,7 +88,7 @@
    please enable application classloader.
 2. Group Quato, Different group with different resource quato.
 
-## Bug fix
+## Bug fix or enhancement
 1. Fix Rotation Map competition issue.
 2. Set default acker number as 0
 3. Set default spout/bolt number as 1

diff --git a/jstorm-client-extension/pom.xml b/jstorm-client-extension/pom.xml
@@ -1,20 +1,21 @@
 <project xmlns="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">
+
 	<parent>
 		<groupId>com.alibaba.jstorm</groupId>
 		<artifactId>jstorm-all</artifactId>
-		<version>0.9.3</version>
+		<version>0.9.3.1</version>
 		<relativePath>..</relativePath>
 	</parent>
-<!-- 	<parent> -->
-<!-- 		<groupId>com.taobao</groupId> -->
-<!-- 		<artifactId>parent</artifactId>  -->
-<!-- 		<version>1.0.2</version> -->
-<!-- 	</parent> -->
+ 	<!--<parent>
+ 		<groupId>com.taobao</groupId> 
+ 		<artifactId>parent</artifactId> 
+ 		<version>1.0.2</version> 
+ 	</parent>  -->
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.alibaba.jstorm</groupId>
 	<artifactId>jstorm-client-extension</artifactId>
-	<version>0.9.3</version>
+	<version>0.9.3.1</version>
 	<packaging>jar</packaging>
 	<name>${project.artifactId}-${project.version}</name>
 

diff --git a/jstorm-client-extension/src/main/java/com/alibaba/jstorm/client/ConfigExtension.java b/jstorm-client-extension/src/main/java/com/alibaba/jstorm/client/ConfigExtension.java
@@ -506,5 +506,15 @@ public static int getContainerHeartbeatFrequence(Map conf) {
 	public static boolean isJavaSandBoxEnable(Map conf) {
 		return JStormUtils.parseBoolean(conf.get(JAVA_SANDBOX_ENABLE), false);
 	}
+
+	protected static String SPOUT_SINGLE_THREAD = "spout.single.thread";
+
+	public static boolean isSpoutSingleThread(Map conf) {
+		return JStormUtils.parseBoolean(conf.get(SPOUT_SINGLE_THREAD), false);
+	}
+
+	public static void setSpoutSingleThread(Map conf, boolean enable) {
+		conf.put(SPOUT_SINGLE_THREAD, enable);
+	}
 
 }
diff --git a/jstorm-client/pom.xml b/jstorm-client/pom.xml
@@ -1,21 +1,22 @@
 <project xmlns="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">
 
+
 	<parent>
 		<groupId>com.alibaba.jstorm</groupId>
 		<artifactId>jstorm-all</artifactId>
-		<version>0.9.3</version>
+		<version>0.9.3.1</version>
 		<relativePath>..</relativePath>
-	</parent>
-<!-- 	<parent>  -->
-<!-- 		<groupId>com.taobao</groupId> -->
-<!-- 		<artifactId>parent</artifactId>  -->
-<!-- 		<version>1.0.2</version>  -->
-<!-- 	</parent> -->
+	</parent> 
+ 	<!-- <parent>  
+ 		<groupId>com.taobao</groupId>
+ 		<artifactId>parent</artifactId> 
+ 		<version>1.0.2</version>
+	</parent> -->
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.alibaba.jstorm</groupId>
 	<artifactId>jstorm-client</artifactId>
-	<version>0.9.3</version>
+	<version>0.9.3.1</version>
 	<packaging>jar</packaging>
 	<name>${project.artifactId}-${project.version}</name>
 
@@ -78,8 +79,8 @@
 			<version>4.1.1</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.thrift</groupId>
-			<artifactId>libthrift</artifactId>
+			<groupId>storm</groupId>
+			<artifactId>libthrift7</artifactId>
 			<version>0.7.0</version>
 			<exclusions>
 				<exclusion>

diff --git a/jstorm-client/src/main/java/backtype/storm/StormSubmitter.java b/jstorm-client/src/main/java/backtype/storm/StormSubmitter.java
@@ -1,18 +1,25 @@
 package backtype.storm;
 
-import backtype.storm.generated.*;
-import backtype.storm.utils.BufferFileInputStream;
-import backtype.storm.utils.NimbusClient;
-import backtype.storm.utils.Utils;
-
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.thrift7.TException;
+import org.json.simple.JSONValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.thrift.TException;
-import org.json.simple.JSONValue;
+
+import backtype.storm.generated.AlreadyAliveException;
+import backtype.storm.generated.ClusterSummary;
+import backtype.storm.generated.InvalidTopologyException;
+import backtype.storm.generated.Nimbus;
+import backtype.storm.generated.StormTopology;
+import backtype.storm.generated.SubmitOptions;
+import backtype.storm.generated.TopologyAssignException;
+import backtype.storm.generated.TopologySummary;
+import backtype.storm.utils.BufferFileInputStream;
+import backtype.storm.utils.NimbusClient;
+import backtype.storm.utils.Utils;
 
 /**
  * Use this class to submit topologies to run on the Storm cluster. You should

diff --git a/jstorm-client/src/main/java/backtype/storm/drpc/DRPCInvocationsClient.java b/jstorm-client/src/main/java/backtype/storm/drpc/DRPCInvocationsClient.java
@@ -1,12 +1,13 @@
 package backtype.storm.drpc;
 
+import org.apache.thrift7.TException;
+import org.apache.thrift7.protocol.TBinaryProtocol;
+import org.apache.thrift7.transport.TFramedTransport;
+import org.apache.thrift7.transport.TSocket;
+import org.apache.thrift7.transport.TTransport;
+
 import backtype.storm.generated.DRPCRequest;
 import backtype.storm.generated.DistributedRPCInvocations;
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.transport.TFramedTransport;
-import org.apache.thrift.transport.TSocket;
-import org.apache.thrift.transport.TTransport;
 
 public class DRPCInvocationsClient implements DistributedRPCInvocations.Iface {
 	private TTransport conn;

diff --git a/jstorm-client/src/main/java/backtype/storm/drpc/DRPCSpout.java b/jstorm-client/src/main/java/backtype/storm/drpc/DRPCSpout.java
@@ -1,5 +1,15 @@
 package backtype.storm.drpc;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.thrift7.TException;
+import org.json.simple.JSONValue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import backtype.storm.Config;
 import backtype.storm.ILocalDRPC;
 import backtype.storm.generated.DRPCRequest;
@@ -12,14 +22,6 @@
 import backtype.storm.tuple.Values;
 import backtype.storm.utils.ServiceRegistry;
 import backtype.storm.utils.Utils;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.thrift.TException;
-import org.json.simple.JSONValue;
 
 public class DRPCSpout extends BaseRichSpout {
 	public static Logger LOG = LoggerFactory.getLogger(DRPCSpout.class);

diff --git a/jstorm-client/src/main/java/backtype/storm/drpc/ReturnResults.java b/jstorm-client/src/main/java/backtype/storm/drpc/ReturnResults.java
@@ -1,5 +1,15 @@
 package backtype.storm.drpc;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.thrift7.TException;
+import org.json.simple.JSONValue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import backtype.storm.Config;
 import backtype.storm.generated.DistributedRPCInvocations;
 import backtype.storm.task.OutputCollector;
@@ -9,14 +19,6 @@
 import backtype.storm.tuple.Tuple;
 import backtype.storm.utils.ServiceRegistry;
 import backtype.storm.utils.Utils;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.thrift.TException;
-import org.json.simple.JSONValue;
 
 public class ReturnResults extends BaseRichBolt {
 	public static final Logger LOG = LoggerFactory