CLOUDSTACK-7212: Failed creating LB rule on public port 8081 for VR as LB provider

Jayapal · Jayapal · commit d28da9d98673 · 2014-08-01T15:54:17.000+05:30
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
@@ -323,6 +323,8 @@ public void create() {
         } catch (InsufficientAddressCapacityException e) {
             s_logger.warn("Exception: ", e);
             throw new ServerApiException(ApiErrorCode.INSUFFICIENT_CAPACITY_ERROR, e.getMessage());
+        } catch (InvalidParameterValueException e) {
+            throw new ServerApiException(ApiErrorCode.PARAM_ERROR, e.getMessage());
         }
     }
 
diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java
@@ -25,6 +25,7 @@
 import javax.ejb.Local;
 import javax.inject.Inject;
 
+import com.cloud.utils.net.NetUtils;
 import org.apache.log4j.Logger;
 
 import com.google.gson.Gson;
@@ -303,6 +304,11 @@ private static boolean containsOnlyNumbers(String str, String endChar) {
     public static boolean validateHAProxyLBRule(LoadBalancingRule rule) {
         String timeEndChar = "dhms";
 
+        if (rule.getSourcePortStart() == NetUtils.HAPROXY_STATS_PORT) {
+            s_logger.debug("Can't create LB on port 8081, haproxy is listening for  LB stats on this port");
+            return false;
+        }
+
         for (LbStickinessPolicy stickinessPolicy : rule.getStickinessPolicies()) {
             List<Pair<String, String>> paramsList = stickinessPolicy.getParams();
 
diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
@@ -1637,6 +1637,11 @@ public LoadBalancer createPublicLoadBalancerRule(String xId, String name, String
                 if (ex instanceof NetworkRuleConflictException) {
                     throw (NetworkRuleConflictException)ex;
                 }
+
+                if (ex instanceof InvalidParameterValueException) {
+                    throw (InvalidParameterValueException)ex;
+                }
+
             } finally {
                 if (result == null && systemIp != null) {
                     s_logger.debug("Releasing system IP address " + systemIp + " as corresponding lb rule failed to create");
diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -58,6 +58,7 @@ public class NetUtils {
     public final static int VPN_PORT = 500;
     public final static int VPN_NATT_PORT = 4500;
     public final static int VPN_L2TP_PORT = 1701;
+    public final static int HAPROXY_STATS_PORT = 8081;
 
     public final static String UDP_PROTO = "udp";
     public final static String TCP_PROTO = "tcp";

Original file line number	Diff line number	Diff line change
`@@ -323,6 +323,8 @@ public void create() {`
`323`	`323`	`} catch (InsufficientAddressCapacityException e) {`
`324`	`324`	`s_logger.warn("Exception: ", e);`
`325`	`325`	`throw new ServerApiException(ApiErrorCode.INSUFFICIENT_CAPACITY_ERROR, e.getMessage());`
	`326`	`+ } catch (InvalidParameterValueException e) {`
	`327`	`+ throw new ServerApiException(ApiErrorCode.PARAM_ERROR, e.getMessage());`
`326`	`328`	`}`
`327`	`329`	`}`
`328`	`330`