You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2014/07/18 21:04:03 UTC
git commit: updated refs/heads/master to 9fb93fe
Repository: cloudstack
Updated Branches:
refs/heads/master 24da72f37 -> 9fb93fe5b
CLOUDSTACK-7110: introduced by c1116142a3cd356e1e8da5404be150a07752b5d5, if it's a data volume, mgt server doesn't send image format to agent
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9fb93fe5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9fb93fe5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9fb93fe5
Branch: refs/heads/master
Commit: 9fb93fe5b3d330d75cc5a58613beea92e9138372
Parents: 24da72f
Author: Edison Su <su...@gmail.com>
Authored: Fri Jul 18 12:03:10 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Fri Jul 18 12:03:10 2014 -0700
----------------------------------------------------------------------
.../kvm/storage/KVMStorageProcessor.java | 36 ++++++++++++--------
1 file changed, 22 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9fb93fe5/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
index 22575ee..9b1c9de 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
@@ -351,7 +351,7 @@ public class KVMStorageProcessor implements StorageProcessor {
return new CopyCmdAnswer(newVol);
} catch (CloudRuntimeException e) {
- s_logger.debug("Failed to create volume: " + e.toString());
+ s_logger.debug("Failed to create volume: ", e);
return new CopyCmdAnswer(e.toString());
}
}
@@ -403,6 +403,7 @@ public class KVMStorageProcessor implements StorageProcessor {
newVol.setPath(volumeName);
return new CopyCmdAnswer(newVol);
} catch (CloudRuntimeException e) {
+ s_logger.debug("Failed to ccopyVolumeFromImageCacheToPrimary: ", e);
return new CopyCmdAnswer(e.toString());
} finally {
if (secondaryStoragePool != null) {
@@ -448,6 +449,7 @@ public class KVMStorageProcessor implements StorageProcessor {
newVol.setFormat(destFormat);
return new CopyCmdAnswer(newVol);
} catch (CloudRuntimeException e) {
+ s_logger.debug("Failed to copyVolumeFromPrimaryToSecondary: ", e);
return new CopyCmdAnswer(e.toString());
} finally {
if (secondaryStoragePool != null) {
@@ -554,7 +556,7 @@ public class KVMStorageProcessor implements StorageProcessor {
newTemplate.setName(templateName);
return new CopyCmdAnswer(newTemplate);
} catch (Exception e) {
- s_logger.debug("Failed to create template from volume: " + e.toString());
+ s_logger.debug("Failed to createTemplateFromVolume: ", e);
return new CopyCmdAnswer(e.toString());
} finally {
if (secondaryStorage != null) {
@@ -754,10 +756,10 @@ public class KVMStorageProcessor implements StorageProcessor {
newSnapshot.setPhysicalSize(size);
return new CopyCmdAnswer(newSnapshot);
} catch (LibvirtException e) {
- s_logger.debug("Failed to backup snapshot: " + e.toString());
+ s_logger.debug("Failed to backup snapshot: ", e);
return new CopyCmdAnswer(e.toString());
} catch (CloudRuntimeException e) {
- s_logger.debug("Failed to backup snapshot: " + e.toString());
+ s_logger.debug("Failed to backup snapshot: ", e);
return new CopyCmdAnswer(e.toString());
} finally {
try {
@@ -1008,11 +1010,11 @@ public class KVMStorageProcessor implements StorageProcessor {
return new AttachAnswer(disk);
} catch (LibvirtException e) {
- s_logger.debug("Failed to attach volume: " + vol.getPath() + ", due to " + e.toString());
+ s_logger.debug("Failed to attach volume: " + vol.getPath() + ", due to ", e);
storagePoolMgr.disconnectPhysicalDisk(primaryStore.getPoolType(), primaryStore.getUuid(), vol.getPath());
return new AttachAnswer(e.toString());
} catch (InternalErrorException e) {
- s_logger.debug("Failed to attach volume: " + vol.getPath() + ", due to " + e.toString());
+ s_logger.debug("Failed to attach volume: " + vol.getPath() + ", due to ", e);
return new AttachAnswer(e.toString());
}
}
@@ -1034,10 +1036,10 @@ public class KVMStorageProcessor implements StorageProcessor {
return new DettachAnswer(disk);
} catch (LibvirtException e) {
- s_logger.debug("Failed to attach volume: " + vol.getPath() + ", due to " + e.toString());
+ s_logger.debug("Failed to attach volume: " + vol.getPath() + ", due to ", e);
return new DettachAnswer(e.toString());
} catch (InternalErrorException e) {
- s_logger.debug("Failed to attach volume: " + vol.getPath() + ", due to " + e.toString());
+ s_logger.debug("Failed to attach volume: " + vol.getPath() + ", due to ", e);
return new DettachAnswer(e.toString());
}
}
@@ -1053,18 +1055,23 @@ public class KVMStorageProcessor implements StorageProcessor {
try {
primaryPool = storagePoolMgr.getStoragePool(primaryStore.getPoolType(), primaryStore.getUuid());
disksize = volume.getSize();
-
- vol = primaryPool.createPhysicalDisk(volume.getUuid(), PhysicalDiskFormat.valueOf(volume.getFormat().toString().toUpperCase()),
+ PhysicalDiskFormat format;
+ if (volume.getFormat() == null) {
+ format = primaryPool.getDefaultFormat();
+ } else {
+ format = PhysicalDiskFormat.valueOf(volume.getFormat().toString().toUpperCase());
+ }
+ vol = primaryPool.createPhysicalDisk(volume.getUuid(), format,
volume.getProvisioningType(), disksize);
VolumeObjectTO newVol = new VolumeObjectTO();
newVol.setPath(vol.getName());
newVol.setSize(volume.getSize());
- newVol.setFormat(ImageFormat.valueOf(vol.getFormat().toString().toUpperCase()));
+ newVol.setFormat(ImageFormat.valueOf(format.toString().toUpperCase()));
return new CreateObjectAnswer(newVol);
} catch (Exception e) {
- s_logger.debug("Failed to create volume: " + e.toString());
+ s_logger.debug("Failed to create volume: ", e);
return new CreateObjectAnswer(e.toString());
}
}
@@ -1164,7 +1171,7 @@ public class KVMStorageProcessor implements StorageProcessor {
newSnapshot.setPath(disk.getPath() + File.separator + snapshotName);
return new CreateObjectAnswer(newSnapshot);
} catch (LibvirtException e) {
- s_logger.debug("Failed to manage snapshot: " + e.toString());
+ s_logger.debug("Failed to manage snapshot: ", e);
return new CreateObjectAnswer("Failed to manage snapshot: " + e.toString());
}
}
@@ -1184,7 +1191,7 @@ public class KVMStorageProcessor implements StorageProcessor {
pool.deletePhysicalDisk(vol.getPath());
return new Answer(null);
} catch (CloudRuntimeException e) {
- s_logger.debug("Failed to delete volume: " + e.toString());
+ s_logger.debug("Failed to delete volume: ", e);
return new Answer(null, false, e.toString());
}
}
@@ -1229,6 +1236,7 @@ public class KVMStorageProcessor implements StorageProcessor {
return new CopyCmdAnswer(newVol);
} catch (CloudRuntimeException e) {
+ s_logger.debug("Failed to createVolumeFromSnapshot: ", e);
return new CopyCmdAnswer(e.toString());
}
}