Maor Lipchuk has uploaded a new change for review. Change subject: core: Remove transaction field from CINDER constructor ......................................................................
core: Remove transaction field from CINDER constructor Remove the constructors of CINDERStorageHelper to be compatible with the rest of the Storage Helpers Change-Id: If3cb4babe23fe11ffb04c58ed5dc0c9a1de98a59 Bug-Url: https://bugzilla.redhat.com/1185826 Signed-off-by: Maor Lipchuk <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/storage/OpenStackVolumeProviderProxy.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/CINDERStorageHelper.java 2 files changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/39243/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/storage/OpenStackVolumeProviderProxy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/storage/OpenStackVolumeProviderProxy.java index 9bbf382..86482e6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/storage/OpenStackVolumeProviderProxy.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/storage/OpenStackVolumeProviderProxy.java @@ -46,7 +46,8 @@ } protected void attachStorageDomainToDataCenter(Guid storageDomainId, Guid storagePoolId) { - CINDERStorageHelper CINDERStorageHelper = new CINDERStorageHelper(false); + CINDERStorageHelper CINDERStorageHelper = new CINDERStorageHelper(); + CINDERStorageHelper.setRunInNewTransaction(false); CINDERStorageHelper.attachCinderDomainToPool(storageDomainId, storagePoolId); CINDERStorageHelper.activateCinderDomain(storageDomainId, storagePoolId); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/CINDERStorageHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/CINDERStorageHelper.java index cdbb0a6..9957015 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/CINDERStorageHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/CINDERStorageHelper.java @@ -1,5 +1,7 @@ package org.ovirt.engine.core.bll.storage; +import java.util.concurrent.Callable; + import org.ovirt.engine.core.bll.provider.storage.OpenStackVolumeProviderProxy; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.businessentities.StorageDomain; @@ -19,19 +21,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.concurrent.Callable; - public class CINDERStorageHelper extends StorageHelperBase { private Logger log = LoggerFactory.getLogger(CINDERStorageHelper.class); - private boolean runInNewTransaction; + private boolean runInNewTransaction = true; - public CINDERStorageHelper() { - this(true); + public boolean isRunInNewTransaction() { + return runInNewTransaction; } - public CINDERStorageHelper(boolean runInNewTransaction) { + public void setRunInNewTransaction(boolean runInNewTransaction) { this.runInNewTransaction = runInNewTransaction; } -- To view, visit https://gerrit.ovirt.org/39243 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If3cb4babe23fe11ffb04c58ed5dc0c9a1de98a59 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
