etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 7291: return correct install path for createtemplatefromsnapshot 

add more check for deletetemplate command

status 5873: resolved fixed
This commit is contained in:
anthony 2010-12-01 18:51:52 -08:00
parent 2966dd637d
commit f7b930e686
2 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -5529,7 +5529,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
if (!result) {
throw new CloudRuntimeException("Could not create the template.properties file on secondary storage dir: " + tmpltURI);
}
installPath = installPath + "/" + tmpltFilename;
return new CreatePrivateTemplateAnswer(cmd, true, null, installPath, virtualSize, physicalSize, tmpltUUID, ImageFormat.VHD);
} catch (XenAPIException e) {
details = "Creating template from snapshot " + backedUpSnapshotUuid + " failed due to " + e.getMessage();

51
core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
View File

@ -224,7 +224,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
protected Answer execute(final DeleteTemplateCommand cmd) {
String relativeTemplatePath = cmd.getTemplatePath();
String parent = _parent;
if (relativeTemplatePath.startsWith(File.separator)) {
relativeTemplatePath = relativeTemplatePath.substring(1);
}
@ -234,24 +234,37 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
}
String absoluteTemplatePath = parent + relativeTemplatePath;
File tmpltParent = new File(absoluteTemplatePath).getParentFile();
boolean result = true;
if (tmpltParent.exists()) {
File [] tmpltFiles = tmpltParent.listFiles();
if (tmpltFiles != null) {
for (File f : tmpltFiles) {
f.delete();
}
}
result = _storage.delete(tmpltParent.getAbsolutePath());
}
if (result) {
return new Answer(cmd, true, null);
} else {
return new Answer(cmd, false, "Failed to delete file");
}
if (!tmpltParent.exists()) {
return new Answer(cmd, false, "template parent directory " + tmpltParent.getName()
+ " doesn't exist, Template path ( " + relativeTemplatePath + " ) is wrong");
}
File[] tmpltFiles = tmpltParent.listFiles();
if (tmpltFiles == null || tmpltFiles.length == 0) {
return new Answer(cmd, false, "No files under template parent directory " + tmpltParent.getName()
+ " Template path ( " + relativeTemplatePath + " ) is wrong");
}
boolean found = false;
for (File f : tmpltFiles) {
if (f.getName().equals("template.properties")) {
found = true;
break;
}
}
if (!found) {
return new Answer(cmd, false, "Can not find template.properties, Template path ( " + relativeTemplatePath
+ " ) is wrong");
}
for (File f : tmpltFiles) {
if( !f.delete() ) {
return new Answer(cmd, false, "Unable to delete file " + f.getName()
+ " Template path ( " + relativeTemplatePath + " ) is wrong");
}
}
if ( !tmpltParent.delete() ) {
return new Answer(cmd, false, "Unable to delete directory " + tmpltParent.getName()
+ " Template path ( " + relativeTemplatePath + " ) is wrong");
}
return new Answer(cmd, true, null);
}
protected long getUsedSize() {