You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@crail.apache.org by ps...@apache.org on 2018/06/22 11:24:38 UTC

[2/2] incubator-crail git commit: Adding extra config parameters to control backlog and connnection timeouts for RDMA-based RPC and storage backends

Adding extra config parameters to control backlog and connnection
timeouts for RDMA-based RPC and storage backends

The backlog parameter controlls the backlog of incoming connection
requests for rdma storage and rdma RPC. The connectiontimeout puts a
limit on the time to wait for the connection establishement event.

Signed-off-by: Patrick Stuedi <ps...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-crail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-crail/commit/76c3fe83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-crail/tree/76c3fe83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-crail/diff/76c3fe83

Branch: refs/heads/master
Commit: 76c3fe83c875659fd50e4b51a47deaf0efd88825
Parents: 57ecca8
Author: Patrick Stuedi <ps...@apache.org>
Authored: Fri Jun 22 11:37:51 2018 +0200
Committer: Patrick Stuedi <ps...@apache.org>
Committed: Fri Jun 22 11:37:51 2018 +0200

----------------------------------------------------------------------
 .../java/org/apache/crail/conf/CrailConstants.java  |  2 +-
 .../crail/namenode/rpc/darpc/DaRPCConstants.java    | 16 +++++++++++++++-
 .../namenode/rpc/darpc/DaRPCNameNodeClient.java     |  2 +-
 .../namenode/rpc/darpc/DaRPCNameNodeServer.java     |  2 +-
 .../apache/crail/storage/rdma/RdmaConstants.java    | 14 ++++++++++++++
 .../crail/storage/rdma/RdmaStorageServer.java       |  2 +-
 .../storage/rdma/client/RdmaStorageActiveGroup.java |  2 +-
 .../rdma/client/RdmaStoragePassiveGroup.java        |  2 +-
 8 files changed, 35 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/76c3fe83/client/src/main/java/org/apache/crail/conf/CrailConstants.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/crail/conf/CrailConstants.java b/client/src/main/java/org/apache/crail/conf/CrailConstants.java
