Author: mircea.markus Date: 2008-09-10 05:11:42 -0400 (Wed, 10 Sep 2008) New Revision: 6703 Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTransport.java benchmarks/benchmark-fwk/trunk/src/org/cachebench/config/ClusterConfig.java Log: transport will always bind to the address in specified in the configfile, ignoring the -Dbind.address from jgroups Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTransport.java =================================================================== --- benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTransport.java 2008-09-10 08:57:50 UTC (rev 6702) +++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/cluster/TcpTransport.java 2008-09-10 09:11:42 UTC (rev 6703) @@ -19,7 +19,7 @@ { private static Log log = LogFactory.getLog(TcpTransport.class); - + Receiver receiver = null; ClusterConfig config = null; int max_receiver_buffer_size = 500000; @@ -48,15 +48,8 @@ { this.config = clusterConfig; startPort = config.getPortForThisNode(); - String bindAddrStr = config.getBindAddress(); - if (bindAddrStr != null) - { - bindAddr = InetAddress.getByName(bindAddrStr); - } - else - { - bindAddr = InetAddress.getLocalHost(); - } + String bindAddrStr = config.getAddressForThisNode().getHost(); + bindAddr = InetAddress.getByName(bindAddrStr); nodes = clusterConfig.getMemberAddresses(); connectionTable = new ConnectionTable(nodes); } @@ -65,7 +58,7 @@ public void start() throws Exception { srvSock = createServerSocket(); - if (log.isTraceEnabled()) log.trace("ServerSock created, listening on: "+ srvSock.getLocalSocketAddress()); + if (log.isTraceEnabled()) log.trace("ServerSock created, listening on: " + srvSock.getLocalSocketAddress()); localAddr = new InetSocketAddress(srvSock.getInetAddress(), srvSock.getLocalPort()); connectionTable.init(); @@ -79,7 +72,7 @@ try { Socket s = srvSock.accept(); - if(log.isTraceEnabled()) log.trace("Accepted client " + s.getRemoteSocketAddress()); + if (log.isTraceEnabled()) log.trace("Accepted client " + s.getRemoteSocketAddress()); ReceiverThread r = new ReceiverThread(s); r.setDaemon(true); receivers.add(r); @@ -206,13 +199,17 @@ void writeMessage(Object msg) throws Exception { int recieversCount = 0; - for (Connection c : connections) { - if (c != null) { - try { + for (Connection c : connections) + { + if (c != null) + { + try + { c.writeMessage(msg); recieversCount++; } - catch (Exception e) { + catch (Exception e) + { log.trace("failure(" + e.getMessage() + ") sending message to " + c); } } @@ -336,7 +333,8 @@ if (receiver != null) receiver.receive(message.getSource(), message.getPayload()); } - catch (Exception e) { + catch (Exception e) + { break; } } Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/config/ClusterConfig.java =================================================================== --- benchmarks/benchmark-fwk/trunk/src/org/cachebench/config/ClusterConfig.java 2008-09-10 08:57:50 UTC (rev 6702) +++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/config/ClusterConfig.java 2008-09-10 09:11:42 UTC (rev 6703) @@ -56,6 +56,11 @@ return Integer.parseInt(address.getPort()); } + public NodeAddress getAddressForThisNode() + { + return getMembers().get(getCurrentNodeIndex()); + } + public int getClusterSize() { if (clusterSize < 0)