fix HealthcheckTest

knosach · knosach · commit a6dc98b6f6ad · 2017-06-13T16:13:59.000+03:00
diff --git a/jar/src/main/java/org/mobicents/tools/sip/balancer/ActiveStandbyAlgorithm.java b/jar/src/main/java/org/mobicents/tools/sip/balancer/ActiveStandbyAlgorithm.java
@@ -146,7 +146,9 @@ protected Node selectNewNode(Boolean isIpV6)
 		if(node!=null)
 		{
 			KeySip keyNode = new KeySip(node,isIpV6);
-			if(invocationContext.sipNodeMap(isIpV6).containsKey(keyNode)&&!invocationContext.sipNodeMap(isIpV6).get(keyNode).isGracefulShutdown())
+			if(invocationContext.sipNodeMap(isIpV6).containsKey(keyNode)
+					&&!invocationContext.sipNodeMap(isIpV6).get(keyNode).isGracefulShutdown()
+					&&!invocationContext.sipNodeMap(isIpV6).get(keyNode).isBad())
 				return node;
 		}
 		try
diff --git a/jar/src/main/java/org/mobicents/tools/sip/balancer/CallIDAffinityBalancerAlgorithm.java b/jar/src/main/java/org/mobicents/tools/sip/balancer/CallIDAffinityBalancerAlgorithm.java
@@ -284,7 +284,8 @@ protected synchronized Node nextAvailableNode(Boolean isIpV6) {
 		{
 			pair = currIt.next();
 			if(invocationContext.sipNodeMap(isIpV6).containsKey(pair.getKey())
-					&&!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isGracefulShutdown())
+					&&!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isGracefulShutdown()
+					&&!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isBad())
 				return pair.getValue();
 		}
 		currIt = invocationContext.sipNodeMap(isIpV6).entrySet().iterator();
