You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2018/11/12 12:08:56 UTC
[GitHub] GabrielBrascher closed pull request #2985: kvm/ceph: When create a new RBD image use modern flags/features for t…
GabrielBrascher closed pull request #2985: kvm/ceph: When create a new RBD image use modern flags/features for t…
URL: https://github.com/apache/cloudstack/pull/2985
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
index 75005406acb..dc8083f0eea 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -72,7 +72,12 @@
private String _manageSnapshotPath;
private String rbdTemplateSnapName = "cloudstack-base-snap";
- private int rbdFeatures = (1 << 0); /* Feature 1<<0 means layering in RBD format 2 */
+ private static final int RBD_FEATURE_LAYERING = 1;
+ private static final int RBD_FEATURE_EXCLUSIVE_LOCK = 4;
+ private static final int RBD_FEATURE_OBJECT_MAP = 8;
+ private static final int RBD_FEATURE_FAST_DIFF = 16;
+ private static final int RBD_FEATURE_DEEP_FLATTEN = 32;
+ private int rbdFeatures = RBD_FEATURE_LAYERING + RBD_FEATURE_EXCLUSIVE_LOCK + RBD_FEATURE_OBJECT_MAP + RBD_FEATURE_FAST_DIFF + RBD_FEATURE_DEEP_FLATTEN;
private int rbdOrder = 0; /* Order 0 means 4MB blocks (the default) */
public LibvirtStorageAdaptor(StorageLayer storage) {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services