Merge branch 'main' into veeam-check-failure-when-restoring

Author: SadiJr

.asf.yaml

@@ -53,7 +53,6 @@ github:
     - acs-robot
     - kiranchavala
     - rajujith
-    - alexandremattioli
     - vishesh92
     - GaOrtiga
     - SadiJr

.github/workflows/build.yml

@@ -41,7 +41,7 @@ jobs:
           cache: maven
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.8'
           architecture: 'x64'

.github/workflows/ci.yml

@@ -211,7 +211,7 @@ jobs:
           cache: maven
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.8'
           architecture: 'x64'

agent/conf/agent.properties

@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -378,6 +378,10 @@ iscsi.session.cleanup.enabled=false
 # If the time is exceeded shutdown will be forced.
 #stop.script.timeout=120
 
+# Time (in seconds) to wait for scripts to complete.
+# This is currently used only while checking if the host supports UEFI.
+#agent.script.timeout=60
+
 # Definition of VMs video model type.
 #vm.video.hardware=
 

agent/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.cloudstack</groupId>
         <artifactId>cloudstack</artifactId>
-        <version>4.19.0.0-SNAPSHOT</version>
+        <version>4.20.0.0-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>

agent/src/main/java/com/cloud/agent/properties/AgentProperties.java

@@ -659,6 +659,14 @@ public class AgentProperties{
      */
     public static final Property<Integer> STOP_SCRIPT_TIMEOUT = new Property<>("stop.script.timeout", 120);
 
+    /**
+     * Time (in seconds) to wait for scripts to complete.<br>
+     * This is currently used only while checking if the host supports UEFI.<br>
+     * Data type: Integer.<br>
+     * Default value: <code>60</code>
+     */
+    public static final Property<Integer> AGENT_SCRIPT_TIMEOUT = new Property<>("agent.script.timeout", 60);
+
     /**
      * Definition of VMs video model type.<br>
      * Data type: String.<br>

agent/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.cloudstack</groupId>
         <artifactId>cloudstack</artifactId>
-        <version>4.19.0.0-SNAPSHOT</version>
+        <version>4.20.0.0-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>

api/pom.xml

@@ -400,6 +400,7 @@ public class EventTypes {
     public static final String EVENT_IMAGE_STORE_DATA_MIGRATE = "IMAGE.STORE.MIGRATE.DATA";
     public static final String EVENT_IMAGE_STORE_RESOURCES_MIGRATE = "IMAGE.STORE.MIGRATE.RESOURCES";
     public static final String EVENT_IMAGE_STORE_OBJECT_DOWNLOAD = "IMAGE.STORE.OBJECT.DOWNLOAD";
+    public static final String EVENT_UPDATE_IMAGE_STORE_ACCESS_STATE = "IMAGE.STORE.ACCESS.UPDATED";
 
     // Configuration Table
     public static final String EVENT_CONFIGURATION_VALUE_EDIT = "CONFIGURATION.VALUE.EDIT";
@@ -1164,6 +1165,7 @@ public class EventTypes {
 
         entityEventDetails.put(EVENT_IMAGE_STORE_DATA_MIGRATE, ImageStore.class);
         entityEventDetails.put(EVENT_IMAGE_STORE_OBJECT_DOWNLOAD, ImageStore.class);
+        entityEventDetails.put(EVENT_UPDATE_IMAGE_STORE_ACCESS_STATE, ImageStore.class);
         entityEventDetails.put(EVENT_LIVE_PATCH_SYSTEMVM, "SystemVMs");
 
         //Object Store

api/src/main/java/com/cloud/event/EventTypes.java

@@ -16,10 +16,14 @@
 // under the License.
 package com.cloud.storage;
 
-import org.apache.commons.lang.NotImplementedException;
-
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.StringUtils;
 
 public class Storage {
     public static enum ImageFormat {
@@ -135,37 +139,72 @@ public static enum TemplateType {
         ISODISK /* Template corresponding to a iso (non root disk) present in an OVA */
     }
 
