Revision: 15974
Author: vladimir.ralev
Date: Tue Dec 21 10:50:49 2010
Log: More load balancer testcases and fixes for non-default algorithms
http://code.google.com/p/mobicents/source/detail?r=15974
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/WorstCaseUdpTestAffinityAlgorithm.java
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/algorithms/EarlyDialogWorstCaseAffinityTest.java
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/algorithms/HeaderConsistentHashAlgorithmTest.java
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/operation/InviteTransactionFailover.java
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/operation/Shootist.java
=======================================
---
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/HeaderConsistentHashBalancerAlgorithm.java
Sun Dec 19 18:47:06 2010
+++
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/HeaderConsistentHashBalancerAlgorithm.java
Tue Dec 21 10:50:49 2010
@@ -98,7 +98,7 @@
.getValue();
}
- if(nodes.size() == 0) throw new RuntimeException("No Application Servers
registered. All servers are dead.");
+ if(nodes.size() == 0) return -1;
int nodeIndex = hashAffinityKeyword(headerValue);
=======================================
---
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/WorstCaseUdpTestAffinityAlgorithm.java
Sun Dec 19 18:42:21 2010
+++
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/WorstCaseUdpTestAffinityAlgorithm.java
Tue Dec 21 10:50:49 2010
@@ -40,6 +40,10 @@
}
public SIPNode processAssignedExternalRequest(Request request,
SIPNode assignedNode) {
+ String callId = ((SIPHeader)
request.getHeader(headerName)).getValue();
+ if(callIdMap.get(callId) != null) {
+ assignedNode = callIdMap.get(callId);
+ }
ViaHeader via = (ViaHeader) request.getHeader(Via.NAME);
String transport = via.getTransport().toLowerCase();
String tx = via.getBranch();
@@ -61,8 +65,8 @@
uri.setHost(node.getIp());
Integer port = (Integer)
node.getProperties().get(transport + "Port");
uri.setPort(port);
- String callId = ((SIPHeader)
request.getHeader(headerName))
- .getValue();
+
+
callIdMap.put(callId, node);
setNode(tx, node);
@@ -135,7 +139,7 @@
}
}
} else {
- if(earlyDialogWorstCase) {
+ if(earlyDialogWorstCase &&
response.getStatusCode()>100) {
String callId = ((SIPHeader)
response.getHeader(headerName))
.getValue();
SIPNode node = callIdMap.get(callId);
=======================================
---
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/algorithms/EarlyDialogWorstCaseAffinityTest.java
Sun Dec 19 18:42:21 2010
+++
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/algorithms/EarlyDialogWorstCaseAffinityTest.java
Tue Dec 21 10:50:49 2010
@@ -82,13 +82,11 @@
if(method.equals("INVITE")) invite = source;
if(method.equals("ACK")) {
ack = source;
-
- if(ack == invite) TestCase.fail("INVITE and ACK should have landed on
different nodes");
- }
+
+ }
if(method.equals("BYE")) {
bye = source;
-
- if(ack == bye) TestCase.fail("ACK and BYE should have landed on
different nodes");
+
}
@@ -113,6 +111,8 @@
Thread.sleep(11000);
if(invite == null) TestCase.fail("INVITE not seen");
if(ack == null) TestCase.fail("BYE not seen");
+ assertNotSame(ack, bye);
+ assertNotSame(ack, invite);
}
AppServer ringingAppServer;
=======================================
---
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/algorithms/HeaderConsistentHashAlgorithmTest.java
Sun Dec 19 18:47:06 2010
+++
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/algorithms/HeaderConsistentHashAlgorithmTest.java
Tue Dec 21 10:50:49 2010
@@ -116,6 +116,19 @@
assertNotNull(invite);
assertNotNull(bye);
}
+
+ public void testAllNodesDead() throws Exception {
+ for(AppServer as:servers) {
+ as.sendCleanShutdownToBalancers();
+ as.sendHeartbeat=false;
+ }
+ Thread.sleep(1000);
+ shootist.callerSendsBye = true;
+ shootist.sendInitialInvite();
+
+ Thread.sleep(5000);
+ assertEquals(500, shootist.responses.get(0).getStatusCode());
+ }
AppServer ringingAppServer;
AppServer okAppServer;
=======================================
---
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/operation/InviteTransactionFailover.java
Mon Nov 15 14:36:51 2010
+++
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/operation/InviteTransactionFailover.java
Tue Dec 21 10:50:49 2010
@@ -82,7 +82,20 @@
nodes = balancer.getNodeList();
assertEquals(numNodes-1, nodes.length);
}
-
+
+ public void testAllNodesDead() throws Exception {
+ for(AppServer as:servers) {
+ as.sendCleanShutdownToBalancers();
+ as.sendHeartbeat=false;
+ }
+ Thread.sleep(1000);
+ shootist.callerSendsBye = true;
+ shootist.sendInitialInvite();
+
+ Thread.sleep(5000);
+ assertEquals(500, shootist.responses.get(0).getStatusCode());
+ }
+
// private void _BAD_testInviteTx() throws Exception {
// ProtocolObjects senderProtocolObjects = new
ProtocolObjects("forward-udp-sender",
// "gov.nist", "udp", false, null);
=======================================
---
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/operation/Shootist.java
Mon Nov 15 14:36:51 2010
+++
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/operation/Shootist.java
Tue Dec 21 10:50:49 2010
@@ -2,6 +2,7 @@
import java.text.ParseException;
import java.util.ArrayList;
+import java.util.LinkedList;
import java.util.Properties;
import java.util.Timer;
import java.util.TimerTask;
@@ -68,6 +69,9 @@
public boolean callerSendsBye;
public Request inviteRequest;
+
+ public LinkedList<Request> requests = new LinkedList<Request>();
+ public LinkedList<Response> responses = new LinkedList<Response>();
class ByeTask extends TimerTask {
Dialog dialog;
@@ -123,6 +127,7 @@
public void processRequest(RequestEvent requestReceivedEvent) {
Request request = requestReceivedEvent.getRequest();
+ requests.add(request);
ServerTransaction serverTransactionId = requestReceivedEvent
.getServerTransaction();
if(serverTransactionId == null) {
@@ -185,6 +190,7 @@
public void processResponse(ResponseEvent responseReceivedEvent) {
System.out.println("Got a response");
Response response = (Response) responseReceivedEvent.getResponse();
+ responses.add(response);
ClientTransaction tid =
responseReceivedEvent.getClientTransaction();
CSeqHeader cseq = (CSeqHeader) response.getHeader(CSeqHeader.NAME);