Merge pull request #801 from jschoiRR/diplo-2026

jschoiRR · jschoiRR · commit 22c1338b8b53 · 2026-04-15T12:08:58.000+09:00
[Mold VR] 가상라우터의 client, connect, server 타임아웃을 글로벌설정 세팅값으로 반영되도록 기능 개발
diff --git a/core/src/main/java/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java b/core/src/main/java/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
@@ -36,6 +36,9 @@ public class LoadBalancerConfigCommand extends NetworkElementCommand {
     public String lbStatsAuth = "admin1:AdMiN123";
     public String lbStatsUri = "/admin?stats";
     public String maxconn = "";
+    public String lbConnectTimeout = "5000";
+    public String lbClientTimeout = "50000";
+    public String lbServerTimeout = "50000";
     public String lbProtocol;
     public boolean keepAliveEnabled = false;
     NicTO nic;
diff --git a/core/src/main/java/com/cloud/network/HAProxyConfigurator.java b/core/src/main/java/com/cloud/network/HAProxyConfigurator.java
@@ -46,6 +46,9 @@ public class HAProxyConfigurator implements LoadBalancerConfigurator {
 
     protected Logger logger = LogManager.getLogger(getClass());
     private static final String blankLine = "\t ";
+    private static final String defaultConnectTimeout = "5000";
+    private static final String defaultClientTimeout = "50000";
+    private static final String defaultServerTimeout = "50000";
     private static String[] globalSection = {"global", "\tlog 127.0.0.1:3914   local0 warning", "\tmaxconn 4096", "\tmaxpipes 1024", "\tchroot /var/lib/haproxy",
         "\tuser haproxy", "\tgroup haproxy", "\tstats socket /run/haproxy/admin.sock", "\tdaemon"};
 
@@ -82,7 +85,7 @@ public String[] generateConfiguration(final List<PortForwardingRuleTO> fwRules)
 
         result.addAll(Arrays.asList(globalSection));
         result.add(blankLine);
-        result.addAll(Arrays.asList(defaultsSection));
+        result.addAll(getDefaultsSection(defaultConnectTimeout, defaultClientTimeout, defaultServerTimeout, false));
         result.add(blankLine);
 
         if (pools.isEmpty()) {
@@ -631,10 +634,7 @@ public String[] generateConfiguration(final LoadBalancerConfigCommand lbCmd) {
         result.addAll(gSection);
 
         result.add(blankLine);
-        final List<String> dSection = Arrays.asList(defaultsSection);
-        if (lbCmd.keepAliveEnabled) {
-            dSection.set(7, "\tno option httpclose");
-        }
+        final List<String> dSection = getDefaultsSection(lbCmd.lbConnectTimeout, lbCmd.lbClientTimeout, lbCmd.lbServerTimeout, lbCmd.keepAliveEnabled);
 
         if (logger.isDebugEnabled()) {
             for (final String s : dSection) {
@@ -751,4 +751,18 @@ private void addSslCertEntry(Set<SslCertEntry> sslCertEntries, LoadBalancerTO lb
         final SslCertEntry sslCertEntry = new SslCertEntry(name, cert.getCert(), cert.getKey(), cert.getChain(), cert.getPassword());
         sslCertEntries.add(sslCertEntry);
     }
+
+    private List<String> getDefaultsSection(final String connectTimeout, final String clientTimeout, final String serverTimeout, final boolean keepAliveEnabled) {
+        final List<String> dSection = new ArrayList<>(Arrays.asList(defaultsSection));
+        final String effectiveConnectTimeout = StringUtils.isBlank(connectTimeout) ? defaultConnectTimeout : connectTimeout;
+        final String effectiveClientTimeout = StringUtils.isBlank(clientTimeout) ? defaultClientTimeout : clientTimeout;
+        final String effectiveServerTimeout = StringUtils.isBlank(serverTimeout) ? defaultServerTimeout : serverTimeout;
+        dSection.set(8, "\ttimeout connect    " + effectiveConnectTimeout);
+        dSection.set(9, "\ttimeout client     " + effectiveClientTimeout);
+        dSection.set(10, "\ttimeout server     " + effectiveServerTimeout);
+        if (keepAliveEnabled) {
+            dSection.set(7, "\tno option httpclose");
+        }
+        return dSection;
+    }
 }
diff --git a/plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java b/plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
@@ -76,6 +76,7 @@
 import com.cloud.network.lb.LoadBalancingRule.LbSslCert;
 import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy;
 import com.cloud.network.lb.dao.ElasticLbVmMapDao;
+import com.cloud.network.router.VirtualNetworkApplianceManager;
 import com.cloud.network.router.VirtualRouter;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.LoadBalancer;
@@ -223,6 +224,9 @@ private void createApplyLoadBalancingRulesCommands(List<LoadBalancingRule> rules
         cmd.lbStatsUri = _configDao.getValue(Config.NetworkLBHaproxyStatsUri.key());
         cmd.lbStatsAuth = _configDao.getValue(Config.NetworkLBHaproxyStatsAuth.key());
         cmd.lbStatsPort = _configDao.getValue(Config.NetworkLBHaproxyStatsPort.key());
+        cmd.lbConnectTimeout = VirtualNetworkApplianceManager.NetworkLBHaproxyConnectTimeout.value().toString();
+        cmd.lbClientTimeout = VirtualNetworkApplianceManager.NetworkLBHaproxyClientTimeout.value().toString();
+        cmd.lbServerTimeout = VirtualNetworkApplianceManager.NetworkLBHaproxyServerTimeout.value().toString();
 
         cmds.addCommand(cmd);
 
diff --git a/plugins/network-elements/internal-loadbalancer/src/main/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java b/plugins/network-elements/internal-loadbalancer/src/main/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
@@ -519,6 +519,9 @@ private void createApplyLoadBalancingRulesCommands(final List<LoadBalancingRule>
         cmd.lbStatsUri = _configDao.getValue(Config.NetworkLBHaproxyStatsUri.key());
         cmd.lbStatsAuth = _configDao.getValue(Config.NetworkLBHaproxyStatsAuth.key());
         cmd.lbStatsPort = _configDao.getValue(Config.NetworkLBHaproxyStatsPort.key());
+        cmd.lbConnectTimeout = VirtualNetworkApplianceManager.NetworkLBHaproxyConnectTimeout.value().toString();
+        cmd.lbClientTimeout = VirtualNetworkApplianceManager.NetworkLBHaproxyClientTimeout.value().toString();
+        cmd.lbServerTimeout = VirtualNetworkApplianceManager.NetworkLBHaproxyServerTimeout.value().toString();
 
         cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getInternalLbControlIp(internalLbVm.getId()));
         cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, guestNic.getIPv4Address());
diff --git a/server/src/main/java/com/cloud/network/router/CommandSetupHelper.java b/server/src/main/java/com/cloud/network/router/CommandSetupHelper.java
@@ -404,6 +404,9 @@ public void createApplyLoadBalancingRulesCommands(final List<LoadBalancingRule>
         cmd.lbStatsUri = _configDao.getValue(Config.NetworkLBHaproxyStatsUri.key());
         cmd.lbStatsAuth = _configDao.getValue(Config.NetworkLBHaproxyStatsAuth.key());
         cmd.lbStatsPort = _configDao.getValue(Config.NetworkLBHaproxyStatsPort.key());
+        cmd.lbConnectTimeout = VirtualNetworkApplianceManager.NetworkLBHaproxyConnectTimeout.value().toString();
+        cmd.lbClientTimeout = VirtualNetworkApplianceManager.NetworkLBHaproxyClientTimeout.value().toString();
+        cmd.lbServerTimeout = VirtualNetworkApplianceManager.NetworkLBHaproxyServerTimeout.value().toString();
 
         cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, _routerControlHelper.getRouterControlIp(router.getId()));
         cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, _routerControlHelper.getRouterIpInNetwork(guestNetworkId, router.getId()));
diff --git a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManager.java b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManager.java
@@ -45,6 +45,9 @@ public interface VirtualNetworkApplianceManager extends Manager, VirtualNetworkA
     String SetServiceMonitorCK = "network.router.EnableServiceMonitoring";
     String RouterAlertsCheckIntervalCK = "router.alerts.check.interval";
     String VirtualRouterServiceOfferingCK = "router.service.offering";
+    String NetworkLBHaproxyConnectTimeoutCK = "network.loadbalancer.haproxy.connect.timeout";
+    String NetworkLBHaproxyClientTimeoutCK = "network.loadbalancer.haproxy.client.timeout";
+    String NetworkLBHaproxyServerTimeoutCK = "network.loadbalancer.haproxy.server.timeout";
 
     String RouterHealthChecksConfigRefreshIntervalCK = "router.health.checks.config.refresh.interval";
     String RouterHealthChecksResultFetchIntervalCK = "router.health.checks.results.fetch.interval";
@@ -84,6 +87,12 @@ public interface VirtualNetworkApplianceManager extends Manager, VirtualNetworkA
 
     ConfigKey<String> VirtualRouterServiceOffering = new ConfigKey<>(String.class, VirtualRouterServiceOfferingCK, "Advanced", "",
             "Uuid of the service offering used by virtual routers; if NULL - system offering will be used", true, ConfigKey.Scope.Account, null);
+    ConfigKey<Integer> NetworkLBHaproxyConnectTimeout = new ConfigKey<>(Integer.class, NetworkLBHaproxyConnectTimeoutCK, "Network", "5000",
+            "Load Balancer(haproxy) connect timeout in milliseconds.", true, ConfigKey.Scope.Global, null);
+    ConfigKey<Integer> NetworkLBHaproxyClientTimeout = new ConfigKey<>(Integer.class, NetworkLBHaproxyClientTimeoutCK, "Network", "50000",
+            "Load Balancer(haproxy) client timeout in milliseconds.", true, ConfigKey.Scope.Global, null);
+    ConfigKey<Integer> NetworkLBHaproxyServerTimeout = new ConfigKey<>(Integer.class, NetworkLBHaproxyServerTimeoutCK, "Network", "50000",
+            "Load Balancer(haproxy) server timeout in milliseconds.", true, ConfigKey.Scope.Global, null);
 
     // Health checks
     ConfigKey<Boolean> RouterHealthChecksEnabled = new ConfigKey<>(Boolean.class, "router.health.checks.enabled", "Advanced", "true",
diff --git a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -3360,6 +3360,9 @@ public ConfigKey<?>[] getConfigKeys() {
                 RouterVersionCheckEnabled,
                 SetServiceMonitor,
                 VirtualRouterServiceOffering,
+                NetworkLBHaproxyConnectTimeout,
+                NetworkLBHaproxyClientTimeout,
+                NetworkLBHaproxyServerTimeout,
                 RouterAlertsCheckInterval,
                 RouterHealthChecksEnabled,
                 RouterHealthChecksBasicInterval,
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -6540,9 +6540,11 @@ public List<Class<?>> getCommands() {
         cmdList.add(UpdateHostPasswordCmd.class);
         cmdList.add(AddNetworkDeviceCmd.class);
         cmdList.add(AddNetworkServiceProviderCmd.class);
+        cmdList.add(CreateManagementNetworkIpRangeCmd.class);
         cmdList.add(CreateNetworkOfferingCmd.class);
         cmdList.add(CreatePhysicalNetworkCmd.class);
         cmdList.add(CreateStorageNetworkIpRangeCmd.class);
+        cmdList.add(DeleteManagementNetworkIpRangeCmd.class);
         cmdList.add(DeleteNetworkDeviceCmd.class);
         cmdList.add(DeleteNetworkOfferingCmd.class);
         cmdList.add(DeleteNetworkServiceProviderCmd.class);