@@ -295,7 +296,8 @@ protected synchronized Node nextAvailableNode(Boolean isIpV6) {
 		if(currIt.hasNext())
 		{
 			pair = currIt.next();
-			if(!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isGracefulShutdown())
+			if(!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isGracefulShutdown()
+					&&!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isBad())
 				return pair.getValue();
 			else 
 				return null;
diff --git a/jar/src/main/java/org/mobicents/tools/sip/balancer/HeaderConsistentHashBalancerAlgorithm.java b/jar/src/main/java/org/mobicents/tools/sip/balancer/HeaderConsistentHashBalancerAlgorithm.java
@@ -99,7 +99,8 @@ public Node processExternalRequest(Request request,Boolean isIpV6) {
 			try {
 				Node node = (Node) nodesArray(isIpV6)[nodeIndex];
 //				if(!invocationContext.gracefulShutdownSipNodeMap(isIpV6).containsKey(new KeySip(node)))
-				if(!invocationContext.sipNodeMap(isIpV6).get(new KeySip(node,isIpV6)).isGracefulShutdown())
+				if(!invocationContext.sipNodeMap(isIpV6).get(new KeySip(node,isIpV6)).isGracefulShutdown()
+						&&!invocationContext.sipNodeMap(isIpV6).get(new KeySip(node,isIpV6)).isBad())
 					return node;
 				else
 					return null;
diff --git a/jar/src/main/java/org/mobicents/tools/sip/balancer/PersistentConsistentHashBalancerAlgorithm.java b/jar/src/main/java/org/mobicents/tools/sip/balancer/PersistentConsistentHashBalancerAlgorithm.java
@@ -111,7 +111,8 @@ else if(sipHeaderAffinityKey.equals("To"))
 		{
 			try {
 				Node node = (Node) nodesArray(isIpV6)[nodeIndex];
-				if(!invocationContext.sipNodeMap(isIpV6).get(new KeySip(node,isIpV6)).isGracefulShutdown())
+				if(!invocationContext.sipNodeMap(isIpV6).get(new KeySip(node,isIpV6)).isGracefulShutdown()
+						&&!invocationContext.sipNodeMap(isIpV6).get(new KeySip(node,isIpV6)).isBad())
 				{
 					cache.put(headerValue, node);
 					
diff --git a/jar/src/main/java/org/mobicents/tools/sip/balancer/PureConsistentHashBalancerAlgorithm.java b/jar/src/main/java/org/mobicents/tools/sip/balancer/PureConsistentHashBalancerAlgorithm.java
@@ -77,7 +77,8 @@ public Node processExternalRequest(Request request,Boolean isIpV6) {
 		} else {
 			try {
 				Node node = (Node) nodesArray(isIpV6)[nodeIndex];
-				if(!invocationContext.sipNodeMap(isIpV6).get(new KeySip(node,isIpV6)).isGracefulShutdown())
+				if(!invocationContext.sipNodeMap(isIpV6).get(new KeySip(node,isIpV6)).isGracefulShutdown()
+						&&!invocationContext.sipNodeMap(isIpV6).get(new KeySip(node,isIpV6)).isBad())
 					return node;
 				else
 					return null;
diff --git a/jar/src/main/java/org/mobicents/tools/sip/balancer/UserBasedAlgorithm.java b/jar/src/main/java/org/mobicents/tools/sip/balancer/UserBasedAlgorithm.java
@@ -316,7 +316,8 @@ protected synchronized Node nextAvailableNode(Boolean isIpV6) {
 		{
 			pair = currIt.next();
 			if(invocationContext.sipNodeMap(isIpV6).containsKey(pair.getKey())
-					&&!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isGracefulShutdown())
+					&&!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isGracefulShutdown()
+					&&!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isBad())
 				return pair.getValue();
 		}
 		currIt = invocationContext.sipNodeMap(isIpV6).entrySet().iterator();
@@ -327,7 +328,8 @@ protected synchronized Node nextAvailableNode(Boolean isIpV6) {
 		if(currIt.hasNext())
 		{
 			pair = currIt.next();
-			if(!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isGracefulShutdown())
+			if(!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isGracefulShutdown()
+					&&!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isBad())
 				return pair.getValue();
 			else
 				return null;
diff --git a/jar/src/test/java/org/mobicents/tools/sip/balancer/operation/HealthcheckTest.java b/jar/src/test/java/org/mobicents/tools/sip/balancer/operation/HealthcheckTest.java
@@ -67,8 +67,9 @@ public void setUp() throws Exception
 		badServer = new AppServer("node1",4061 , "127.0.0.1", 2000, 5060, 5065, "0", ListeningPoint.TCP, 2223);
 		badServer.isSendResponse = false;
 		goodServer.start();
+		Thread.sleep(2000);
 		badServer.start();
-		Thread.sleep(5000);
+		Thread.sleep(2000);
 	}
 	
 	@After

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,9 @@ protected Node selectNewNode(Boolean isIpV6)`
`146`	`146`	`if(node!=null)`
`147`	`147`	`{`
`148`	`148`	`KeySip keyNode = new KeySip(node,isIpV6);`
`149`		`- if(invocationContext.sipNodeMap(isIpV6).containsKey(keyNode)&&!invocationContext.sipNodeMap(isIpV6).get(keyNode).isGracefulShutdown())`
	`149`	`+ if(invocationContext.sipNodeMap(isIpV6).containsKey(keyNode)`
	`150`	`+ &&!invocationContext.sipNodeMap(isIpV6).get(keyNode).isGracefulShutdown()`
	`151`	`+ &&!invocationContext.sipNodeMap(isIpV6).get(keyNode).isBad())`
`150`	`152`	`return node;`
`151`	`153`	`}`
`152`	`154`	`try`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,8 @@ protected synchronized Node nextAvailableNode(Boolean isIpV6) {`
`284`	`284`	`{`
`285`	`285`	`pair = currIt.next();`
`286`	`286`	`if(invocationContext.sipNodeMap(isIpV6).containsKey(pair.getKey())`
`287`		`- &&!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isGracefulShutdown())`
	`287`	`+ &&!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isGracefulShutdown()`
	`288`	`+ &&!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isBad())`
`288`	`289`	`return pair.getValue();`
`289`	`290`	`}`
`290`	`291`	`currIt = invocationContext.sipNodeMap(isIpV6).entrySet().iterator();`
`@@ -295,7 +296,8 @@ protected synchronized Node nextAvailableNode(Boolean isIpV6) {`
`295`	`296`	`if(currIt.hasNext())`
`296`	`297`	`{`
`297`	`298`	`pair = currIt.next();`
`298`		`- if(!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isGracefulShutdown())`
	`299`	`+ if(!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isGracefulShutdown()`
	`300`	`+ &&!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isBad())`
`299`	`301`	`return pair.getValue();`
`300`	`302`	`else`
`301`	`303`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,8 @@ else if(sipHeaderAffinityKey.equals("To"))`
`111`	`111`	`{`
`112`	`112`	`try {`
`113`	`113`	`Node node = (Node) nodesArray(isIpV6)[nodeIndex];`
`114`		`- if(!invocationContext.sipNodeMap(isIpV6).get(new KeySip(node,isIpV6)).isGracefulShutdown())`
	`114`	`+ if(!invocationContext.sipNodeMap(isIpV6).get(new KeySip(node,isIpV6)).isGracefulShutdown()`
	`115`	`+ &&!invocationContext.sipNodeMap(isIpV6).get(new KeySip(node,isIpV6)).isBad())`
`115`	`116`	`{`
`116`	`117`	`cache.put(headerValue, node);`
`117`	`118`
Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,8 @@ protected synchronized Node nextAvailableNode(Boolean isIpV6) {`
`316`	`316`	`{`
`317`	`317`	`pair = currIt.next();`
`318`	`318`	`if(invocationContext.sipNodeMap(isIpV6).containsKey(pair.getKey())`
`319`		`- &&!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isGracefulShutdown())`
	`319`	`+ &&!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isGracefulShutdown()`
	`320`	`+ &&!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isBad())`
`320`	`321`	`return pair.getValue();`
`321`	`322`	`}`
`322`	`323`	`currIt = invocationContext.sipNodeMap(isIpV6).entrySet().iterator();`
`@@ -327,7 +328,8 @@ protected synchronized Node nextAvailableNode(Boolean isIpV6) {`
`327`	`328`	`if(currIt.hasNext())`
`328`	`329`	`{`
`329`	`330`	`pair = currIt.next();`
`330`		`- if(!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isGracefulShutdown())`
	`331`	`+ if(!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isGracefulShutdown()`
	`332`	`+ &&!invocationContext.sipNodeMap(isIpV6).get(pair.getKey()).isBad())`
`331`	`333`	`return pair.getValue();`
`332`	`334`	`else`
`333`	`335`	`return null;`