Merge remote-tracking branch 'origin/4.14'

yadvr · yadvr · commit 5bea0a1ea4c4 · 2020-12-02T14:29:34.000+05:30
diff --git a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
@@ -798,6 +798,13 @@ public boolean validateHAProxyLBRule(final LoadBalancingRule rule) {
             }
             return false;
         }
+        String lbProtocol = rule.getLbProtocol();
+        if (lbProtocol != null && lbProtocol.toLowerCase().equals(NetUtils.UDP_PROTO)) {
+            if (s_logger.isDebugEnabled()) {
+                s_logger.debug("Can't create LB rule as haproxy does not support udp");
+            }
+            return false;
+        }
 
         for (final LoadBalancingRule.LbStickinessPolicy stickinessPolicy : rule.getStickinessPolicies()) {
             final List<Pair<String, String>> paramsList = stickinessPolicy.getParams();

Original file line number	Diff line number	Diff line change
`@@ -798,6 +798,13 @@ public boolean validateHAProxyLBRule(final LoadBalancingRule rule) {`
`798`	`798`	`}`
`799`	`799`	`return false;`
`800`	`800`	`}`
	`801`	`+ String lbProtocol = rule.getLbProtocol();`
	`802`	`+ if (lbProtocol != null && lbProtocol.toLowerCase().equals(NetUtils.UDP_PROTO)) {`
	`803`	`+ if (s_logger.isDebugEnabled()) {`
	`804`	`+ s_logger.debug("Can't create LB rule as haproxy does not support udp");`
	`805`	`+ }`
	`806`	`+ return false;`
	`807`	`+ }`
`801`	`808`
`802`	`809`	`for (final LoadBalancingRule.LbStickinessPolicy stickinessPolicy : rule.getStickinessPolicies()) {`
`803`	`810`	`final List<Pair<String, String>> paramsList = stickinessPolicy.getParams();`