Set state Restoring on the volume on which upload image transfer is running.

State Transition

    Initial: Ready
    Create Image Transfer -> Restoring
    Finalize Image transfer -> Ready

Author: abh1sar

server/src/main/java/org/apache/cloudstack/backup/KVMBackupExportServiceImpl.java

@@ -33,6 +33,8 @@
 
 import javax.inject.Inject;
 
+import com.cloud.utils.fsm.NoTransitionException;
+import com.cloud.utils.fsm.StateMachine2;
 import org.apache.cloudstack.api.command.admin.backup.CreateImageTransferCmd;
 import org.apache.cloudstack.api.command.admin.backup.DeleteVmCheckpointCmd;
 import org.apache.cloudstack.api.command.admin.backup.FinalizeBackupCmd;
@@ -639,6 +641,14 @@ private ImageTransferVO createUploadImageTransfer(VolumeVO volume, ImageTransfer
         imageTransfer.setTransferUrl(transferAnswer.getTransferUrl());
         imageTransfer.setSignedTicketId(transferAnswer.getImageTransferId());
         imageTransfer = imageTransferDao.persist(imageTransfer);
+
+        try {
+            final StateMachine2<Volume.State, Volume.Event, Volume> stateMachine = Volume.State.getStateMachine();
+            stateMachine.transitTo(volume, Volume.Event.RestoreRequested, null, volumeDao);
+        } catch (NoTransitionException e) {
+            throw new CloudRuntimeException("Failed to transition volume  " + volume.getUuid(), e);
+        }
+
         return imageTransfer;
 
     }
@@ -742,24 +752,41 @@ private boolean stopNBDServer(ImageTransferVO imageTransfer) {
         return answer.getResult();
     }
 
-    private void finalizeUploadImageTransfer(ImageTransferVO imageTransfer) {
+    private String finalizeUploadImageTransferWithResult(ImageTransferVO imageTransfer) {
         String transferId = imageTransfer.getUuid();
-
         boolean stopNbdServerResult = stopNBDServer(imageTransfer);
         if (!stopNbdServerResult) {
-            throw new CloudRuntimeException("Failed to stop the nbd server");
+            return "Failed to stop the nbd server";
         }
 
         FinalizeImageTransferCommand finalizeCmd = new FinalizeImageTransferCommand(transferId);
         Answer answer;
         try {
             answer = agentManager.send(imageTransfer.getHostId(), finalizeCmd);
         } catch (AgentUnavailableException | OperationTimedoutException e) {
-            throw new CloudRuntimeException("Failed to communicate with agent", e);
+            return "Failed to communicate with agent";
         }
 
         if (!answer.getResult()) {
-            throw new CloudRuntimeException("Failed to finalize image transfer: " + answer.getDetails());
+            return "Failed to finalize image transfer: " + answer.getDetails();
+        }
+        return null;
+    }
+
+    private void finalizeUploadImageTransfer(ImageTransferVO imageTransfer) {
+        String failureReason = finalizeUploadImageTransferWithResult(imageTransfer);
+        Volume.Event event = failureReason == null ? Volume.Event.RestoreSucceeded : Volume.Event.RestoreFailed;
+
+        VolumeVO volume = volumeDao.findById(imageTransfer.getVolumeId());
+        try {
+            final StateMachine2<Volume.State, Volume.Event, Volume> stateMachine = Volume.State.getStateMachine();
+            stateMachine.transitTo(volume, event, null, volumeDao);
+        } catch (NoTransitionException e) {
+            throw new CloudRuntimeException("Failed to transition state during upload finalize image transfer for volume " + volume.getUuid(), e);
+        }
+
+        if (failureReason != null) {
+            throw new CloudRuntimeException(failureReason);
         }
     }
 

server/src/test/java/org/apache/cloudstack/backup/KVMBackupExportServiceImplTest.java

@@ -21,6 +21,7 @@
 import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.never;
@@ -363,6 +364,7 @@ public void createImageTransfer_uploadFileBackend_success() throws Exception {
 
             when(volumeDao.findById(601L)).thenReturn(volume);
             when(volume.getId()).thenReturn(601L);
+            when(volume.getState()).thenReturn(Volume.State.Ready);
             when(volume.getDataCenterId()).thenReturn(1L);
             when(volume.getPoolId()).thenReturn(701L);
             when(volume.getPath()).thenReturn("vol-601.qcow2");
@@ -398,6 +400,7 @@ public void createImageTransfer_uploadFileBackend_success() throws Exception {
             assertNotNull(created);
             assertEquals(901L, created.getId());
             assertEquals(ImageTransfer.Direction.upload, created.getDirection());
+            verify(volumeDao).updateState(eq(Volume.State.Ready), eq(Volume.Event.RestoreRequested), eq(Volume.State.Restoring), eq(volume), isNull());
             verify(agentManager, times(1)).send(eq(801L), any(Command.class));
         }
     }