index 733d622..310abc1 100644
--- a/client/src/main/java/org/apache/crail/conf/CrailConstants.java
+++ b/client/src/main/java/org/apache/crail/conf/CrailConstants.java
@@ -27,7 +27,7 @@ public class CrailConstants {
 	private static final Logger LOG = CrailUtils.getLogger();
 
 	public static final String VERSION_KEY = "crail.version";
-	public static int VERSION = 3100;
+	public static int VERSION = 3101;
 
 	public static final String DIRECTORY_DEPTH_KEY = "crail.directorydepth";
 	public static int DIRECTORY_DEPTH = 16;

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/76c3fe83/rpc-darpc/src/main/java/org/apache/crail/namenode/rpc/darpc/DaRPCConstants.java
----------------------------------------------------------------------
diff --git a/rpc-darpc/src/main/java/org/apache/crail/namenode/rpc/darpc/DaRPCConstants.java b/rpc-darpc/src/main/java/org/apache/crail/namenode/rpc/darpc/DaRPCConstants.java
index 404dc95..0532ed8 100644
--- a/rpc-darpc/src/main/java/org/apache/crail/namenode/rpc/darpc/DaRPCConstants.java
+++ b/rpc-darpc/src/main/java/org/apache/crail/namenode/rpc/darpc/DaRPCConstants.java
@@ -51,6 +51,12 @@ public class DaRPCConstants {
 	public static final String NAMENODE_DARPC_CLUSTERSIZE_KEY = "crail.namenode.darpc.clustersize";
 	public static int NAMENODE_DARPC_CLUSTERSIZE = 128;	
 	
+	public static final String NAMENODE_DARPC_BACKLOG_KEY = "crail.namenode.darpc.backlog";
+	public static int NAMENODE_DARPC_BACKLOG = 100;	
+	
+	public static final String NAMENODE_DARPC_CONNECTTIMEOUT_KEY = "crail.namenode.darpc.connecttimeout";
+	public static int NAMENODE_DARPC_CONNECTTIMEOUT = 1000;		
+	
 	public static void updateConstants(CrailConfiguration conf){
 		if (conf.get(NAMENODE_DARPC_POLLING_KEY) != null) {
 			NAMENODE_DARPC_POLLING = conf.getBoolean(NAMENODE_DARPC_POLLING_KEY, false);
@@ -75,7 +81,13 @@ public class DaRPCConstants {
 		}	
 		if (conf.get(NAMENODE_DARPC_CLUSTERSIZE_KEY) != null) {
 			NAMENODE_DARPC_CLUSTERSIZE = Integer.parseInt(conf.get(NAMENODE_DARPC_CLUSTERSIZE_KEY));
-		}					
+		}	
+		if (conf.get(NAMENODE_DARPC_BACKLOG_KEY) != null) {
+			NAMENODE_DARPC_BACKLOG = Integer.parseInt(conf.get(NAMENODE_DARPC_BACKLOG_KEY));
+		}	
+		if (conf.get(NAMENODE_DARPC_CONNECTTIMEOUT_KEY) != null) {
+			NAMENODE_DARPC_CONNECTTIMEOUT = Integer.parseInt(conf.get(NAMENODE_DARPC_CONNECTTIMEOUT_KEY));
+		}			
 	}
 	
 	public static void verify() throws IOException {
@@ -93,5 +105,7 @@ public class DaRPCConstants {
 		LOG.info(NAMENODE_DARPC_SENDQUEUE_KEY + " " + NAMENODE_DARPC_SENDQUEUE);
 		LOG.info(NAMENODE_DARPC_POLLSIZE_KEY + " " + NAMENODE_DARPC_POLLSIZE);
 		LOG.info(NAMENODE_DARPC_CLUSTERSIZE_KEY + " " + NAMENODE_DARPC_CLUSTERSIZE);
+		LOG.info(NAMENODE_DARPC_BACKLOG_KEY + " " + NAMENODE_DARPC_BACKLOG);
+		LOG.info(NAMENODE_DARPC_CONNECTTIMEOUT_KEY + " " + NAMENODE_DARPC_CONNECTTIMEOUT);
 	}	
 }

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/76c3fe83/rpc-darpc/src/main/java/org/apache/crail/namenode/rpc/darpc/DaRPCNameNodeClient.java
----------------------------------------------------------------------
diff --git a/rpc-darpc/src/main/java/org/apache/crail/namenode/rpc/darpc/DaRPCNameNodeClient.java b/rpc-darpc/src/main/java/org/apache/crail/namenode/rpc/darpc/DaRPCNameNodeClient.java
index d723904..9bba9a9 100644
--- a/rpc-darpc/src/main/java/org/apache/crail/namenode/rpc/darpc/DaRPCNameNodeClient.java
+++ b/rpc-darpc/src/main/java/org/apache/crail/namenode/rpc/darpc/DaRPCNameNodeClient.java
@@ -54,7 +54,7 @@ public class DaRPCNameNodeClient implements RpcClient {
 	@Override
 	public RpcConnection connect(InetSocketAddress address) throws Exception {
 		DaRPCClientEndpoint<DaRPCNameNodeRequest, DaRPCNameNodeResponse> namenodeEndopoint = namenodeClientGroup.createEndpoint();
-		namenodeEndopoint.connect(address, 1000);
+		namenodeEndopoint.connect(address, DaRPCConstants.NAMENODE_DARPC_CONNECTTIMEOUT);
 		DaRPCNameNodeConnection connection = new DaRPCNameNodeConnection(namenodeEndopoint);
 		return connection;
 		

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/76c3fe83/rpc-darpc/src/main/java/org/apache/crail/namenode/rpc/darpc/DaRPCNameNodeServer.java
----------------------------------------------------------------------
diff --git a/rpc-darpc/src/main/java/org/apache/crail/namenode/rpc/darpc/DaRPCNameNodeServer.java b/rpc-darpc/src/main/java/org/apache/crail/namenode/rpc/darpc/DaRPCNameNodeServer.java
index bb83d2b..56f168e 100644
--- a/rpc-darpc/src/main/java/org/apache/crail/namenode/rpc/darpc/DaRPCNameNodeServer.java
+++ b/rpc-darpc/src/main/java/org/apache/crail/namenode/rpc/darpc/DaRPCNameNodeServer.java
@@ -66,7 +66,7 @@ public class DaRPCNameNodeServer extends RpcServer {
 	public void run() {
 		try {
 			InetSocketAddress addr = CrailUtils.getNameNodeAddress();
-			namenodeServerEp.bind(addr, 100);
+			namenodeServerEp.bind(addr, DaRPCConstants.NAMENODE_DARPC_BACKLOG);
 			LOG.info("opened server at " + addr);
 			while (true) {
 				DaRPCServerEndpoint<DaRPCNameNodeRequest, DaRPCNameNodeResponse> clientEndpoint = namenodeServerEp.accept();

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/76c3fe83/storage-rdma/src/main/java/org/apache/crail/storage/rdma/RdmaConstants.java
----------------------------------------------------------------------
diff --git a/storage-rdma/src/main/java/org/apache/crail/storage/rdma/RdmaConstants.java b/storage-rdma/src/main/java/org/apache/crail/storage/rdma/RdmaConstants.java
index af11096..3a399a7 100644
--- a/storage-rdma/src/main/java/org/apache/crail/storage/rdma/RdmaConstants.java
+++ b/storage-rdma/src/main/java/org/apache/crail/storage/rdma/RdmaConstants.java
@@ -62,6 +62,12 @@ public class RdmaConstants {
 
 	public static final String STORAGE_RDMA_PERSISTENT_KEY = "crail.storage.rdma.persistent";
 	public static boolean STORAGE_RDMA_PERSISTENT = false;
+	
+	public static final String STORAGE_RDMA_BACKLOG_KEY = "crail.storage.rdma.backlog";
+	public static int STORAGE_RDMA_BACKLOG = 100;	
+	
+	public static final String STORAGE_RDMA_CONNECTTIMEOUT_KEY = "crail.storage.rdma.connecttimeout";
+	public static int STORAGE_RDMA_CONNECTTIMEOUT = 1000;		
 
 	public static void updateConstants(CrailConfiguration conf){
 		if (conf.get(STORAGE_RDMA_INTERFACE_KEY) != null) {
@@ -91,6 +97,12 @@ public class RdmaConstants {
 		if (conf.get(STORAGE_RDMA_PERSISTENT_KEY) != null) {
 			STORAGE_RDMA_PERSISTENT = conf.getBoolean(STORAGE_RDMA_PERSISTENT_KEY, false);
 		}
+		if (conf.get(STORAGE_RDMA_BACKLOG_KEY) != null) {
+			STORAGE_RDMA_BACKLOG = Integer.parseInt(conf.get(STORAGE_RDMA_BACKLOG_KEY));
+		}	
+		if (conf.get(STORAGE_RDMA_CONNECTTIMEOUT_KEY) != null) {
+			STORAGE_RDMA_CONNECTTIMEOUT = Integer.parseInt(conf.get(STORAGE_RDMA_CONNECTTIMEOUT_KEY));
+		}			
 	}
 
 	public static void verify() throws IOException {
@@ -114,6 +126,8 @@ public class RdmaConstants {
 		logger.info(STORAGE_RDMA_LOCAL_MAP_KEY + " " + STORAGE_RDMA_LOCAL_MAP);
 		logger.info(STORAGE_RDMA_QUEUESIZE_KEY + " " + STORAGE_RDMA_QUEUESIZE);
 		logger.info(STORAGE_RDMA_TYPE_KEY + " " + STORAGE_RDMA_TYPE);
+		logger.info(STORAGE_RDMA_BACKLOG_KEY + " " + STORAGE_RDMA_BACKLOG);
+		logger.info(STORAGE_RDMA_CONNECTTIMEOUT_KEY + " " + STORAGE_RDMA_CONNECTTIMEOUT);		
 	}
 
 	public static void init(CrailConfiguration conf, String[] args) throws IOException {

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/76c3fe83/storage-rdma/src/main/java/org/apache/crail/storage/rdma/RdmaStorageServer.java
----------------------------------------------------------------------
diff --git a/storage-rdma/src/main/java/org/apache/crail/storage/rdma/RdmaStorageServer.java b/storage-rdma/src/main/java/org/apache/crail/storage/rdma/RdmaStorageServer.java
index 602fbb2..fe5ac00 100644
--- a/storage-rdma/src/main/java/org/apache/crail/storage/rdma/RdmaStorageServer.java
+++ b/storage-rdma/src/main/java/org/apache/crail/storage/rdma/RdmaStorageServer.java
@@ -68,7 +68,7 @@ public class RdmaStorageServer implements Runnable, StorageServer {
 		this.datanodeGroup = new RdmaPassiveEndpointGroup<RdmaStorageServerEndpoint>(-1, RdmaConstants.STORAGE_RDMA_QUEUESIZE, 4, RdmaConstants.STORAGE_RDMA_QUEUESIZE*100);
 		this.datanodeServerEndpoint = datanodeGroup.createServerEndpoint();		
 		datanodeGroup.init(new RdmaStorageEndpointFactory(datanodeGroup, this));
-		datanodeServerEndpoint.bind(serverAddr, 100);
+		datanodeServerEndpoint.bind(serverAddr, RdmaConstants.STORAGE_RDMA_BACKLOG);
 		
 		this.dataDirPath = getDatanodeDirectory(serverAddr);
 		LOG.info("dataPath " + dataDirPath);

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/76c3fe83/storage-rdma/src/main/java/org/apache/crail/storage/rdma/client/RdmaStorageActiveGroup.java
----------------------------------------------------------------------
diff --git a/storage-rdma/src/main/java/org/apache/crail/storage/rdma/client/RdmaStorageActiveGroup.java b/storage-rdma/src/main/java/org/apache/crail/storage/rdma/client/RdmaStorageActiveGroup.java
index 0d76a78..53a28b2 100644
--- a/storage-rdma/src/main/java/org/apache/crail/storage/rdma/client/RdmaStorageActiveGroup.java
+++ b/storage-rdma/src/main/java/org/apache/crail/storage/rdma/client/RdmaStorageActiveGroup.java
@@ -65,7 +65,7 @@ public class RdmaStorageActiveGroup extends RdmaActiveEndpointGroup<RdmaStorageA
 		}
 		
 		RdmaStorageActiveEndpoint endpoint = super.createEndpoint();
-		endpoint.connect(inetAddress, 1000);
+		endpoint.connect(inetAddress, RdmaConstants.STORAGE_RDMA_CONNECTTIMEOUT);
 		return endpoint;
 	}
 

http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/76c3fe83/storage-rdma/src/main/java/org/apache/crail/storage/rdma/client/RdmaStoragePassiveGroup.java
----------------------------------------------------------------------
diff --git a/storage-rdma/src/main/java/org/apache/crail/storage/rdma/client/RdmaStoragePassiveGroup.java b/storage-rdma/src/main/java/org/apache/crail/storage/rdma/client/RdmaStoragePassiveGroup.java
index f8dc570..9949574 100644
--- a/storage-rdma/src/main/java/org/apache/crail/storage/rdma/client/RdmaStoragePassiveGroup.java
+++ b/storage-rdma/src/main/java/org/apache/crail/storage/rdma/client/RdmaStoragePassiveGroup.java
@@ -65,7 +65,7 @@ public class RdmaStoragePassiveGroup extends RdmaPassiveEndpointGroup<RdmaStorag
 		} 
 		
 		RdmaStoragePassiveEndpoint endpoint = super.createEndpoint();
-		endpoint.connect(inetAddress, 1000);
+		endpoint.connect(inetAddress, RdmaConstants.STORAGE_RDMA_CONNECTTIMEOUT);
 		return endpoint;
 	}