From 121ff19cbaa05a7b6f690c6bb38a9cdc5d445bfe Mon Sep 17 00:00:00 2001
From: Koushik Das <koushik@apache.org>
Date: Fri, 30 Jan 2015 17:36:13 +0530
Subject: [PATCH] volume-upload: Attaching uploaded volume to an instance
 failing while copying from secondary to primary storage The volume/template
 size and install path was not getting updated properly. The upload status
 response should return these properties on completion of upload.

---
 .../storage/command/UploadStatusAnswer.java   | 26 +++++++++++++++++++
 .../storage/ImageStoreUploadMonitorImpl.java  |  8 ++++++
 2 files changed, 34 insertions(+)

diff --git a/core/src/org/apache/cloudstack/storage/command/UploadStatusAnswer.java b/core/src/org/apache/cloudstack/storage/command/UploadStatusAnswer.java
index 00be9411c42..a5ef53bc991 100644
--- a/core/src/org/apache/cloudstack/storage/command/UploadStatusAnswer.java
+++ b/core/src/org/apache/cloudstack/storage/command/UploadStatusAnswer.java
@@ -27,6 +27,9 @@ public class UploadStatusAnswer extends Answer {
     }
 
     private UploadStatus status;
+    private long virtualSize = 0;
+    private long physicalSize = 0;
+    private String installPath = null;
 
     protected UploadStatusAnswer() {
     }
@@ -50,4 +53,27 @@ public class UploadStatusAnswer extends Answer {
         return status;
     }
 
+    public long getVirtualSize() {
+        return virtualSize;
+    }
+
+    public void setVirtualSize(long virtualSize) {
+        this.virtualSize = virtualSize;
+    }
+
+    public long getPhysicalSize() {
+        return physicalSize;
+    }
+
+    public void setPhysicalSize(long physicalSize) {
+        this.physicalSize = physicalSize;
+    }
+
+    public String getInstallPath() {
+        return installPath;
+    }
+
+    public void setInstallPath(String installPath) {
+        this.installPath = installPath;
+    }
 }
diff --git a/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java b/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
index 736f8c6e5dc..cd8985fa176 100755
--- a/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
+++ b/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
@@ -262,6 +262,10 @@ public class ImageStoreUploadMonitorImpl extends ManagerBase implements ImageSto
                         case COMPLETED:
                             tmpVolumeDataStore.setDownloadState(VMTemplateStorageResourceAssoc.Status.DOWNLOADED);
                             tmpVolumeDataStore.setState(State.Ready);
+                            tmpVolumeDataStore.setInstallPath(answer.getInstallPath());
+                            tmpVolumeDataStore.setPhysicalSize(answer.getPhysicalSize());
+                            tmpVolumeDataStore.setSize(answer.getVirtualSize());
+                            tmpVolumeDataStore.setDownloadPercent(100);
                             stateMachine.transitTo(tmpVolume, Event.OperationSucceeded, null, _volumeDao);
                             if (s_logger.isDebugEnabled()) {
                                 s_logger.debug("Volume " + tmpVolume.getUuid() + " uploaded successfully");
@@ -322,6 +326,10 @@ public class ImageStoreUploadMonitorImpl extends ManagerBase implements ImageSto
                         case COMPLETED:
                             tmpTemplateDataStore.setDownloadState(VMTemplateStorageResourceAssoc.Status.DOWNLOADED);
                             tmpTemplateDataStore.setState(State.Ready);
+                            tmpTemplateDataStore.setInstallPath(answer.getInstallPath());
+                            tmpTemplateDataStore.setPhysicalSize(answer.getPhysicalSize());
+                            tmpTemplateDataStore.setSize(answer.getVirtualSize());
+                            tmpTemplateDataStore.setDownloadPercent(100);
                             stateMachine.transitTo(tmpTemplate, VirtualMachineTemplate.Event.OperationSucceeded, null, _templateDao);
                             if (s_logger.isDebugEnabled()) {
                                 s_logger.debug("Template " + tmpTemplate.getUuid() + " uploaded successfully");