You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2014/07/26 12:27:29 UTC
git commit: updated refs/heads/master to 7542ffc
Repository: cloudstack
Updated Branches:
refs/heads/master abc0b40ac -> 7542ffc48
CLOUDSTACK-6181: Set the correct flags when resizing RBD
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7542ffc4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7542ffc4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7542ffc4
Branch: refs/heads/master
Commit: 7542ffc48282ff703fdb586ce447091260ae3c02
Parents: abc0b40
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Sat Jul 26 11:39:08 2014 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Sat Jul 26 11:39:28 2014 +0200
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7542ffc4/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 5eb988f..457e173 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1880,7 +1880,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
StorageVol v = conn.storageVolLookupByPath(path);
int flags = 0;
- if (conn.getLibVirVersion() > 1001000 && vol.getFormat() == PhysicalDiskFormat.RAW) {
+ if (conn.getLibVirVersion() > 1001000 && vol.getFormat() == PhysicalDiskFormat.RAW && pool.getType() != StoragePoolType.RBD) {
flags = 1;
}
if (shrinkOk) {