From a82ad3b3bcd823b26c3ad2ae9d12812beb24f0c8 Mon Sep 17 00:00:00 2001
From: Nitin Mehta <nitin.mehta@citrix.com>
Date: Fri, 3 Aug 2012 16:15:22 +0530
Subject: [PATCH] bug CS-15200: Introducing state transition when volume is
 getting copied from secondary storage and it is put into Creating state
 Reviewed-by: Kishan

---
 api/src/com/cloud/storage/Volume.java                | 7 ++++---
 server/src/com/cloud/storage/StorageManagerImpl.java | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/api/src/com/cloud/storage/Volume.java b/api/src/com/cloud/storage/Volume.java
index e24bc3e7e56..bc702705aae 100755
--- a/api/src/com/cloud/storage/Volume.java
+++ b/api/src/com/cloud/storage/Volume.java
@@ -32,7 +32,7 @@ public interface Volume extends ControlledEntity, BasedOn, StateObject<Volume.St
         Snapshotting("There is a snapshot created on this volume, not backed up to secondary storage yet"),
         Expunging("The volume is being expunging"),
         Destroy("The volume is destroyed, and can't be recovered."),        
-        UploadOp ("The volume upload operation is in progress");            
+        UploadOp ("The volume upload operation is in progress or in short the volume is on secondary storage");            
 
         String _description;
 
@@ -57,9 +57,10 @@ public interface Volume extends ControlledEntity, BasedOn, StateObject<Volume.St
             s_fsm.addTransition(Creating, Event.OperationSucceeded, Ready);
             s_fsm.addTransition(Creating, Event.DestroyRequested, Destroy);
             s_fsm.addTransition(Creating, Event.CreateRequested, Creating);            
-            s_fsm.addTransition(Allocated, Event.UploadRequested, UploadOp);         
+            s_fsm.addTransition(Allocated, Event.UploadRequested, UploadOp);
+            s_fsm.addTransition(UploadOp, Event.CopyRequested, Creating);// CopyRequested for volume from sec to primary storage            
             s_fsm.addTransition(Creating, Event.CopySucceeded, Ready);
-            s_fsm.addTransition(UploadOp, Event.CopySucceeded, Ready);
+            s_fsm.addTransition(Creating, Event.CopyFailed, UploadOp);// Copying volume from sec to primary failed.  
             s_fsm.addTransition(UploadOp, Event.DestroyRequested, Destroy);
             s_fsm.addTransition(Ready, Event.DestroyRequested, Destroy);
             s_fsm.addTransition(Destroy, Event.ExpungingRequested, Expunging);
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 545817e8da6..fe4b05eb823 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -732,6 +732,7 @@ public class StorageManagerImpl implements StorageManager, Manager, ClusterManag
         StoragePoolVO destPool = findStoragePool(dskCh, dc, pod, clusterId, vm, avoidPools);
 
         // Copy the volume from secondary storage to the destination storage pool
+        stateTransitTo(volume, Event.CopyRequested); 
         VolumeHostVO volumeHostVO = _volumeHostDao.findByVolumeId(volume.getId());
         HostVO secStorage = _hostDao.findById(volumeHostVO.getHostId());
         String secondaryStorageURL = secStorage.getStorageUrl();