From e30cee742894f8fe251e3a0e63cd88a9d026b93c Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Thu, 1 Jun 2023 14:03:55 +0200 Subject: [PATCH 1/7] get the right controll cidr --- .../cloud/agent/properties/AgentProperties.java | 8 ++++---- .../hypervisor/kvm/resource/BridgeVifDriver.java | 5 +---- .../hypervisor/kvm/resource/IvsVifDriver.java | 5 +---- .../kvm/resource/LibvirtComputingResource.java | 2 ++ .../hypervisor/kvm/resource/OvsVifDriver.java | 5 +---- .../hypervisor/kvm/resource/VifDriverBase.java | 14 ++++++++++++++ 6 files changed, 23 insertions(+), 16 deletions(-) diff --git a/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java b/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java index 9a031e001fa1..fa8bf982a38b 100644 --- a/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java +++ b/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java @@ -715,11 +715,11 @@ public Property getWorkers() { public static final Property VM_MEMBALLOON_STATS_PERIOD = new Property<>("vm.memballoon.stats.period", 0); /** - * The number of iothreads - * Data type: Integer.
- * Default value: 1 + * BGP controll CIDR + * Data type: String.
+ * Default value: 169.254.0.0/16 */ - public static final Property IOTHREADS = new Property<>("iothreads", 1); + public static final Property CONTROLL_CIDR = new Property<>("control.cidr", "169.254.0.0/16"); public static class Property { private String name; diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java index 8d8271a2fbe7..e52da4185c33 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java @@ -65,10 +65,7 @@ public void configure(Map params) throws ConfigurationException String networkScriptsDir = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.NETWORK_SCRIPTS_DIR); - String controlCidr = (String)params.get("control.cidr"); - if (StringUtils.isNotBlank(controlCidr)) { - _controlCidr = controlCidr; - } + _controlCidr = getControllCidr(_controlCidr, params); String value = (String)params.get("scripts.timeout"); _timeout = NumbersUtil.parseInt(value, 30 * 60) * 1000; diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java index c0dceb3832dd..2c0a89f32f71 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java @@ -71,10 +71,7 @@ public void configure(Map params) throws ConfigurationException } _ivsIfUpPath = Script.findScript(utilScriptsDir, "qemu-ivs-ifup"); - String controlCidr = (String)params.get("control.cidr"); - if (StringUtils.isNotBlank(controlCidr)) { - _controlCidr = controlCidr; - } + _controlCidr = getControllCidr(_controlCidr, params); } @Override diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 3f711fa9b809..7e5113adb102 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -830,6 +830,8 @@ public boolean configure(final String name, final Map params) th String storageScriptsDir = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.STORAGE_SCRIPTS_DIR); + String controllCidr = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.CONTROLL_CIDR); + String tungstenScriptsDir = (String) params.get("tungsten.scripts.dir"); if (tungstenScriptsDir == null) { tungstenScriptsDir = getDefaultTungstenScriptsDir(); diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java index c6867b3c1463..6d1abd0a8536 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java @@ -60,10 +60,7 @@ public void configure(Map params) throws ConfigurationException dpdkDriver = new DpdkDriverImpl(); } - String controlCidr = (String)params.get("control.cidr"); - if (StringUtils.isNotBlank(controlCidr)) { - _controlCidr = controlCidr; - } + _controlCidr = getControllCidr(_controlCidr, params); String value = (String)params.get("scripts.timeout"); _timeout = NumbersUtil.parseInt(value, 30 * 60) * 1000; diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java index 77aeec554593..97fe4c483822 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java @@ -23,6 +23,9 @@ import javax.naming.ConfigurationException; +import com.cloud.agent.properties.AgentProperties; +import com.cloud.agent.properties.AgentPropertiesFileHandler; +import org.apache.commons.lang3.StringUtils; import org.libvirt.LibvirtException; import com.cloud.agent.api.to.NicTO; @@ -41,6 +44,17 @@ public void configure(Map params) throws ConfigurationException _pifs = (Map)params.get("libvirt.host.pifs"); } + protected String getControllCidr(String default_value, Map params) { + String controllCidr = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.CONTROLL_CIDR); + if (StringUtils.isBlank(controllCidr)) { + controllCidr = (String) params.get("control.cidr"); + } + if (StringUtils.isBlank(controllCidr)) { + controllCidr = default_value; + } + return controllCidr; + } + @Override public abstract LibvirtVMDef.InterfaceDef plug(NicTO nic, String guestOsType, String nicAdapter, Map extraConfig) throws InternalErrorException, LibvirtException; From d992ffa947fa9b9493b5b03a710c78b5092400f6 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Thu, 1 Jun 2023 14:06:49 +0200 Subject: [PATCH 2/7] restore old property --- .../java/com/cloud/agent/properties/AgentProperties.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java b/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java index fa8bf982a38b..0d1063652826 100644 --- a/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java +++ b/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java @@ -714,6 +714,13 @@ public Property getWorkers() { */ public static final Property VM_MEMBALLOON_STATS_PERIOD = new Property<>("vm.memballoon.stats.period", 0); + /** + * The number of iothreads + * Data type: Integer.
+ * Default value: 1 + */ + public static final Property IOTHREADS = new Property<>("iothreads", 1); + /** * BGP controll CIDR * Data type: String.
From 25863f21c4c6157e371821182e492924ebd32f59 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Thu, 1 Jun 2023 14:34:05 +0200 Subject: [PATCH 3/7] parameter naming convention --- .../java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java index 97fe4c483822..49d6285af4e5 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java @@ -44,13 +44,13 @@ public void configure(Map params) throws ConfigurationException _pifs = (Map)params.get("libvirt.host.pifs"); } - protected String getControllCidr(String default_value, Map params) { + protected String getControllCidr(String defaultValue, Map params) { String controllCidr = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.CONTROLL_CIDR); if (StringUtils.isBlank(controllCidr)) { controllCidr = (String) params.get("control.cidr"); } if (StringUtils.isBlank(controllCidr)) { - controllCidr = default_value; + controllCidr = defaultValue; } return controllCidr; } From 44752f1d208d03c6ee3e9ac8bbef0dad2cef8803 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Thu, 1 Jun 2023 14:35:54 +0200 Subject: [PATCH 4/7] rat --- .../java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java index 2c0a89f32f71..53958d944211 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java @@ -26,7 +26,6 @@ import javax.naming.ConfigurationException; -import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.libvirt.LibvirtException; From d4da6fa9e067d3c7a900ff459f1332a8a021f0c6 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Mon, 26 Jun 2023 10:21:05 +0200 Subject: [PATCH 5/7] single-l --- .../cloud/agent/properties/AgentProperties.java | 2 +- .../hypervisor/kvm/resource/BridgeVifDriver.java | 2 +- .../hypervisor/kvm/resource/IvsVifDriver.java | 2 +- .../kvm/resource/LibvirtComputingResource.java | 2 -- .../hypervisor/kvm/resource/OvsVifDriver.java | 2 +- .../hypervisor/kvm/resource/VifDriverBase.java | 14 +++++++------- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java b/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java index 0d1063652826..5c7f4ed4b235 100644 --- a/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java +++ b/agent/src/main/java/com/cloud/agent/properties/AgentProperties.java @@ -726,7 +726,7 @@ public Property getWorkers() { * Data type: String.
* Default value: 169.254.0.0/16 */ - public static final Property CONTROLL_CIDR = new Property<>("control.cidr", "169.254.0.0/16"); + public static final Property CONTROL_CIDR = new Property<>("control.cidr", "169.254.0.0/16"); public static class Property { private String name; diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java index e52da4185c33..f5388aea975f 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java @@ -65,7 +65,7 @@ public void configure(Map params) throws ConfigurationException String networkScriptsDir = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.NETWORK_SCRIPTS_DIR); - _controlCidr = getControllCidr(_controlCidr, params); + _controlCidr = getControlCidr(_controlCidr, params); String value = (String)params.get("scripts.timeout"); _timeout = NumbersUtil.parseInt(value, 30 * 60) * 1000; diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java index 53958d944211..102530161b26 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java @@ -70,7 +70,7 @@ public void configure(Map params) throws ConfigurationException } _ivsIfUpPath = Script.findScript(utilScriptsDir, "qemu-ivs-ifup"); - _controlCidr = getControllCidr(_controlCidr, params); + _controlCidr = getControlCidr(_controlCidr, params); } @Override diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 7e5113adb102..3f711fa9b809 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -830,8 +830,6 @@ public boolean configure(final String name, final Map params) th String storageScriptsDir = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.STORAGE_SCRIPTS_DIR); - String controllCidr = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.CONTROLL_CIDR); - String tungstenScriptsDir = (String) params.get("tungsten.scripts.dir"); if (tungstenScriptsDir == null) { tungstenScriptsDir = getDefaultTungstenScriptsDir(); diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java index 6d1abd0a8536..28f82c80776e 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java @@ -60,7 +60,7 @@ public void configure(Map params) throws ConfigurationException dpdkDriver = new DpdkDriverImpl(); } - _controlCidr = getControllCidr(_controlCidr, params); + _controlCidr = getControlCidr(_controlCidr, params); String value = (String)params.get("scripts.timeout"); _timeout = NumbersUtil.parseInt(value, 30 * 60) * 1000; diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java index 49d6285af4e5..6303d6524603 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java @@ -44,15 +44,15 @@ public void configure(Map params) throws ConfigurationException _pifs = (Map)params.get("libvirt.host.pifs"); } - protected String getControllCidr(String defaultValue, Map params) { - String controllCidr = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.CONTROLL_CIDR); - if (StringUtils.isBlank(controllCidr)) { - controllCidr = (String) params.get("control.cidr"); + protected String getControlCidr(String defaultValue, Map params) { + String controlCidr = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.CONTROL_CIDR); + if (StringUtils.isBlank(controlCidr)) { + controlCidr = (String) params.get("control.cidr"); } - if (StringUtils.isBlank(controllCidr)) { - controllCidr = defaultValue; + if (StringUtils.isBlank(controlCidr)) { + controlCidr = defaultValue; } - return controllCidr; + return controlCidr; } @Override From 41b27a1a8911858e60bb8c0eeb64f2083096ed81 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Tue, 4 Jul 2023 10:53:58 +0200 Subject: [PATCH 6/7] default should come from property --- .../com/cloud/hypervisor/kvm/resource/VifDriverBase.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java index 6303d6524603..8c1999455621 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java @@ -25,7 +25,6 @@ import com.cloud.agent.properties.AgentProperties; import com.cloud.agent.properties.AgentPropertiesFileHandler; -import org.apache.commons.lang3.StringUtils; import org.libvirt.LibvirtException; import com.cloud.agent.api.to.NicTO; @@ -46,12 +45,6 @@ public void configure(Map params) throws ConfigurationException protected String getControlCidr(String defaultValue, Map params) { String controlCidr = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.CONTROL_CIDR); - if (StringUtils.isBlank(controlCidr)) { - controlCidr = (String) params.get("control.cidr"); - } - if (StringUtils.isBlank(controlCidr)) { - controlCidr = defaultValue; - } return controlCidr; } From 8bc4f4f999b4bb2ae0d832753f520292ca1d86a7 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Wed, 5 Jul 2023 16:02:53 +0200 Subject: [PATCH 7/7] params removed --- .../java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java | 2 +- .../java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java | 2 +- .../java/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java | 2 +- .../java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java index f5388aea975f..39ecc9182f00 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java @@ -65,7 +65,7 @@ public void configure(Map params) throws ConfigurationException String networkScriptsDir = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.NETWORK_SCRIPTS_DIR); - _controlCidr = getControlCidr(_controlCidr, params); + _controlCidr = getControlCidr(_controlCidr); String value = (String)params.get("scripts.timeout"); _timeout = NumbersUtil.parseInt(value, 30 * 60) * 1000; diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java index 102530161b26..178728b7f96d 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java @@ -70,7 +70,7 @@ public void configure(Map params) throws ConfigurationException } _ivsIfUpPath = Script.findScript(utilScriptsDir, "qemu-ivs-ifup"); - _controlCidr = getControlCidr(_controlCidr, params); + _controlCidr = getControlCidr(_controlCidr); } @Override diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java index 28f82c80776e..3c4c9d48c9d6 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java @@ -60,7 +60,7 @@ public void configure(Map params) throws ConfigurationException dpdkDriver = new DpdkDriverImpl(); } - _controlCidr = getControlCidr(_controlCidr, params); + _controlCidr = getControlCidr(_controlCidr); String value = (String)params.get("scripts.timeout"); _timeout = NumbersUtil.parseInt(value, 30 * 60) * 1000; diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java index 8c1999455621..b3ae4c1d7044 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/VifDriverBase.java @@ -43,7 +43,7 @@ public void configure(Map params) throws ConfigurationException _pifs = (Map)params.get("libvirt.host.pifs"); } - protected String getControlCidr(String defaultValue, Map params) { + protected String getControlCidr(String defaultValue) { String controlCidr = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.CONTROL_CIDR); return controlCidr; }