Liron Aravot has uploaded a new change for review. Change subject: core: create OVF store as non shareable on gluster domain ......................................................................
core: create OVF store as non shareable on gluster domain oVirt doesn't support the creation of shareable disks on gluster storage domains. Therefore the OVF store disks on gluster domains should be created as non shareable. Change-Id: I8e5d05a80061b963d61e09919824830b3624d3e6 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1134366 Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvfVolumeForStorageDomainCommand.java 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/32185/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvfVolumeForStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvfVolumeForStorageDomainCommand.java index 36d8837..bb15ecc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvfVolumeForStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvfVolumeForStorageDomainCommand.java @@ -16,6 +16,7 @@ import org.ovirt.engine.core.common.businessentities.DiskInterface; import org.ovirt.engine.core.common.businessentities.StorageDomainOvfInfo; import org.ovirt.engine.core.common.businessentities.StorageDomainOvfInfoStatus; +import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VolumeFormat; import org.ovirt.engine.core.common.businessentities.VolumeType; import org.ovirt.engine.core.common.utils.SizeConverter; @@ -68,13 +69,19 @@ setSucceeded(true); } + private boolean shouldOvfStoreBeShareable() { + // we don't create shareable disks on gluster domains to avoid + // split brain - see BZ 1024654 + return getStorageDomain().getStorageType() != StorageType.GLUSTERFS; + } + public DiskImage createDisk(Guid domainId) { DiskImage mNewCreatedDiskImage = new DiskImage(); mNewCreatedDiskImage.setDiskInterface(DiskInterface.IDE); mNewCreatedDiskImage.setWipeAfterDelete(false); mNewCreatedDiskImage.setDiskAlias(OvfInfoFileConstants.OvfStoreDescriptionLabel); mNewCreatedDiskImage.setDiskDescription(OvfInfoFileConstants.OvfStoreDescriptionLabel); - mNewCreatedDiskImage.setShareable(true); + mNewCreatedDiskImage.setShareable(shouldOvfStoreBeShareable()); mNewCreatedDiskImage.setStorageIds(new ArrayList<>(Arrays.asList(domainId))); mNewCreatedDiskImage.setSize(SizeConverter.BYTES_IN_MB * 128); mNewCreatedDiskImage.setvolumeFormat(VolumeFormat.RAW); -- To view, visit http://gerrit.ovirt.org/32185 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e5d05a80061b963d61e09919824830b3624d3e6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Liron Aravot <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
