1、整理成一个cluster port

2、tnsrpc client采用cluster port＋1
jerrysearch · May 11, 2016 · 896abe7 · 896abe7
1 parent d44834c
commit 896abe7
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 59 deletions.
diff --git a/src/main/java/com/qibaike/thriftnameserver/app/ThriftNameServer.java b/src/main/java/com/qibaike/thriftnameserver/app/ThriftNameServer.java
@@ -4,8 +4,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.qibaike.thriftnameserver.conf.Config;
-import com.qibaike.thriftnameserver.rpc.clusterConstants;
-import com.qibaike.thriftnameserver.rpc.tnsrpcConstants;
+import com.qibaike.thriftnameserver.rpc.structConstants;
 
 public class ThriftNameServer {
 	public static void main(String[] args) {
@@ -18,15 +17,14 @@ public static void main(String[] args) {
 		 * cluster rpc
 		 */
 		ClusterRpcServer clusterRpcServer = new ClusterRpcServer();
-		clusterRpcServer.start(host, clusterConstants.PORT);
-		
+		clusterRpcServer.start(host, structConstants.PORT);
+
 		/**
 		 * tns rpc
 		 */
 		TNSRpcServer tnsRpcServer = new TNSRpcServer();
-		tnsRpcServer.start(host, tnsrpcConstants.PORT);
-
-
+		tnsRpcServer.start(host, structConstants.PORT + 1);
+
 		SNodeManagerMBeanServer sNodeManagerMBeanServer = new SNodeManagerMBeanServer();
 		sNodeManagerMBeanServer.start();
 

diff --git a/src/main/java/com/qibaike/thriftnameserver/cluster/CNodeManager.java b/src/main/java/com/qibaike/thriftnameserver/cluster/CNodeManager.java
@@ -15,7 +15,7 @@
 import com.qibaike.thriftnameserver.rpc.Cluster;
 import com.qibaike.thriftnameserver.rpc.State;
 import com.qibaike.thriftnameserver.rpc.TCNode;
-import com.qibaike.thriftnameserver.rpc.clusterConstants;
+import com.qibaike.thriftnameserver.rpc.structConstants;
 
 public class CNodeManager implements CNodeManagerMBean {
 
@@ -30,7 +30,7 @@ private CNodeManager() {
 
 		TCNode me = new TCNode();
 		me.setHost(Config.HOSTNAME);
-		me.setPort(clusterConstants.PORT);
+		me.setPort(structConstants.PORT);
 		me.setId(myId);
 		me.setState(State.Joining);
 		me.setTimestamp(System.currentTimeMillis());
@@ -124,7 +124,7 @@ private TCNode getOne(Long id) {
 	@Override
 	@Loggable
 	public String meet(String host) {
-		TSocket transport = new TSocket(host, clusterConstants.PORT, 2000);
+		TSocket transport = new TSocket(host, structConstants.PORT, 2000);
 		TProtocol protocol = new TBinaryProtocol(transport);
 		Cluster.Client client = new Cluster.Client(protocol);
 		try {

diff --git a/src/main/java/com/qibaike/thriftnameserver/conf/Config.java b/src/main/java/com/qibaike/thriftnameserver/conf/Config.java
@@ -1,11 +1,11 @@
 package com.qibaike.thriftnameserver.conf;
 
-import com.qibaike.thriftnameserver.rpc.clusterConstants;
+import com.qibaike.thriftnameserver.rpc.structConstants;
 
 public class Config {
 	public static final String HOSTNAME = System.getProperty("hostname", "localhost");
 
-	public static final Long TNSID = (long) (HOSTNAME+clusterConstants.PORT).hashCode();
-	
+	public static final Long TNSID = (long) (HOSTNAME + structConstants.PORT).hashCode();
+
 	public static final Long serviceRemoveSeconds = 60L;
 }
diff --git a/...hriftnameserver/rpc/clusterConstants.java → ...thriftnameserver/rpc/structConstants.java b/...hriftnameserver/rpc/clusterConstants.java → ...thriftnameserver/rpc/structConstants.java
diff --git a/src/main/java/com/qibaike/thriftnameserver/rpc/tnsrpcConstants.java b/src/main/java/com/qibaike/thriftnameserver/rpc/tnsrpcConstants.java
diff --git a/thrift/cluster.thrift b/thrift/cluster.thrift
@@ -2,8 +2,6 @@ namespace java com.qibaike.thriftnameserver.rpc
 
 include "struct.thrift"
 
-const i32 PORT = 8700
-
 service Cluster {
 
 	/**

diff --git a/thrift/struct.thrift b/thrift/struct.thrift
@@ -1,5 +1,7 @@
 namespace java com.qibaike.thriftnameserver.rpc
 
+const i32 PORT = 8700
+
 enum State {
  UP = 1,
  DOWN = 2,

diff --git a/thrift/tnsrpc.thrift b/thrift/tnsrpc.thrift
@@ -2,8 +2,6 @@ namespace java com.qibaike.thriftnameserver.rpc
 
 include "struct.thrift"
 
-const i32 PORT = 8701
-
 service TNSRpc {
 
 	/**
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,8 +2,6 @@ namespace java com.qibaike.thriftnameserver.rpc @@
     include "struct.thrift"
-    const i32 PORT = 8700
     service Cluster {
     	/**
@@ Expand Down @@