pos-merge fixes

Author: JoaoJandre

plugins/backup/nas/src/test/java/org/apache/cloudstack/backup/NASBackupProviderTest.java

@@ -569,7 +569,7 @@ public void restoreClearsActiveCheckpointDetail() throws AgentUnavailableExcepti
         Mockito.when(existing.getValue()).thenReturn("backup-1715000000");
         Mockito.when(vmInstanceDetailsDao.findDetail(vmId, NASBackupChainKeys.VM_ACTIVE_CHECKPOINT_ID)).thenReturn(existing);
 
-        boolean ok = nasBackupProvider.restoreVMFromBackup(vm, backup);
+        boolean ok = nasBackupProvider.restoreVMFromBackup(vm, backup, false, null);
         Assert.assertTrue(ok);
         Mockito.verify(vmInstanceDetailsDao).removeDetail(vmId, NASBackupChainKeys.VM_ACTIVE_CHECKPOINT_ID);
     }
@@ -636,7 +636,7 @@ public void restoreBackedUpVolumeClearsTargetVmActiveCheckpoint()
         Mockito.when(vmInstanceDetailsDao.findDetail(targetVmId, NASBackupChainKeys.VM_ACTIVE_CHECKPOINT_ID)).thenReturn(existing);
 
         Pair<Boolean, String> result = nasBackupProvider.restoreBackedUpVolume(
-                backup, backedUp, hostIp, dsUuid, new Pair<>(targetVmName, VirtualMachine.State.Stopped));
+                backup, backedUp, hostIp, dsUuid, new Pair<>(targetVmName, VirtualMachine.State.Stopped), null, false);
 
         Assert.assertTrue(result.first());
         Mockito.verify(vmInstanceDetailsDao).removeDetail(targetVmId, NASBackupChainKeys.VM_ACTIVE_CHECKPOINT_ID);

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

@@ -7192,10 +7192,6 @@ public Map<String, Long> createDiskOnlyVmSnapshotForRunningVm(List<Pair<VolumeOb
             }
             logger.error(errorMsg, e);
             throw new BackupException(errorMsg, isVmConsistent);
-        } catch (Exception e) {
-            String errorMsg = String.format("Creation of disk-only VM snapshot for VM [%s] failed due to %s.", vmName, e.getMessage());
-            logger.error(errorMsg, e);
-            throw new CloudRuntimeException(errorMsg, e);
         } finally {
             if (dm != null) {
                 try {

plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImg.java

@@ -949,7 +949,7 @@ public void commit(QemuImgFile file, QemuImgFile base, boolean skipEmptyingFiles
     /**
      * This was created to facilitate testing
      * */
-    protected Script createScript(String path, int timeout) {
+    protected Script createScript(String path, long timeout) {
         return new Script(path, timeout);
     }
 

plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/qemu/QemuImgTest.java

@@ -21,7 +21,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -589,7 +589,7 @@ public void commitTestNullFileThrows() throws Exception {
 
     @Test
     public void commitTestBasicCommand() throws Exception {
-        doReturn(scriptMock).when(qemuImgSpy).createScript(any(), anyInt());
+        doReturn(scriptMock).when(qemuImgSpy).createScript(any(), anyLong());
         doReturn(null).when(scriptMock).execute();
         doReturn(null).when(qemuImgFileMock1).getFormat();
         doReturn("file.qcow2").when(qemuImgFileMock1).getFileName();
@@ -602,7 +602,7 @@ public void commitTestBasicCommand() throws Exception {
 
     @Test
     public void commitTestWithFormat() throws Exception {
-        doReturn(scriptMock).when(qemuImgSpy).createScript(any(), anyInt());
+        doReturn(scriptMock).when(qemuImgSpy).createScript(any(), anyLong());
         doReturn(null).when(scriptMock).execute();
         doReturn(PhysicalDiskFormat.QCOW2).when(qemuImgFileMock1).getFormat();
         doReturn("file.qcow2").when(qemuImgFileMock1).getFileName();
@@ -615,7 +615,7 @@ public void commitTestWithFormat() throws Exception {
 
     @Test
     public void commitTestWithBase() throws Exception {
-        doReturn(scriptMock).when(qemuImgSpy).createScript(any(), anyInt());
+        doReturn(scriptMock).when(qemuImgSpy).createScript(any(), anyLong());
         doReturn(null).when(scriptMock).execute();
 
         doReturn(null).when(qemuImgFileMock1).getFormat();
@@ -631,7 +631,7 @@ public void commitTestWithBase() throws Exception {
 
     @Test
     public void commitTestSkipEmptyingFiles() throws Exception {
-        doReturn(scriptMock).when(qemuImgSpy).createScript(any(), anyInt());
+        doReturn(scriptMock).when(qemuImgSpy).createScript(any(), anyLong());
         doReturn(null).when(scriptMock).execute();
 
         doReturn(null).when(qemuImgFileMock1).getFormat();
@@ -644,7 +644,7 @@ public void commitTestSkipEmptyingFiles() throws Exception {
 
     @Test(expected = QemuImgException.class)
     public void commitTestExecutionFails() throws Exception {
-        doReturn(scriptMock).when(qemuImgSpy).createScript(any(), anyInt());
+        doReturn(scriptMock).when(qemuImgSpy).createScript(any(), anyLong());
         doReturn("error").when(scriptMock).execute();
 
         doReturn(null).when(qemuImgFileMock1).getFormat();