将maxTimeOut放入txManager配置

foxdd · foxdd · commit 97e82fc8eb52 · 2017-11-28T22:02:17.000+08:00
diff --git a/transaction-dubbo/src/main/java/com/codingapi/tx/dubbo/service/impl/TimeOutServiceImpl.java b/transaction-dubbo/src/main/java/com/codingapi/tx/dubbo/service/impl/TimeOutServiceImpl.java
@@ -18,8 +18,8 @@ public class TimeOutServiceImpl implements TimeOutService {
 
 
     @Override
-    public void loadOutTime() {
-        int timeOut = providerConfig.getTimeout();
-        Constants.maxOutTime = timeOut;
+    public void loadOutTime(int timeOut) {
+        int finalTimeOut = (null != providerConfig.getTimeout()) ? providerConfig.getTimeout() : timeOut;
+        Constants.maxOutTime = finalTimeOut;
     }
 }
diff --git a/transaction-motan/src/main/java/com/codingapi/tx/motan/service/impl/TimeOutServiceImpl.java b/transaction-motan/src/main/java/com/codingapi/tx/motan/service/impl/TimeOutServiceImpl.java
@@ -20,8 +20,8 @@ public class TimeOutServiceImpl implements TimeOutService {
     private BasicServiceConfigBean basicServiceConfigBean;
 
 
-    public void loadOutTime() {
-        int timeOut = basicServiceConfigBean.getRequestTimeout();
+    public void loadOutTime(int timeOut) {
+        int finalTimeOut = (null != basicServiceConfigBean.getRequestTimeout() ? basicServiceConfigBean.getRequestTimeout() : timeOut);
         Constants.maxOutTime = timeOut;
     }
 }
diff --git a/transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/service/impl/TimeOutServiceImpl.java b/transaction-springcloud/src/main/java/com/codingapi/tx/springcloud/service/impl/TimeOutServiceImpl.java
@@ -12,9 +12,15 @@ public class TimeOutServiceImpl implements TimeOutService {
 
 
     @Override
-    public void loadOutTime() {
+    public void loadOutTime(int timeOut) {
         //todo 暂时写死
-        int timeOut = 20*1000;
-        Constants.maxOutTime = timeOut;
+        /*int timeOut = 20*1000;
+        Constants.maxOutTime = timeOut;*/
+    	//从txManager取
+    	if(timeOut < 0){
+    		Constants.maxOutTime = 20*1000;
+    	} else {
+    		Constants.maxOutTime = timeOut*1000;
+    	}
     }
 }
diff --git a/tx-client/src/main/java/com/codingapi/tx/listener/service/TimeOutService.java b/tx-client/src/main/java/com/codingapi/tx/listener/service/TimeOutService.java
@@ -5,5 +5,5 @@
  */
 public interface TimeOutService {
 
-    void loadOutTime();
+    void loadOutTime(int timeOut);
 }
diff --git a/tx-client/src/main/java/com/codingapi/tx/listener/service/impl/InitServiceImpl.java b/tx-client/src/main/java/com/codingapi/tx/listener/service/impl/InitServiceImpl.java
@@ -41,7 +41,7 @@ public void start() {
         nettyService.start();
         logger.info("socket-start..");
 
-        timeOutService.loadOutTime();
+        //timeOutService.loadOutTime();
 
 
     }
diff --git a/tx-client/src/main/java/com/codingapi/tx/model/TxServer.java b/tx-client/src/main/java/com/codingapi/tx/model/TxServer.java
@@ -12,6 +12,7 @@ public class TxServer {
     private String host;
     private int heart;
     private int delay;
+    private int autoCompensateLimit;
 
     public int getPort() {
         return port;
@@ -45,10 +46,18 @@ public int getDelay() {
     public void setDelay(int delay) {
         this.delay = delay;
     }
+    
+    public int getAutoCompensateLimit() {
+		return autoCompensateLimit;
+	}
 
-    @Override
+	public void setAutoCompensateLimit(int autoCompensateLimit) {
+		this.autoCompensateLimit = autoCompensateLimit;
+	}
+
+	@Override
     public String toString() {
-        return "host:" + host + ",port:" + port + ",heart:" + heart + ",delay:" + delay;
+        return "host:" + host + ",port:" + port + ",heart:" + heart + ",delay:" + delay + "autoCompensateLimit:" + autoCompensateLimit;
     }
 
     public static TxServer parser(String json) {
@@ -59,6 +68,7 @@ public static TxServer parser(String json) {
             txServer.setHost(jsonObject.getString("ip"));
             txServer.setHeart(jsonObject.getInteger("heart"));
             txServer.setDelay(jsonObject.getInteger("delay"));
+            txServer.setAutoCompensateLimit(jsonObject.getInteger("autoCompensateLimit"));
             return txServer;
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/tx-client/src/main/java/com/codingapi/tx/netty/service/impl/NettyServiceImpl.java b/tx-client/src/main/java/com/codingapi/tx/netty/service/impl/NettyServiceImpl.java
@@ -2,6 +2,7 @@
 
 import com.codingapi.tx.Constants;
 import com.codingapi.tx.framework.utils.SocketManager;
+import com.codingapi.tx.listener.service.TimeOutService;
 import com.codingapi.tx.netty.handler.TransactionHandler;
 import com.codingapi.tx.netty.service.NettyControlService;
 import com.codingapi.tx.netty.service.NettyDistributeService;
@@ -34,6 +35,9 @@ public class NettyServiceImpl implements NettyService {
 
     @Autowired
     private NettyControlService nettyControlService;
+    
+    @Autowired
+    private TimeOutService timeOutService;
 
     private EventLoopGroup workerGroup;
 
@@ -55,8 +59,11 @@ public synchronized void start() {
         int port = Constants.txServer.getPort();
         final int heart = Constants.txServer.getHeart();
         int delay = Constants.txServer.getDelay();
+        int autoCompensateLimit = Constants.txServer.getAutoCompensateLimit();
 
         final TransactionHandler transactionHandler = new TransactionHandler(nettyControlService, delay);
+        
+        timeOutService.loadOutTime(autoCompensateLimit);
         workerGroup = new NioEventLoopGroup();
         try {
             Bootstrap b = new Bootstrap(); // (1)
diff --git a/tx-manager/src/main/java/com/codingapi/tm/config/ConfigReader.java b/tx-manager/src/main/java/com/codingapi/tm/config/ConfigReader.java
@@ -35,6 +35,9 @@ public class ConfigReader {
 
     @Value("${tm.compensate.tryTime}")
     private int compensateTryTime;
+    
+    @Value("${tm.auto.compensate.limit}")
+    private int autoCompensateLimit;
 
 
 
@@ -97,4 +100,10 @@ public boolean isCompensateAuto() {
     public int getCompensateTryTime() {
         return compensateTryTime;
     }
+
+	public int getAutoCompensateLimit() {
+		return autoCompensateLimit;
+	}
+    
+    
 }
diff --git a/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/EurekaServiceImpl.java b/tx-manager/src/main/java/com/codingapi/tm/manager/service/impl/EurekaServiceImpl.java
@@ -85,6 +85,7 @@ public TxState getState() {
         state.setNotifyUrl(configReader.getCompensateNotifyUrl());
         state.setCompensate(configReader.isCompensateAuto());
         state.setCompensateTryTime(configReader.getCompensateTryTime());
+        state.setAutoCompensateLimit(configReader.getAutoCompensateLimit());
         state.setSlbList(getServices());
         return state;
     }
diff --git a/tx-manager/src/main/java/com/codingapi/tm/model/TxServer.java b/tx-manager/src/main/java/com/codingapi/tm/model/TxServer.java
@@ -9,6 +9,7 @@ public class TxServer {
     private int port;
     private int heart;
     private int delay;
+    private int autoCompensateLimit;
 
     public static TxServer format(TxState state) {
         TxServer txServer = new TxServer();
@@ -52,4 +53,16 @@ public int getDelay() {
     public void setDelay(int delay) {
         this.delay = delay;
     }
+
+
+	public int getAutoCompensateLimit() {
+		return autoCompensateLimit;
+	}
+
+
+	public void setAutoCompensateLimit(int autoCompensateLimit) {
+		this.autoCompensateLimit = autoCompensateLimit;
+	}
+    
+    
 }
diff --git a/tx-manager/src/main/java/com/codingapi/tm/model/TxState.java b/tx-manager/src/main/java/com/codingapi/tm/model/TxState.java
@@ -63,6 +63,11 @@ public class TxState {
      * slb list
      */
     private List<String> slbList;
+    
+    /**
+     * 自动补偿间隔时间
+     */
+    private int autoCompensateLimit;
 
 
     public String getIp() {
@@ -152,4 +157,14 @@ public String getNotifyUrl() {
     public void setNotifyUrl(String notifyUrl) {
         this.notifyUrl = notifyUrl;
     }
+
+	public int getAutoCompensateLimit() {
+		return autoCompensateLimit;
+	}
+
+	public void setAutoCompensateLimit(int autoCompensateLimit) {
+		this.autoCompensateLimit = autoCompensateLimit;
+	}
+    
+    
 }
diff --git a/tx-manager/src/main/resources/application.properties b/tx-manager/src/main/resources/application.properties
@@ -59,6 +59,9 @@ tm.compensate.notifyUrl=http://ip:port/path
 #补偿失败，再次尝试间隔（秒），最大尝试次数3次，当超过3次即为补偿失败。
 tm.compensate.tryTime=30
 
+#各组件自动补偿的时间上限
+tm.auto.compensate.limit=20
+
 
 
 
diff --git a/tx-plugins-db/src/main/java/com/codingapi/tx/datasource/relational/LCNDBConnection.java b/tx-plugins-db/src/main/java/com/codingapi/tx/datasource/relational/LCNDBConnection.java
@@ -181,6 +181,7 @@ public void transaction() throws SQLException {
 
         //start 结束就是全部事务的结束表示,考虑start挂掉的情况
         Timer timer = new Timer();
+        logger.info("maxOutTime:" + getMaxOutTime());
         timer.schedule(new TimerTask() {
             @Override
             public void run() {

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ public class TimeOutServiceImpl implements TimeOutService {`
`18`	`18`
`19`	`19`
`20`	`20`	`@Override`
`21`		`- public void loadOutTime() {`
`22`		`- int timeOut = providerConfig.getTimeout();`
`23`		`- Constants.maxOutTime = timeOut;`
	`21`	`+ public void loadOutTime(int timeOut) {`
	`22`	`+ int finalTimeOut = (null != providerConfig.getTimeout()) ? providerConfig.getTimeout() : timeOut;`
	`23`	`+ Constants.maxOutTime = finalTimeOut;`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ public class TimeOutServiceImpl implements TimeOutService {`
`20`	`20`	`private BasicServiceConfigBean basicServiceConfigBean;`
`21`	`21`
`22`	`22`
`23`		`- public void loadOutTime() {`
`24`		`- int timeOut = basicServiceConfigBean.getRequestTimeout();`
	`23`	`+ public void loadOutTime(int timeOut) {`
	`24`	`+ int finalTimeOut = (null != basicServiceConfigBean.getRequestTimeout() ? basicServiceConfigBean.getRequestTimeout() : timeOut);`
`25`	`25`	`Constants.maxOutTime = timeOut;`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@`
`5`	`5`	`*/`
`6`	`6`	`public interface TimeOutService {`
`7`	`7`
`8`		`- void loadOutTime();`
	`8`	`+ void loadOutTime(int timeOut);`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public void start() {`
`41`	`41`	`nettyService.start();`
`42`	`42`	`logger.info("socket-start..");`
`43`	`43`
`44`		`- timeOutService.loadOutTime();`
	`44`	`+ //timeOutService.loadOutTime();`
`45`	`45`
`46`	`46`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ public TxState getState() {`
`85`	`85`	`state.setNotifyUrl(configReader.getCompensateNotifyUrl());`
`86`	`86`	`state.setCompensate(configReader.isCompensateAuto());`
`87`	`87`	`state.setCompensateTryTime(configReader.getCompensateTryTime());`
	`88`	`+ state.setAutoCompensateLimit(configReader.getAutoCompensateLimit());`
`88`	`89`	`state.setSlbList(getServices());`
`89`	`90`	`return state;`
`90`	`91`	`}`