Merge branch '4.19'

vishesh92 · dhslove · commit 92cd7793c9fd · 2024-07-02T12:36:21.000+09:00
diff --git a/debian/control b/debian/control
@@ -24,7 +24,7 @@ Description: CloudStack server library
 
 Package: cloudstack-agent
 Architecture: all
-Depends: ${python:Depends}, ${python3:Depends}, openjdk-11-jre-headless | java11-runtime-headless | java11-runtime | openjdk-11-jre-headless | zulu-11, cloudstack-common (= ${source:Version}), lsb-base (>= 9), openssh-client, qemu-kvm (>= 2.5) | qemu-system-x86 (>= 5.2), libvirt-bin (>= 1.3) | libvirt-daemon-system (>= 3.0), iproute2, ebtables, vlan, ipset, python3-libvirt, ethtool, iptables, cryptsetup, rng-tools, lsb-release, ufw, apparmor, cpu-checker
+Depends: ${python:Depends}, ${python3:Depends}, openjdk-17-jre-headless | java17-runtime-headless | java17-runtime | zulu-17, cloudstack-common (= ${source:Version}), lsb-base (>= 9), openssh-client, qemu-kvm (>= 2.5) | qemu-system-x86 (>= 5.2), libvirt-bin (>= 1.3) | libvirt-daemon-system (>= 3.0), iproute2, ebtables, vlan, ipset, python3-libvirt, ethtool, iptables, cryptsetup, rng-tools, lsb-release, ufw, apparmor, cpu-checker
 Recommends: init-system-helpers
 Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts
 Description: CloudStack agent
