Revision: 15664
Author: vladimir.ralev
Date: Tue Dec 7 18:24:03 2010
Log: Update Issue 2191
SIP LB performance updates and tests
http://code.google.com/p/mobicents/source/detail?r=15664
Modified:
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/SIPBalancerValveProcessor.java
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/BlackholeAppServer.java
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/performance/UdpForwardingPerformanceTest.java
=======================================
---
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/SIPBalancerValveProcessor.java
Tue Dec 7 17:43:36 2010
+++
/trunk/tools/sip-balancer/jar/src/main/java/org/mobicents/tools/sip/balancer/SIPBalancerValveProcessor.java
Tue Dec 7 18:24:03 2010
@@ -16,12 +16,12 @@
@Override
public boolean processRequest(SIPRequest request,
MessageChannel messageChannel) {
- SipProvider p;
- if(messageChannel.getPort() ==
BalancerContext.balancerContext.externalPort) {
- p = BalancerContext.balancerContext.externalSipProvider;
- } else {
- p = BalancerContext.balancerContext.internalSipProvider;
- }
+ SipProvider p =
BalancerContext.balancerContext.externalSipProvider;
+ if(messageChannel.getPort() !=
BalancerContext.balancerContext.externalPort) {
+ if(BalancerContext.balancerContext.isTwoEntrypoints())
+ p =
BalancerContext.balancerContext.internalSipProvider;
+ }
+
RequestEvent event = new RequestEvent(p, null, null, request);
BalancerContext.balancerContext.forwarder.processRequest(event);
return false;
@@ -30,11 +30,10 @@
@Override
public boolean processResponse(Response response,
MessageChannel messageChannel) {
- SipProvider p;
- if(messageChannel.getPort() ==
BalancerContext.balancerContext.externalPort) {
- p = BalancerContext.balancerContext.externalSipProvider;
- } else {
- p = BalancerContext.balancerContext.internalSipProvider;
+ SipProvider p =
BalancerContext.balancerContext.externalSipProvider;
+ if(messageChannel.getPort() !=
BalancerContext.balancerContext.externalPort) {
+ if(BalancerContext.balancerContext.isTwoEntrypoints())
+ p =
BalancerContext.balancerContext.internalSipProvider;
}
ResponseEvent event = new ResponseEvent(p, null, null,
response);
BalancerContext.balancerContext.forwarder.processResponse(event);
=======================================
---
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/BlackholeAppServer.java
Tue Dec 7 17:43:36 2010
+++
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/BlackholeAppServer.java
Tue Dec 7 18:24:03 2010
@@ -97,9 +97,11 @@
thread.interrupt();
thread.stop();
} catch (Exception e) {}
+
timer.cancel();
+ socket.close();
if(protocolObjects != null)
- protocolObjects.sipStack.stop();
+ protocolObjects.sipStack.stop();
protocolObjects=null;
//sendCleanShutdownToBalancers();
}
=======================================
---
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/performance/UdpForwardingPerformanceTest.java
Tue Dec 7 17:43:36 2010
+++
/trunk/tools/sip-balancer/jar/src/test/java/org/mobicents/tools/sip/balancer/performance/UdpForwardingPerformanceTest.java
Tue Dec 7 18:24:03 2010
@@ -177,4 +177,10 @@
e.printStackTrace();
}
}
-}
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ server.stop();
+ balancer.stop();
+ }
+}