-    public static enum StoragePoolType {
-        Filesystem(false, true, true), // local directory
-        NetworkFilesystem(true, true, true), // NFS
-        IscsiLUN(true, false, false), // shared LUN, with a clusterfs overlay
-        Iscsi(true, false, false), // for e.g., ZFS Comstar
-        ISO(false, false, false), // for iso image
-        LVM(false, false, false), // XenServer local LVM SR
-        CLVM(true, false, false),
-        RBD(true, true, false), // http://libvirt.org/storage.html#StorageBackendRBD
-        SharedMountPoint(true, false, true),
-        VMFS(true, true, false), // VMware VMFS storage
-        PreSetup(true, true, false), // for XenServer, Storage Pool is set up by customers.
-        EXT(false, true, false), // XenServer local EXT SR
-        OCFS2(true, false, false),
-        SMB(true, false, false),
-        Gluster(true, false, false),
-        PowerFlex(true, true, true), // Dell EMC PowerFlex/ScaleIO (formerly VxFlexOS)
-        ManagedNFS(true, false, false),
-        Linstor(true, true, false),
-        DatastoreCluster(true, true, false), // for VMware, to abstract pool of clusters
-        StorPool(true, true, true),
-        FiberChannel(true, true, false); // Fiber Channel Pool for KVM hypervisors is used to find the volume by WWN value (/dev/disk/by-id/wwn-<wwnvalue>)
-
+    /**
+     * StoragePoolTypes carry some details about the format and capabilities of a storage pool. While not necessarily a
+     * 1:1 with PrimaryDataStoreDriver (and for KVM agent, KVMStoragePool and StorageAdaptor) implementations, it is
+     * often used to decide which storage plugin or storage command to call, so it may be necessary for new storage
+     * plugins to add a StoragePoolType.  This can be done by adding it below, or by creating a new public static final
+     * instance of StoragePoolType in the plugin itself, which registers it with the map.
+     *
+     * Note that if the StoragePoolType is for KVM and defined in plugin code rather than below, care must be taken to
+     * ensure this is available on the agent side as well. This is best done by defining the StoragePoolType in a common
+     * package available on both management server and agent plugin jars.
+     */
+    public static class StoragePoolType {
+        private static final Map<String, StoragePoolType> map = new LinkedHashMap<>();
+
+        public static final StoragePoolType Filesystem = new StoragePoolType("Filesystem", false, true, true);
+        public static final StoragePoolType NetworkFilesystem = new StoragePoolType("NetworkFilesystem", true, true, true);
+        public static final StoragePoolType IscsiLUN = new StoragePoolType("IscsiLUN", true, false, false);
+        public static final StoragePoolType Iscsi = new StoragePoolType("Iscsi", true, false, false);
+        public static final StoragePoolType ISO = new StoragePoolType("ISO", false, false, false);
+        public static final StoragePoolType LVM = new StoragePoolType("LVM", false, false, false);
+        public static final StoragePoolType CLVM = new StoragePoolType("CLVM", true, false, false);
+        public static final StoragePoolType RBD = new StoragePoolType("RBD", true, true, false);
+        public static final StoragePoolType SharedMountPoint = new StoragePoolType("SharedMountPoint", true, false, true);
+        public static final StoragePoolType VMFS = new StoragePoolType("VMFS", true, true, false);
+        public static final StoragePoolType PreSetup = new StoragePoolType("PreSetup", true, true, false);
+        public static final StoragePoolType EXT = new StoragePoolType("EXT", false, true, false);
+        public static final StoragePoolType OCFS2 = new StoragePoolType("OCFS2", true, false, false);
+        public static final StoragePoolType SMB = new StoragePoolType("SMB", true, false, false);
+        public static final StoragePoolType Gluster = new StoragePoolType("Gluster", true, false, false);
+        public static final StoragePoolType PowerFlex = new StoragePoolType("PowerFlex", true, true, true);
+        public static final StoragePoolType ManagedNFS = new StoragePoolType("ManagedNFS", true, false, false);
+        public static final StoragePoolType Linstor = new StoragePoolType("Linstor", true, true, false);
+        public static final StoragePoolType DatastoreCluster = new StoragePoolType("DatastoreCluster", true, true, false);
+        public static final StoragePoolType StorPool = new StoragePoolType("StorPool", true,true,true);
+        public static final StoragePoolType FiberChannel = new StoragePoolType("FiberChannel", true,true,false);
+
+
+        private final String name;
         private final boolean shared;
         private final boolean overprovisioning;
         private final boolean encryption;
 
-        StoragePoolType(boolean shared, boolean overprovisioning, boolean encryption) {
+        /**
+         * New StoragePoolType, set the name to check with it in Dao (Note: Do not register it into the map of pool types).
+         * @param name name of the StoragePoolType.
+         */
+        public StoragePoolType(String name) {
+            this.name = name;
+            this.shared = false;
+            this.overprovisioning = false;
+            this.encryption = false;
+        }
+
+        /**
+         * Define a new StoragePoolType, and register it into the map of pool types known to the management server.
+         * @param name Simple unique name of the StoragePoolType.
+         * @param shared Storage pool is shared/accessible to multiple hypervisors
+         * @param overprovisioning Storage pool supports overprovisioning
+         * @param encryption Storage pool supports encrypted volumes
+         */
+        public StoragePoolType(String name, boolean shared, boolean overprovisioning, boolean encryption) {
+            this.name = name;
             this.shared = shared;
             this.overprovisioning = overprovisioning;
             this.encryption = encryption;
+            addStoragePoolType(this);
         }
 
         public boolean isShared() {
@@ -177,6 +216,48 @@ public boolean supportsOverProvisioning() {
         }
 
         public boolean supportsEncryption() { return encryption; }
+
+        private static void addStoragePoolType(StoragePoolType storagePoolType) {
+            map.putIfAbsent(storagePoolType.name, storagePoolType);
+        }
+
+        public static StoragePoolType[] values() {
+            return map.values().toArray(StoragePoolType[]::new).clone();
+        }
+
+        public static StoragePoolType valueOf(String name) {
+            if (StringUtils.isBlank(name)) {
+                return null;
+            }
+
+            StoragePoolType storage = map.get(name);
+            if (storage == null) {
+                throw new IllegalArgumentException("StoragePoolType '" + name + "' not found");
+            }
+            return storage;
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
+
+        public String name() {
+            return name;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            StoragePoolType that = (StoragePoolType) o;
+            return Objects.equals(name, that.name);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(name);
+        }
     }
 
     public static List<StoragePoolType> getNonSharedStoragePoolTypes() {