Revision: 15871
Author: vladimir.ralev
Date: Sun Dec 19 18:47:06 2010
Log: Update Issue 2286
Updating the consistent hashing algorithms and testcases with this scenario.
http://code.google.com/p/mobicents/source/detail?r=15871
Added:
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/algorithms/HeaderConsistentHashAlgorithmTest.java
Modified:
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/HeaderConsistentHashBalancerAlgorithm.java
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/PersistentConsistentHashBalancerAlgorithm.java
=======================================
--- /dev/null
+++
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/algorithms/HeaderConsistentHashAlgorithmTest.java
Sun Dec 19 18:47:06 2010
@@ -0,0 +1,185 @@
+package org.mobicents.tools.sip.balancer.algorithms;
+
+import java.util.Properties;
+
+import javax.sip.address.SipURI;
+import javax.sip.header.RecordRouteHeader;
+
+import junit.framework.TestCase;
+
+import org.mobicents.tools.sip.balancer.AppServer;
+import org.mobicents.tools.sip.balancer.BalancerRunner;
+import org.mobicents.tools.sip.balancer.EventListener;
+import
org.mobicents.tools.sip.balancer.HeaderConsistentHashBalancerAlgorithm;
+import org.mobicents.tools.sip.balancer.WorstCaseUdpTestAffinityAlgorithm;
+import org.mobicents.tools.sip.balancer.operation.Shootist;
+
+public class HeaderConsistentHashAlgorithmTest extends TestCase {
+ BalancerRunner balancer;
+ int numNodes = 2;
+ AppServer[] servers = new AppServer[numNodes];
+ Shootist shootist;
+
+
+ /* (non-Javadoc)
+ * @see junit.framework.TestCase#setUp()
+ */
+ protected void setUp() throws Exception {
+ super.setUp();
+ shootist = new Shootist();
+ balancer = new BalancerRunner();
+ Properties properties = new Properties();
+ properties.setProperty("javax.sip.STACK_NAME",
"SipBalancerForwarder");
+ properties.setProperty("javax.sip.AUTOMATIC_DIALOG_SUPPORT",
"off");
+ // You need 16 for logging traces. 32 for debug + traces.
+ // Your code will limp at 32 but it is best for debugging.
+ properties.setProperty("gov.nist.javax.sip.TRACE_LEVEL", "32");
+ properties.setProperty("gov.nist.javax.sip.DEBUG_LOG",
+ "logs/sipbalancerforwarderdebug.txt");
+ properties.setProperty("gov.nist.javax.sip.SERVER_LOG",
+ "logs/sipbalancerforwarder.xml");
+ properties.setProperty("gov.nist.javax.sip.THREAD_POOL_SIZE",
"2");
+ properties.setProperty("gov.nist.javax.sip.REENTRANT_LISTENER",
"true");
+
properties.setProperty("gov.nist.javax.sip.CANCEL_CLIENT_TRANSACTION_CHECKED", "false");
+ properties.setProperty("algorithmClass",
HeaderConsistentHashBalancerAlgorithm.class.getName());
+ properties.setProperty("host", "127.0.0.1");
+ properties.setProperty("internalPort", "5065");
+ properties.setProperty("externalPort", "5060");
+ balancer.start(properties);
+
+
+ for(int q=0;q<servers.length;q++) {
+ servers[q] = new AppServer("node" + q,4060+q);
+ servers[q].start();
+ }
+ Thread.sleep(5000);
+ }
+
+ /* (non-Javadoc)
+ * @see junit.framework.TestCase#tearDown()
+ */
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ shootist.stop();
+ for(int q=0;q<servers.length;q++) {
+ servers[q].stop();
+ }
+ balancer.stop();
+ }
+ static AppServer invite;
+ static AppServer bye;
+ static AppServer ack;
+ public void testInviteByeLandOnDifferentNodes() throws Exception {
+ EventListener failureEventListener = new EventListener() {
+
+ @Override
+ public void uasAfterResponse(int statusCode, AppServer
source) {
+
+ }
+
+ @Override
+ public void uasAfterRequestReceived(String method,
AppServer source) {
+ if(method.equals("INVITE")) invite = source;
+ if(method.equals("ACK")) {
+ ack = source;
+
+ if(ack != invite) TestCase.fail("INVITE and ACK should have landed on
same node");
+ ack.sendCleanShutdownToBalancers();
+
+ }
+ if(method.equals("BYE")) {
+ bye = source;
+
+ if(bye == invite) TestCase.fail("INVITE and BYE should have landed on
different nodes");
+ }
+
+
+ }
+
+ @Override
+ public void uacAfterRequestSent(String method,
AppServer source) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void uacAfterResponse(int statusCode, AppServer
source) {
+ // TODO Auto-generated method stub
+
+ }
+ };
+ for(AppServer as:servers)
as.setEventListener(failureEventListener);
+
+ shootist.callerSendsBye = true;
+ shootist.sendInitialInvite();
+ Thread.sleep(11000);
+ assertNotNull(invite);
+ assertNotNull(bye);
+ }
+
+ AppServer ringingAppServer;
+ AppServer okAppServer;
+ public void testOKRingingLandOnDifferentNode() throws Exception {
+
+ EventListener failureEventListener = new EventListener() {
+
+ @Override
+ public void uasAfterResponse(int statusCode, AppServer
source) {
+
+
+ }
+
+ @Override
+ public void uasAfterRequestReceived(String method,
AppServer source) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void uacAfterRequestSent(String method,
AppServer source) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void uacAfterResponse(int statusCode, AppServer
source) {
+ if(statusCode == 180) {
+ ringingAppServer = source;
+ source.sendCleanShutdownToBalancers();
+ } else {
+ okAppServer = source;
+
+ }
+ }
+ };
+ for(AppServer as:servers)
as.setEventListener(failureEventListener);
+ shootist.callerSendsBye = true;
+
+ String fromName = "sender";
+ String fromHost = "sip-servlets.com";
+ SipURI fromAddress =
servers[0].protocolObjects.addressFactory.createSipURI(
+ fromName, fromHost);
+
+ String toUser = "replaces";
+ String toHost = "sip-servlets.com";
+ SipURI toAddress =
servers[0].protocolObjects.addressFactory.createSipURI(
+ toUser, toHost);
+
+ SipURI ruri =
servers[0].protocolObjects.addressFactory.createSipURI(
+ "usera", "127.0.0.1:5033");
+ ruri.setLrParam();
+ SipURI route =
servers[0].protocolObjects.addressFactory.createSipURI(
+ "lbint", "127.0.0.1:5065");
+ route.setParameter("node_host", "127.0.0.1");
+ route.setParameter("node_port", "4060");
+ route.setLrParam();
+ shootist.start();
+ //servers[0].sipListener.sendSipRequest("INVITE", fromAddress,
toAddress, null, null, false);
+ servers[0].sipListener.sendSipRequest("INVITE", fromAddress, toAddress,
null, route, false, null, null, ruri);
+ Thread.sleep(16000);
+
assertTrue(shootist.inviteRequest.getHeader(RecordRouteHeader.NAME).toString().contains("node_host"));
+ assertNotSame(ringingAppServer, okAppServer);
+ assertNotNull(ringingAppServer);
+ assertNotNull(okAppServer);
+ }
+}
=======================================
---
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/HeaderConsistentHashBalancerAlgorithm.java
Tue Dec 14 08:19:27 2010
+++
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/HeaderConsistentHashBalancerAlgorithm.java
Sun Dec 19 18:47:06 2010
@@ -1,19 +1,23 @@
package org.mobicents.tools.sip.balancer;
import gov.nist.javax.sip.header.SIPHeader;
+import gov.nist.javax.sip.header.Via;
import java.util.Collections;
import java.util.HashMap;
import java.util.SortedSet;
import java.util.Timer;
import java.util.TreeSet;
+import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.sip.ListeningPoint;
import javax.sip.address.SipURI;
import javax.sip.header.FromHeader;
import javax.sip.header.ToHeader;
import javax.sip.message.Message;
import javax.sip.message.Request;
+import javax.sip.message.Response;
import org.jboss.netty.handler.codec.http.HttpRequest;
@@ -144,4 +148,63 @@
logger.info("Configuration changed");
init();
}
-}
+
+ public void processExternalResponse(Response response) {
+
+ Integer nodeIndex = hashHeader(response);
+ BalancerContext balancerContext = getBalancerContext();
+ Via via = (Via) response.getHeader(Via.NAME);
+ String host = via.getHost();
+ Integer port = via.getPort();
+ String transport = via.getTransport().toLowerCase();
+ boolean found = false;
+ for(SIPNode node : BalancerContext.balancerContext.nodes) {
+ if(node.getIp().equals(host)) {
+
if(port.equals(node.getProperties().get(transport+"Port"))) {
+ found = true;
+ }
+ }
+ }
+ if(logger.isLoggable(Level.FINEST)) {
+ logger.finest("external response node found ? " +
found);
+ }
+ if(!found) {
+ if(nodesAreDirty) {
+ synchronized(this) {
+ nodes.clear();
+ nodes.add(balancerContext.nodes);
+ nodesArray = nodes.toArray(new
Object[]{});
+ nodesAreDirty = false;
+ }
+ }
+ try {
+ SIPNode node = (SIPNode) nodesArray[nodeIndex];
+ if(node == null ||
!balancerContext.nodes.contains(node)) {
+ if(logger.isLoggable(Level.FINEST)) {
+ logger.finest("No node to handle
" + via);
+ }
+
+ } else {
+ String transportProperty = transport +
"Port";
+ port = (Integer)
node.getProperties().get(transportProperty);
+ if(via.getHost().equalsIgnoreCase(node.getIp()) || via.getPort() !=
port) {
+
if(logger.isLoggable(Level.FINEST)) {
+ logger.finest("changing retransmission via " + via + "setting new
values " + node.getIp() + ":" + port);
+ }
+ try {
+
via.setHost(node.getIp());
+ via.setPort(port);
+ } catch (Exception e) {
+ throw new RuntimeException("Error setting new values " +
node.getIp() + ":" + port + " on via " + via, e);
+ }
+ // need to reset the rport for
reliable transports
+
if(!ListeningPoint.UDP.equalsIgnoreCase(transport)) {
+ via.setRPort();
+ }
+ }
+ }
+ } catch (Exception e) {
+ }
+ }
+ }
+}
=======================================
---
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/PersistentConsistentHashBalancerAlgorithm.java
Tue Dec 14 08:19:27 2010
+++
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/PersistentConsistentHashBalancerAlgorithm.java
Sun Dec 19 18:47:06 2010
@@ -1,6 +1,7 @@
package org.mobicents.tools.sip.balancer;
import gov.nist.javax.sip.header.SIPHeader;
+import gov.nist.javax.sip.header.Via;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -12,12 +13,14 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.sip.ListeningPoint;
import javax.sip.address.SipURI;
import javax.sip.header.FromHeader;
import javax.sip.header.RouteHeader;
import javax.sip.header.ToHeader;
import javax.sip.message.Message;
import javax.sip.message.Request;
+import javax.sip.message.Response;
import org.jboss.cache.Cache;
import org.jboss.cache.CacheFactory;
@@ -233,5 +236,60 @@
this.httpAffinityKey =
getProperties().getProperty("httpAffinityKey", "appsession");
this.sipHeaderAffinityKey =
getProperties().getProperty("sipHeaderAffinityKey", "Call-ID");
}
+ public void processExternalResponse(Response response) {
+
+ Integer nodeIndex = hashHeader(response);
+ BalancerContext balancerContext = getBalancerContext();
+ Via via = (Via) response.getHeader(Via.NAME);
+ String host = via.getHost();
+ Integer port = via.getPort();
+ String transport = via.getTransport().toLowerCase();
+ boolean found = false;
+ for(SIPNode node : BalancerContext.balancerContext.nodes) {
+ if(node.getIp().equals(host)) {
+
if(port.equals(node.getProperties().get(transport+"Port"))) {
+ found = true;
+ }
+ }
+ }
+ if(logger.isLoggable(Level.FINEST)) {
+ logger.finest("external response node found ? " +
found);
+ }
+ if(!found) {
+ if(nodesAreDirty) {
+ synchronized(this) {
+ syncNodes();
+ }
+ }
+ try {
+ SIPNode node = (SIPNode) nodesArray[nodeIndex];
+ if(node == null ||
!balancerContext.nodes.contains(node)) {
+ if(logger.isLoggable(Level.FINEST)) {
+ logger.finest("No node to handle
" + via);
+ }
+
+ } else {
+ String transportProperty = transport +
"Port";
+ port = (Integer)
node.getProperties().get(transportProperty);
+ if(via.getHost().equalsIgnoreCase(node.getIp()) || via.getPort() !=
port) {
+
if(logger.isLoggable(Level.FINEST)) {
+ logger.finest("changing retransmission via " + via + "setting new
values " + node.getIp() + ":" + port);
+ }
+ try {
+
via.setHost(node.getIp());
+ via.setPort(port);
+ } catch (Exception e) {
+ throw new RuntimeException("Error setting new values " +
node.getIp() + ":" + port + " on via " + via, e);
+ }
+ // need to reset the rport for
reliable transports
+
if(!ListeningPoint.UDP.equalsIgnoreCase(transport)) {
+ via.setRPort();
+ }
+ }
+ }
+ } catch (Exception e) {
+ }
+ }
+ }
}