diff --git a/engine/orchestration/src/test/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestratorTest.java b/engine/orchestration/src/test/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestratorTest.java
@@ -138,8 +138,8 @@ public void setUp() {
         when(provider.getCapabilities()).thenReturn(services);
         capabilities.put(Network.Capability.DhcpAccrossMultipleSubnets, "true");
 
-        when(testOrchastrator._ntwkSrvcDao.getProviderForServiceInNetwork(ArgumentMatchers.anyLong(), ArgumentMatchers.eq(Service.Dhcp))).thenReturn(dhcpProvider);
-        when(testOrchastrator._networkModel.getElementImplementingProvider(dhcpProvider)).thenReturn(provider);
+        when(testOrchestrator._ntwkSrvcDao.getProviderForServiceInNetwork(ArgumentMatchers.anyLong(), ArgumentMatchers.eq(Service.Dhcp))).thenReturn(dhcpProvider);
+        when(testOrchestrator._networkModel.getElementImplementingProvider(dhcpProvider)).thenReturn(provider);
 
         when(guru.getName()).thenReturn(guruName);
         List<NetworkGuru> networkGurus = new ArrayList<NetworkGuru>();
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/VmStatsDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/VmStatsDaoImpl.java
@@ -21,7 +21,8 @@
 
 import javax.annotation.PostConstruct;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Component;
 
 import com.cloud.utils.db.Filter;
@@ -34,7 +35,7 @@
 @Component
 public class VmStatsDaoImpl extends GenericDaoBase<VmStatsVO, Long> implements VmStatsDao {
 
-    protected Logger logger = Logger.getLogger(getClass());
+    protected Logger logger = LogManager.getLogger(getClass());
 
     protected SearchBuilder<VmStatsVO> vmIdSearch;
     protected SearchBuilder<VmStatsVO> vmIdTimestampGreaterThanEqualSearch;
diff --git a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
@@ -875,7 +875,7 @@ private void handleVolumeMigrationForKVM(VolumeInfo srcVolumeInfo, VolumeInfo de
                 try {
                     _volumeService.revokeAccess(destVolumeInfo, hostVO, destVolumeInfo.getDataStore());
                 } catch (Exception e) {
-                    LOGGER.warn(String.format("Failed to revoke access for volume 'name=%s,uuid=%s' after a migration attempt", destVolumeInfo.getVolume(), destVolumeInfo.getUuid()), e);
+                    logger.warn(String.format("Failed to revoke access for volume 'name=%s,uuid=%s' after a migration attempt", destVolumeInfo.getVolume(), destVolumeInfo.getUuid()), e);
                 }
             }
 
@@ -961,7 +961,7 @@ private VolumeInfo createTemporaryVolumeCopyOfSnapshotAdaptive(SnapshotInfo snap
                     _volumeDao.remove(tempVolumeVO.getId());
                 }
             } catch (Throwable e2) {
-                LOGGER.warn("Failed to delete temporary volume created for copy", e2);
+                logger.warn("Failed to delete temporary volume created for copy", e2);
             }
 
             throw e;
@@ -1009,7 +1009,7 @@ private void handleCopyAsyncToSecondaryStorageAdaptive(SnapshotInfo snapshotInfo
             copyCmdAnswer = (CopyCmdAnswer)agentManager.send(hostVO.getId(), copyCommand);
         } catch (Exception ex) {
             String msg = "Failed to create template from snapshot (Snapshot ID = " + snapshotInfo.getId() + ") : ";
-            LOGGER.warn(msg, ex);
+            logger.warn(msg, ex);
             throw new CloudRuntimeException(msg + ex.getMessage(), ex);
         }
         finally {
@@ -1023,7 +1023,7 @@ private void handleCopyAsyncToSecondaryStorageAdaptive(SnapshotInfo snapshotInfo
                 try {
                     srcFinal.getDataStore().getDriver().deleteAsync(srcFinal.getDataStore(), srcFinal, null);
                 } catch (Throwable e) {
-                    LOGGER.warn("Failed to delete temporary volume created for copy", e);
+                    logger.warn("Failed to delete temporary volume created for copy", e);
                 }
             }
 
@@ -1893,7 +1893,7 @@ private void createVolumeFromSnapshot(SnapshotInfo snapshotInfo) {
      */
     private void deleteVolumeFromSnapshot(SnapshotInfo snapshotInfo) {
         try {
-            LOGGER.debug("Cleaning up temporary volume created for copy from a snapshot");
+            logger.debug("Cleaning up temporary volume created for copy from a snapshot");
 
             SnapshotDetailsVO snapshotDetails = handleSnapshotDetails(snapshotInfo.getId(), "delete");
 
@@ -1905,7 +1905,7 @@ private void deleteVolumeFromSnapshot(SnapshotInfo snapshotInfo) {
             }
 
         } catch (Throwable e) {
-            LOGGER.warn("Failed to clean up temporary volume created for copy from a snapshot, transction will not be failed but an adminstrator should clean this up: " + snapshotInfo.getUuid() + " - " + snapshotInfo.getPath(), e);
+            logger.warn("Failed to clean up temporary volume created for copy from a snapshot, transction will not be failed but an adminstrator should clean this up: " + snapshotInfo.getUuid() + " - " + snapshotInfo.getPath(), e);
         }
     }
 
diff --git a/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategyTest.java b/engine/storage/datamotion/src/test/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategyTest.java
@@ -46,7 +46,7 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.Spy;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import com.cloud.agent.api.MigrateCommand;
 import com.cloud.host.HostVO;
diff --git a/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java b/framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java
@@ -103,7 +103,7 @@ public void with(ModuleDefinition def, Stack<ModuleDefinition> parents) {
                     ApplicationContext context = getApplicationContext(moduleDefinitionName);
                     try {
                         if (context == null) {
-                            log.warn(String.format("Application context not found for module definition [%s]", moduleDefinitionName));
+                            logger.warn(String.format("Application context not found for module definition [%s]", moduleDefinitionName));
                         } else if (context.containsBean("moduleStartup")) {
                             Runnable runnable = context.getBean("moduleStartup", Runnable.class);
                             logger.info(String.format("Starting module [%s].", moduleDefinitionName));
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetRemoteVmsCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetRemoteVmsCommandWrapper.java
@@ -53,7 +53,7 @@ public Answer execute(final GetRemoteVmsCommand command, final LibvirtComputingR
         try {
             Connect conn = LibvirtConnection.getConnection(hypervisorURI);
             final List<String> allVmNames = libvirtComputingResource.getAllVmNames(conn);
-            s_logger.info(String.format("Found %d VMs on the remote host %s", allVmNames.size(), remoteIp));
+            logger.info(String.format("Found %d VMs on the remote host %s", allVmNames.size(), remoteIp));
             for (String name : allVmNames) {
                 final Domain domain = libvirtComputingResource.getDomain(conn, name);
                 final DomainInfo.DomainState ps = domain.getInfo().state;
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -284,7 +284,7 @@ private void checkNetfsStoragePoolMounted(String uuid) {
         int mountpointResult = Script.runSimpleBashScriptForExitValue("mountpoint -q " + targetPath);
         if (mountpointResult != 0) {
             String errMsg = String.format("libvirt failed to mount storage pool %s at %s", uuid, targetPath);
-            s_logger.error(errMsg);
+            logger.error(errMsg);
             throw new CloudRuntimeException(errMsg);
         }
     }
@@ -828,11 +828,11 @@ public boolean deleteStoragePool(String uuid) {
             // handle ebusy error when pool is quickly destroyed
             if (e.toString().contains("exit status 16")) {
                 String targetPath = _mountPoint + File.separator + uuid;
-                logger.error("deleteStoragePool removed pool from libvirt, but libvirt had trouble unmounting the pool. Trying umount location " + targetPath +
-                        "again in a few seconds");
+                    logger.error("deleteStoragePool removed pool from libvirt, but libvirt had trouble unmounting the pool. Trying umount location " + targetPath +
+                        " again in a few seconds");
                 String result = Script.runSimpleBashScript("sleep 5 && umount " + targetPath);
                 if (result == null) {
-                    logger.error("Succeeded in unmounting " + targetPath);
+                    logger.info("Succeeded in unmounting " + targetPath);
                     return true;
                 }
                 logger.error("Failed to unmount " + targetPath);
diff --git a/plugins/storage/volume/adaptive/src/main/java/org/apache/cloudstack/storage/datastore/driver/AdaptiveDataStoreDriverImpl.java b/plugins/storage/volume/adaptive/src/main/java/org/apache/cloudstack/storage/datastore/driver/AdaptiveDataStoreDriverImpl.java
@@ -484,7 +484,7 @@ public void resize(DataObject data, AsyncCompletionCallback<CreateCmdResult> cal
     }
 
     public boolean grantAccess(DataObject dataObject, Host host, DataStore dataStore) {
-        s_logger.debug("Granting host " + host.getName() + " access to volume " + dataObject.getUuid());
+        logger.debug("Granting host " + host.getName() + " access to volume " + dataObject.getUuid());
 
         try {
             StoragePoolVO storagePool = _storagePoolDao.findById(dataObject.getDataStore().getId());
@@ -502,11 +502,11 @@ public boolean grantAccess(DataObject dataObject, Host host, DataStore dataStore
             persistVolumeOrTemplateData(storagePool, details, dataObject, vol, connIdMap);
 
 
-            s_logger.info("Granted host " + host.getName() + " access to volume " + dataObject.getUuid());
+            logger.info("Granted host " + host.getName() + " access to volume " + dataObject.getUuid());
             return true;
         } catch (Throwable e) {
             String msg = "Error granting host " + host.getName() + " access to volume " + dataObject.getUuid() + ":" + e.getMessage();
-            s_logger.error(msg);
+            logger.error(msg);
             throw new CloudRuntimeException(msg, e);
         }
     }
@@ -517,7 +517,7 @@ public void revokeAccess(DataObject dataObject, Host host, DataStore dataStore)
             return;
         }
 
-        s_logger.debug("Revoking access for host " + host.getName() + " to volume " + dataObject.getUuid());
+        logger.debug("Revoking access for host " + host.getName() + " to volume " + dataObject.getUuid());
 
         try {
             StoragePoolVO storagePool = _storagePoolDao.findById(dataObject.getDataStore().getId());
@@ -535,10 +535,10 @@ public void revokeAccess(DataObject dataObject, Host host, DataStore dataStore)
             Map<String,String> connIdMap = api.getConnectionIdMap(dataIn);
             persistVolumeOrTemplateData(storagePool, details, dataObject, vol, connIdMap);
 
-            s_logger.info("Revoked access for host " + host.getName() + " to volume " + dataObject.getUuid());
+            logger.info("Revoked access for host " + host.getName() + " to volume " + dataObject.getUuid());
         } catch (Throwable e) {
             String msg = "Error revoking access for host " + host.getName() + " to volume " + dataObject.getUuid() + ":" + e.getMessage();
-            s_logger.error(msg);
+            logger.error(msg);
             throw new CloudRuntimeException(msg, e);
         }
     }
diff --git a/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java b/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
@@ -493,7 +493,7 @@ protected boolean isHostOsCompatibleWithOtherHost(String hostOsInCluster, String
             return true;
         }
         if (COMPATIBLE_HOST_OSES.contains(hostOsInCluster) && COMPATIBLE_HOST_OSES.contains(hostOs)) {
-            s_logger.info(String.format("The host OS (%s) is compatible with the existing host OS (%s) in the cluster.", hostOs, hostOsInCluster));
+            logger.info(String.format("The host OS (%s) is compatible with the existing host OS (%s) in the cluster.", hostOs, hostOsInCluster));
             return true;
         }
         return false;
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -5288,7 +5288,7 @@ public HypervisorCapabilities updateHypervisorCapabilities(UpdateHypervisorCapab
             return hpvCapabilities;
         }
         if (StringUtils.isNotBlank(hypervisorVersion) && !hpvCapabilities.getHypervisorVersion().equals(hypervisorVersion)) {
-            s_logger.debug(String.format("Hypervisor capabilities for hypervisor: %s and version: %s does not exist, creating a copy from the parent version: %s for update.", hypervisorStr, hypervisorVersion, hpvCapabilities.getHypervisorVersion()));
+            logger.debug(String.format("Hypervisor capabilities for hypervisor: %s and version: %s does not exist, creating a copy from the parent version: %s for update.", hypervisorStr, hypervisorVersion, hpvCapabilities.getHypervisorVersion()));
             HypervisorCapabilitiesVO copy = new HypervisorCapabilitiesVO(hpvCapabilities);
             copy.setHypervisorVersion(hypervisorVersion);
             hpvCapabilities = _hypervisorCapabilitiesDao.persist(copy);
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -7741,8 +7741,8 @@ public UserVm moveVMToUser(final AssignVMCmd cmd) throws ResourceAllocationExcep
         checkVolumesLimits(newAccount, volumes);
 
         // VV 4: Check if new owner can use the vm template
-        if (template == null && volumes == null) {
-            throw new InvalidParameterValueException(String.format("Template, Volume for VM: %s cannot be found", vm.getUuid()));
+        if (template == null) {
+            throw new InvalidParameterValueException(String.format("Template for VM: %s cannot be found", vm.getUuid()));
         }
         _accountMgr.checkAccess(newAccount, AccessType.UseEntry, true, template);
 
diff --git a/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java b/server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
@@ -802,7 +802,7 @@ private Pair<DiskProfile, StoragePool> importExternalDisk(UnmanagedInstanceTO.Di
         }
         int copyTimeoutInSecs = copyTimeout * 60;
         copyRemoteVolumeCommand.setWait(copyTimeoutInSecs);
-        LOGGER.error(String.format("Initiating copy remote volume %s from %s, timeout %d secs", path, remoteUrl, copyTimeoutInSecs));
+        logger.error(String.format("Initiating copy remote volume %s from %s, timeout %d secs", path, remoteUrl, copyTimeoutInSecs));
         Answer answer = agentManager.easySend(dest.getHost().getId(), copyRemoteVolumeCommand);
         if (!(answer instanceof CopyRemoteVolumeAnswer)) {
             throw new CloudRuntimeException("Error while copying volume of remote instance: " + answer.getDetails());

Original file line number	Diff line number	Diff line change
`@@ -875,7 +875,7 @@ private void handleVolumeMigrationForKVM(VolumeInfo srcVolumeInfo, VolumeInfo de`
`875`	`875`	`try {`
`876`	`876`	`_volumeService.revokeAccess(destVolumeInfo, hostVO, destVolumeInfo.getDataStore());`
`877`	`877`	`} catch (Exception e) {`
`878`		`- LOGGER.warn(String.format("Failed to revoke access for volume 'name=%s,uuid=%s' after a migration attempt", destVolumeInfo.getVolume(), destVolumeInfo.getUuid()), e);`
	`878`	`+ logger.warn(String.format("Failed to revoke access for volume 'name=%s,uuid=%s' after a migration attempt", destVolumeInfo.getVolume(), destVolumeInfo.getUuid()), e);`
`879`	`879`	`}`
`880`	`880`	`}`
`881`	`881`
`@@ -961,7 +961,7 @@ private VolumeInfo createTemporaryVolumeCopyOfSnapshotAdaptive(SnapshotInfo snap`
`961`	`961`	`_volumeDao.remove(tempVolumeVO.getId());`
`962`	`962`	`}`
`963`	`963`	`} catch (Throwable e2) {`
`964`		`- LOGGER.warn("Failed to delete temporary volume created for copy", e2);`
	`964`	`+ logger.warn("Failed to delete temporary volume created for copy", e2);`
`965`	`965`	`}`
`966`	`966`
`967`	`967`	`throw e;`
`@@ -1009,7 +1009,7 @@ private void handleCopyAsyncToSecondaryStorageAdaptive(SnapshotInfo snapshotInfo`
`1009`	`1009`	`copyCmdAnswer = (CopyCmdAnswer)agentManager.send(hostVO.getId(), copyCommand);`
`1010`	`1010`	`} catch (Exception ex) {`
`1011`	`1011`	`String msg = "Failed to create template from snapshot (Snapshot ID = " + snapshotInfo.getId() + ") : ";`
`1012`		`- LOGGER.warn(msg, ex);`
	`1012`	`+ logger.warn(msg, ex);`
`1013`	`1013`	`throw new CloudRuntimeException(msg + ex.getMessage(), ex);`
`1014`	`1014`	`}`
`1015`	`1015`	`finally {`
`@@ -1023,7 +1023,7 @@ private void handleCopyAsyncToSecondaryStorageAdaptive(SnapshotInfo snapshotInfo`
`1023`	`1023`	`try {`
`1024`	`1024`	`srcFinal.getDataStore().getDriver().deleteAsync(srcFinal.getDataStore(), srcFinal, null);`
`1025`	`1025`	`} catch (Throwable e) {`
`1026`		`- LOGGER.warn("Failed to delete temporary volume created for copy", e);`
	`1026`	`+ logger.warn("Failed to delete temporary volume created for copy", e);`
`1027`	`1027`	`}`
`1028`	`1028`	`}`
`1029`	`1029`
`@@ -1893,7 +1893,7 @@ private void createVolumeFromSnapshot(SnapshotInfo snapshotInfo) {`
`1893`	`1893`	`*/`
`1894`	`1894`	`private void deleteVolumeFromSnapshot(SnapshotInfo snapshotInfo) {`
`1895`	`1895`	`try {`
`1896`		`- LOGGER.debug("Cleaning up temporary volume created for copy from a snapshot");`
	`1896`	`+ logger.debug("Cleaning up temporary volume created for copy from a snapshot");`
`1897`	`1897`
`1898`	`1898`	`SnapshotDetailsVO snapshotDetails = handleSnapshotDetails(snapshotInfo.getId(), "delete");`
`1899`	`1899`
`@@ -1905,7 +1905,7 @@ private void deleteVolumeFromSnapshot(SnapshotInfo snapshotInfo) {`
`1905`	`1905`	`}`
`1906`	`1906`
`1907`	`1907`	`} catch (Throwable e) {`
`1908`		`- LOGGER.warn("Failed to clean up temporary volume created for copy from a snapshot, transction will not be failed but an adminstrator should clean this up: " + snapshotInfo.getUuid() + " - " + snapshotInfo.getPath(), e);`
	`1908`	`+ logger.warn("Failed to clean up temporary volume created for copy from a snapshot, transction will not be failed but an adminstrator should clean this up: " + snapshotInfo.getUuid() + " - " + snapshotInfo.getPath(), e);`
`1909`	`1909`	`}`
`1910`	`1910`	`}`
`1911`	`1911`
Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ protected boolean isHostOsCompatibleWithOtherHost(String hostOsInCluster, String`
`493`	`493`	`return true;`
`494`	`494`	`}`
`495`	`495`	`if (COMPATIBLE_HOST_OSES.contains(hostOsInCluster) && COMPATIBLE_HOST_OSES.contains(hostOs)) {`
`496`		`- s_logger.info(String.format("The host OS (%s) is compatible with the existing host OS (%s) in the cluster.", hostOs, hostOsInCluster));`
	`496`	`+ logger.info(String.format("The host OS (%s) is compatible with the existing host OS (%s) in the cluster.", hostOs, hostOsInCluster));`
`497`	`497`	`return true;`
`498`	`498`	`}`
`499`	`499`	`return false;`