From cdcc9149958feaeeac6a6043a0e112c3475c6ae9 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Wed, 14 Oct 2020 15:45:22 +0530 Subject: [PATCH 1/3] scripts: creates /var/run/cloud folder for creation of lock file (#4373) Co-authored-by: Pearl Dsilva --- scripts/vm/network/vnet/modifyvxlan.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/vm/network/vnet/modifyvxlan.sh b/scripts/vm/network/vnet/modifyvxlan.sh index 3aa19ad424d..6af2f09613c 100755 --- a/scripts/vm/network/vnet/modifyvxlan.sh +++ b/scripts/vm/network/vnet/modifyvxlan.sh @@ -131,6 +131,9 @@ fi LOCKFILE=/var/run/cloud/vxlan.lock +# ensures that parent directories exists and prepares the lock file +mkdir -p "${LOCKFILE%/*}" + ( flock -x -w 10 200 || exit 1 if [[ "$OP" == "add" ]]; then From 55f07030cbf3e5f5c6d3be258ea6ba77ce0317e7 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 14 Oct 2020 12:21:15 +0200 Subject: [PATCH 2/3] plugins: Host is counted twice if it has multiple host tags in Prometheus exporter (#4383) * Hosts are counted twice if it has multiple host tags in Prometheus exporter * Import HostVO and inject HostDao --- .../cloudstack/metrics/PrometheusExporterImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java b/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java index 92c128b27fe..6ded6637ea0 100644 --- a/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java +++ b/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java @@ -32,7 +32,6 @@ import com.cloud.api.query.dao.DomainJoinDao; import com.cloud.api.query.dao.HostJoinDao; import com.cloud.api.query.dao.StoragePoolJoinDao; import com.cloud.api.query.vo.DomainJoinVO; -import com.cloud.api.query.vo.HostJoinVO; import com.cloud.api.query.vo.StoragePoolJoinVO; import com.cloud.capacity.Capacity; import com.cloud.capacity.CapacityManager; @@ -45,7 +44,9 @@ import com.cloud.dc.Vlan; import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.DataCenterIpAddressDao; import com.cloud.host.Host; +import com.cloud.host.HostVO; import com.cloud.host.Status; +import com.cloud.host.dao.HostDao; import com.cloud.network.dao.IPAddressDao; import com.cloud.storage.ImageStore; import com.cloud.storage.StorageStats; @@ -73,6 +74,8 @@ public class PrometheusExporterImpl extends ManagerBase implements PrometheusExp @Inject private DataCenterDao dcDao; @Inject + private HostDao hostDao; + @Inject private HostJoinDao hostJoinDao; @Inject private VMInstanceDao vmDao; @@ -101,8 +104,8 @@ public class PrometheusExporterImpl extends ManagerBase implements PrometheusExp int total = 0; int up = 0; int down = 0; - for (final HostJoinVO host : hostJoinDao.listAll()) { - if (host == null || host.getType() != Host.Type.Routing || host.getZoneId() != dcId) { + for (final HostVO host : hostDao.listAll()) { + if (host == null || host.getType() != Host.Type.Routing || host.getDataCenterId() != dcId) { continue; } total++; From 16bb05351a67db5fbf502c9dde64020dc23e6183 Mon Sep 17 00:00:00 2001 From: davidjumani Date: Wed, 14 Oct 2020 15:55:22 +0530 Subject: [PATCH 3/3] api: Making id a required field in scalekubernetesclustercmd (#4404) --- .../user/kubernetes/cluster/ScaleKubernetesClusterCmd.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/ScaleKubernetesClusterCmd.java b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/ScaleKubernetesClusterCmd.java index 994b3997022..574d8a70395 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/ScaleKubernetesClusterCmd.java +++ b/plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/ScaleKubernetesClusterCmd.java @@ -57,7 +57,7 @@ public class ScaleKubernetesClusterCmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.ID, type = CommandType.UUID, + @Parameter(name = ApiConstants.ID, type = CommandType.UUID, required = true, entityType = KubernetesClusterResponse.class, description = "the ID of the Kubernetes cluster") private Long id;