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

bug 7280: make sure secondary storage is mounted on agent host 

status 7280: resolved fixed
This commit is contained in:
edison 2010-11-23 16:21:18 -08:00
parent ca17f8dc6a
commit 583d5e9965
1 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
View File

@ -1537,16 +1537,28 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
}
protected CreateVolumeFromSnapshotAnswer execute(final CreateVolumeFromSnapshotCommand cmd) {
String snapshotPath = cmd.getSnapshotUuid();
String primaryUuid = cmd.getPrimaryStoragePoolNameLabel();
String primaryPath = _mountPoint + File.separator + primaryUuid;
String volUuid = UUID.randomUUID().toString();
String volPath = primaryPath + File.separator + volUuid;
String result = Script.runSimpleBashScript("cp " + snapshotPath + " " + volPath);
if (result != null) {
return new CreateVolumeFromSnapshotAnswer(cmd, false, result, null);
StoragePool secondaryPool = null;
try {
/*Make sure secondary storage is mounted*/
secondaryPool = getNfsSPbyURI(_conn, new URI(cmd.getSecondaryStoragePoolURL()));
String snapshotPath = cmd.getSnapshotUuid();
String primaryUuid = cmd.getPrimaryStoragePoolNameLabel();
String primaryPath = _mountPoint + File.separator + primaryUuid;
String volUuid = UUID.randomUUID().toString();
String volPath = primaryPath + File.separator + volUuid;
String result = executeBashScript("cp " + snapshotPath + " " + volPath);
if (result != null) {
return new CreateVolumeFromSnapshotAnswer(cmd, false, result, null);
}
return new CreateVolumeFromSnapshotAnswer(cmd, true, "", volPath);
} catch (LibvirtException e) {
return new CreateVolumeFromSnapshotAnswer(cmd, false, e.toString(), null);
} catch (URISyntaxException e) {
return new CreateVolumeFromSnapshotAnswer(cmd, false, e.toString(), null);
} finally {
}
return new CreateVolumeFromSnapshotAnswer(cmd, true, "", volPath);
}
protected CreatePrivateTemplateAnswer execute(final CreatePrivateTemplateFromSnapshotCommand cmd) {
@ -4245,4 +4257,20 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
return _storagePools.get(uuid);
}
}
private void destroyStoragePool(StoragePool sp) {
if (sp != null) {
try {
String uuid = sp.getUUIDString();
synchronized (getStoragePool(uuid)) {
sp.destroy();
sp.undefine();
sp.free();
}
rmStoragePool(uuid);
} catch (LibvirtException e) {
s_logger.debug("Failed to destroy storage pool: " + e.toString());
}
}
}
}