Merge pull request #1 from alibaba/develop

sync from fescar

Author: sharajava

.gitignore

@@ -8,3 +8,6 @@ target
 /logs
 *.iml
 *.class
+/distribution/bin
+/distribution/conf
+/distribution/lib

README.md

@@ -83,9 +83,7 @@ Contributors are welcomed to join the FEATS project. Please check [CONTRIBUTING]
 
 * [Twitter](https://twitter.com/fescar): TBD. Follow along for latest FESCAR news on Twitter.
 * Email Group:
-     * TBD: FESCAR usage general discussion.
-     * TBD: FESCAR developer discussion (APIs, feature design, etc).
-     * TBD: Commits notice, very high frequency.
+     * [email protected]: FESCAR developer discussion (APIs, feature design, etc).
 
 **Dingtalk**
 

config/pom.xml

@@ -40,16 +40,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>fescar-common</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-transport-native-epoll</artifactId>
-            <classifier>linux-x86_64</classifier>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-transport-native-kqueue</artifactId>
-            <classifier>osx-x86_64</classifier>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

core/src/main/java/com/alibaba/fescar/core/rpc/netty/AbstractRpcRemotingClient.java

@@ -231,9 +231,9 @@ protected Channel getNewChannel(InetSocketAddress address) {
         try {
             f.await(this.nettyClientConfig.getConnectTimeoutMillis(), TimeUnit.MILLISECONDS);
             if (f.isCancelled()) {
-                throw new FrameworkException("connect cancelled, can not connect to fescar-server.");
+                throw new FrameworkException(f.cause(), "connect cancelled, can not connect to fescar-server.");
             } else if (!f.isSuccess()) {
-                throw new FrameworkException("connect failed, can not connect to fescar-server.");
+                throw new FrameworkException(f.cause(), "connect failed, can not connect to fescar-server.");
             } else {
                 channel = f.channel();
             }

core/src/main/java/com/alibaba/fescar/core/rpc/netty/AbstractRpcRemotingServer.java

@@ -19,6 +19,9 @@
 import java.net.InetSocketAddress;
 import java.util.concurrent.ThreadPoolExecutor;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.alibaba.fescar.common.thread.NamedThreadFactory;
 import com.alibaba.fescar.core.rpc.RemotingServer;
 
@@ -34,8 +37,6 @@
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.timeout.IdleStateHandler;
 import io.netty.util.concurrent.DefaultEventExecutorGroup;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The type Rpc remoting server.
@@ -56,6 +57,11 @@ public abstract class AbstractRpcRemotingServer extends AbstractRpcRemoting impl
     private int listenPort;
 
     public void setListenPort(int listenPort) {
+    	
+    	if(listenPort <= 0) {
+    		throw new IllegalArgumentException("listen port: " + listenPort +" is invalid!");
+    	}
+    	
         this.listenPort = listenPort;
     }
 
@@ -84,21 +90,24 @@ public AbstractRpcRemotingServer(final NettyServerConfig nettyServerConfig,
         super(messageExecutor);
         this.serverBootstrap = new ServerBootstrap();
         this.nettyServerConfig = nettyServerConfig;
-        this.eventLoopGroupBoss = new NioEventLoopGroup(nettyServerConfig.getBossThreadSize(),
-            new NamedThreadFactory(nettyServerConfig.getBossThreadPrefix(), nettyServerConfig.getBossThreadSize()));
         if (NettyServerConfig.enableEpoll()) {
+            this.eventLoopGroupBoss = new EpollEventLoopGroup(nettyServerConfig.getBossThreadSize(),
+                new NamedThreadFactory(nettyServerConfig.getBossThreadPrefix(), nettyServerConfig.getBossThreadSize()));
             this.eventLoopGroupWorker = new EpollEventLoopGroup(nettyServerConfig.getServerWorkerThreads(),
                 new NamedThreadFactory(nettyServerConfig.getWorkerThreadPrefix(),
                     nettyServerConfig.getServerWorkerThreads()));
         } else {
+            this.eventLoopGroupBoss = new NioEventLoopGroup(nettyServerConfig.getBossThreadSize(),
+                new NamedThreadFactory(nettyServerConfig.getBossThreadPrefix(), nettyServerConfig.getBossThreadSize()));
             this.eventLoopGroupWorker = new NioEventLoopGroup(nettyServerConfig.getServerWorkerThreads(),
                 new NamedThreadFactory(nettyServerConfig.getWorkerThreadPrefix(),
                     nettyServerConfig.getServerWorkerThreads()));
         }
         if (null != handlers) {
             channelHandlers = handlers;
         }
-
+        // init listenPort in constructor so that getListenPort() will always get the exact port
+        setListenPort(nettyServerConfig.getDefaultListenPort());
     }
 
     @Override
@@ -107,9 +116,7 @@ public void start() {
             nettyServerConfig.getServerWorkerThreads(),
             new NamedThreadFactory(nettyServerConfig.getExecutorThreadPrefix(),
                 nettyServerConfig.getServerWorkerThreads()));
-        if (listenPort == 0) {
-            listenPort = nettyServerConfig.getDefaultListenPort();
-        }
+
         this.serverBootstrap.group(this.eventLoopGroupBoss, this.eventLoopGroupWorker)
             .channel(nettyServerConfig.SERVER_CHANNEL_CLAZZ)
             .option(ChannelOption.SO_BACKLOG, nettyServerConfig.getSoBackLogSize())

pom.xml

@@ -127,18 +127,6 @@
             <artifactId>netty-all</artifactId>
             <version>${netty4.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-transport-native-epoll</artifactId>
-            <version>${netty4.version}</version>
-            <classifier>linux-x86_64</classifier>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-transport-native-kqueue</artifactId>
-            <version>${netty4.version}</version>
-            <classifier>osx-x86_64</classifier>
-        </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>

server/src/main/java/com/alibaba/fescar/server/Server.java

@@ -34,12 +34,22 @@ public class Server {
 
     public static void main(String[] args) throws IOException {
         RpcServer rpcServer = new RpcServer(WORKING_THREADS);
+        
+        int port = 8091;
+        if (args.length == 0) {
+            rpcServer.setListenPort(port);
+        }
 
         if (args.length > 0) {
-            int port = Integer.parseInt(args[0]);
+            try {
+                port = Integer.parseInt(args[0]);
+            } catch (NumberFormatException e) {
+                System.err.println("Usage: sh fescar-server.sh $LISTEN_PORT $PATH_FOR_PERSISTENT_DATA");
+                System.exit(0);
+            }
             rpcServer.setListenPort(port);
-
         }
+        
         String dataDir = null;
         if (args.length > 1) {
             dataDir = args[1];

server/src/main/java/com/alibaba/fescar/server/store/TransactionWriteStore.java

@@ -18,6 +18,7 @@
 
 import java.nio.ByteBuffer;
 
+import com.alibaba.fescar.common.exception.ShouldNeverHappenException;
 import com.alibaba.fescar.server.session.BranchSession;
 import com.alibaba.fescar.server.session.GlobalSession;
 import com.alibaba.fescar.server.store.TransactionStoreManager.LogOperation;
@@ -124,7 +125,8 @@ private SessionStorable getSessionInstanceByOperation(LogOperation logOperation)
             case BRANCH_REMOVE:
                 sessionStorable = new BranchSession();
                 break;
-
+            default:
+                throw new ShouldNeverHappenException("incorrect logOperation");
         }
         return sessionStorable;
     }

spring/src/main/java/com/alibaba/fescar/spring/annotation/GlobalTransactional.java

@@ -37,6 +37,6 @@
      * Given name of the global transaction instance.
      * @return Given name.
      */
-    String name() default "default";
+    String name() default "";
 
 }

spring/src/main/java/com/alibaba/fescar/spring/annotation/GlobalTransactionalInterceptor.java

@@ -19,6 +19,7 @@
 import java.lang.reflect.Method;
 
 import com.alibaba.fescar.common.exception.ShouldNeverHappenException;
+import com.alibaba.fescar.common.util.StringUtils;
 import com.alibaba.fescar.tm.api.DefaultFailureHandlerImpl;
 import com.alibaba.fescar.tm.api.FailureHandler;
 import com.alibaba.fescar.tm.api.TransactionalExecutor;
@@ -61,8 +62,9 @@ public int timeout() {
 
                     @Override
                     public String name() {
-                        if (anno.name() != null) {
-                            return anno.name();
+                        String name = anno.name();
+                        if (!StringUtils.isEmpty(name)) {
+                            return name;
                         }
                         return formatMethod(methodInvocation.getMethod());
                     }