apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix build

Browse Source
This commit is contained in:
edison 2010-08-26 16:30:19 -07:00
parent ba50928c3f
commit fb592dd34b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1231,13 +1231,13 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
public Answer execute(DestroyCommand cmd) { public Answer execute(DestroyCommand cmd) {
VolumeTO vol = cmd.getVolume(); VolumeTO vol = cmd.getVolume();
StorageVol volume = getVolume(vol.getPath());
if (volume == null) {
s_logger.debug("Failed to find the volume: " + vol.getPath());
return new Answer(cmd, true, "Success");
}
try { try {
StorageVol volume = getVolume(vol.getPath());
if (volume == null) {
s_logger.debug("Failed to find the volume: " + vol.getPath());
return new Answer(cmd, true, "Success");
}
volume.delete(0); volume.delete(0);
volume.free(); volume.free();
} catch (LibvirtException e) { } catch (LibvirtException e) {
@ -1430,7 +1430,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
String templatePath = _mountPoint + File.separator + secondaryPool.getUUIDString() + File.separator + templateInstallFolder; String templatePath = _mountPoint + File.separator + secondaryPool.getUUIDString() + File.separator + templateInstallFolder;
File f = new File(templatePath); File f = new File(templatePath);
if (!f.exists()) { if (!f.exists()) {
f.mkdir(); f.mkdirs();
} }
String tmplPath = templateInstallFolder + File.separator + tmplFileName; String tmplPath = templateInstallFolder + File.separator + tmplFileName;
Script command = new Script(_createTmplPath, _timeout, s_logger); Script command = new Script(_createTmplPath, _timeout, s_logger);
@ -1704,7 +1704,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
pool.getHostAddress(), pool.getPath(), targetPath); pool.getHostAddress(), pool.getPath(), targetPath);
File tpFile = new File(targetPath); File tpFile = new File(targetPath);
if (!tpFile.exists()) { if (!tpFile.exists()) {
tpFile.mkdir(); tpFile.mkdirs();
} }
StoragePool sp = null; StoragePool sp = null;
try { try {
@ -3366,7 +3366,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
File logPath = new File("/var/run/cloud"); File logPath = new File("/var/run/cloud");
if (!logPath.exists()) { if (!logPath.exists()) {
logPath.mkdir(); logPath.mkdirs();
} }
cleanup_rules_for_dead_vms(); cleanup_rules_for_dead_vms();