volume upload: Restart of MS leads to loss of browser uploaded templates

karuturi · karuturi · commit 3de5d9db5fa0 · 2015-03-16T12:45:24.000+05:30
on restart of management server, template sync runs. It checks for
templates in ssvm using the uniquename. If it doesnt find any, cleans
the directory. In case of uploaded templates, these are getting saved
using name instead on uniquename and hence template sync cant find them
and does cleanup. Using uniquename in template.properties now.
diff --git a/core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java b/core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java
@@ -47,6 +47,8 @@ public class TemplateOrVolumePostUploadCommand {
 
     String maxUploadSize;
 
+    String description;
+
     public TemplateOrVolumePostUploadCommand(long entityId, String entityUUID, String absolutePath, String checksum, String type, String name, String imageFormat, String dataTo,
             String dataToRole) {
         this.entityId = entityId;
@@ -166,4 +168,12 @@ public String getMaxUploadSize() {
     public void setMaxUploadSize(String maxUploadSize) {
         this.maxUploadSize = maxUploadSize;
     }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
 }
diff --git a/server/src/com/cloud/template/HypervisorTemplateAdapter.java b/server/src/com/cloud/template/HypervisorTemplateAdapter.java
@@ -258,12 +258,13 @@ public List<TemplateOrVolumePostUploadCommand> createTemplateForPostUpload(Templ
             }
 
             TemplateOrVolumePostUploadCommand payload = new TemplateOrVolumePostUploadCommand(template.getId(), template.getUuid(), tmpl.getInstallPath(), tmpl.getChecksum(), tmpl
-                    .getType().toString(), template.getName(), template.getFormat().toString(), templateOnStore.getDataStore().getUri(), templateOnStore.getDataStore().getRole()
+                    .getType().toString(), template.getUniqueName(), template.getFormat().toString(), templateOnStore.getDataStore().getUri(), templateOnStore.getDataStore().getRole()
                     .toString());
             //using the existing max template size configuration
             payload.setMaxUploadSize(_configDao.getValue(Config.MaxTemplateAndIsoSize.key()));
             payload.setRemoteEndPoint(ep.getPublicAddr());
             payload.setRequiresHvm(template.requiresHvm());
+            payload.setDescription(template.getDisplayText());
             payloads.add(payload);
         }
         _resourceLimitMgr.incrementResourceCount(profile.getAccountId(), ResourceType.template);
diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -2634,6 +2634,7 @@ public UploadEntity createUploadEntity(String uuid, String metadata, long conten
                 uploadEntity.setHvm(cmd.getRequiresHvm());
                 uploadEntity.setChksum(cmd.getChecksum());
                 uploadEntity.setMaxSizeInGB(maxSizeInGB);
+                uploadEntity.setDescription(cmd.getDescription());
                 // create a install dir
                 if (!_storage.exists(installPathPrefix)) {
                     _storage.mkdir(installPathPrefix);
@@ -2677,9 +2678,9 @@ public String postUpload(String uuid, String filename) {
         Script scr = new Script(getScriptLocation(resourceType), timeout, s_logger);
         scr.add("-s", Integer.toString(imgSizeGigs));
         scr.add("-S", Long.toString(UploadEntity.s_maxTemplateSize));
-        //if (uploadEntity.getDescription() != null && dnld.getDescription().length() > 1) {
-        //    scr.add("-d", dnld.getDescription());
-        //}
+        if (uploadEntity.getDescription() != null && uploadEntity.getDescription().length() > 1) {
+            scr.add("-d", uploadEntity.getDescription());
+        }
         if (uploadEntity.isHvm()) {
             scr.add("-h");
         }
diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/UploadEntity.java b/services/secondary-storage/server/src/org/apache/cloudstack/storage/template/UploadEntity.java
@@ -32,6 +32,7 @@ public class UploadEntity {
     private String chksum;
     private long physicalSize;
     private int maxSizeInGB;
+    private String description;
 
     public static enum ResourceType {
         VOLUME, TEMPLATE
@@ -180,4 +181,12 @@ public int getMaxSizeInGB() {
     public void setMaxSizeInGB(int maxSizeInGB) {
         this.maxSizeInGB = maxSizeInGB;
     }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -258,12 +258,13 @@ public List<TemplateOrVolumePostUploadCommand> createTemplateForPostUpload(Templ`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`TemplateOrVolumePostUploadCommand payload = new TemplateOrVolumePostUploadCommand(template.getId(), template.getUuid(), tmpl.getInstallPath(), tmpl.getChecksum(), tmpl`
`261`		`- .getType().toString(), template.getName(), template.getFormat().toString(), templateOnStore.getDataStore().getUri(), templateOnStore.getDataStore().getRole()`
	`261`	`+ .getType().toString(), template.getUniqueName(), template.getFormat().toString(), templateOnStore.getDataStore().getUri(), templateOnStore.getDataStore().getRole()`
`262`	`262`	`.toString());`
`263`	`263`	`//using the existing max template size configuration`
`264`	`264`	`payload.setMaxUploadSize(_configDao.getValue(Config.MaxTemplateAndIsoSize.key()));`
`265`	`265`	`payload.setRemoteEndPoint(ep.getPublicAddr());`
`266`	`266`	`payload.setRequiresHvm(template.requiresHvm());`
	`267`	`+ payload.setDescription(template.getDisplayText());`
`267`	`268`	`payloads.add(payload);`
`268`	`269`	`}`
`269`	`270`	`_resourceLimitMgr.incrementResourceCount(profile.getAccountId(), ResourceType.template);`