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

bug 11230, 11229: merge fix from 2.2.10 branch, fix Eclipse project settings for premium-move

This commit is contained in:
Kelven Yang 2011-08-24 15:16:59 -07:00
parent 65744569c3
commit c3b6fd561c
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View File

@ -1996,9 +1996,12 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
}
StorageFilerTO pool = cmd.getPool();
try {
VmwareHypervisorHost hyperHost = this.getHyperHost(getServiceContext());
hyperHost.unmountDatastore(pool.getUuid());
try {
// We will leave datastore cleanup management to vCenter. Since for cluster VMFS datastore, it will always
// be mounted by vCenter.
// VmwareHypervisorHost hyperHost = this.getHyperHost(getServiceContext());
// hyperHost.unmountDatastore(pool.getUuid());
Answer answer = new Answer(cmd, true, "success");
return answer;
} catch (Throwable e) {
@ -2599,7 +2602,12 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
if (s_logger.isInfoEnabled())
s_logger.info("Destroy volume by original name: " + cmd.getVolume().getPath() + ".vmdk");
dsMo.deleteFile(cmd.getVolume().getPath() + ".vmdk", morDc, true);
dsMo.deleteFile(cmd.getVolume().getPath() + ".vmdk", morDc, true);
// root volume may be created via linked-clone, delete the delta disk as well
if (s_logger.isInfoEnabled())
s_logger.info("Destroy volume by derived name: " + cmd.getVolume().getPath() + "-delta.vmdk");
dsMo.deleteFile(cmd.getVolume().getPath() + "-delta.vmdk", morDc, true);
return new Answer(cmd, true, "Success");
}
@ -2634,13 +2642,23 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
if (s_logger.isInfoEnabled()) {
s_logger.info("Empty disk chain info, fall back to try to delete by original backing file name");
}
dsMo.deleteFile(cmd.getVolume().getPath() + ".vmdk", morDc, true);
dsMo.deleteFile(cmd.getVolume().getPath() + ".vmdk", morDc, true);
if (s_logger.isInfoEnabled()) {
s_logger.info("Destroy volume by derived name: " + cmd.getVolume().getPath() + "-flat.vmdk");
}
dsMo.deleteFile(cmd.getVolume().getPath() + "-flat.vmdk", morDc, true);
}
} else {
if (s_logger.isInfoEnabled()) {
s_logger.info("Destroy volume by original name: " + cmd.getVolume().getPath() + ".vmdk");
}
dsMo.deleteFile(cmd.getVolume().getPath() + ".vmdk", morDc, true);
dsMo.deleteFile(cmd.getVolume().getPath() + ".vmdk", morDc, true);
if (s_logger.isInfoEnabled()) {
s_logger.info("Destroy volume by derived name: " + cmd.getVolume().getPath() + "-flat.vmdk");
}
dsMo.deleteFile(cmd.getVolume().getPath() + "-flat.vmdk", morDc, true);
}
return new Answer(cmd, true, "Success");

1
server/.classpath
View File

@ -9,5 +9,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
<classpathentry combineaccessrules="false" kind="src" path="/tools"/>
<classpathentry combineaccessrules="false" kind="src" path="/vmware-base"/>
<classpathentry combineaccessrules="false" kind="src" path="/agent"/>
<classpathentry kind="output" path="bin"/>
</classpath>