Allon Mureinik has uploaded a new change for review. Change subject: core:StorageDomainCommandBase.refreshAllVdssInPool ......................................................................
core:StorageDomainCommandBase.refreshAllVdssInPool Moved the method refreshAllVdssInPool() from StorageDomainCommandBase to ActiveteStorageDomainCommand, which is currently the only place it is used (presumably, this is a leftover of some previous refactoring). In addition, removed the boolean parameter from the method, as it was not in use. Change-Id: I56f55bceee3c07826a3767e38554adf553ca2121 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java 2 files changed, 24 insertions(+), 21 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/8560/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommand.java index b6f1542..148350d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ActivateStorageDomainCommand.java @@ -1,14 +1,21 @@ package org.ovirt.engine.core.bll.storage; +import static org.ovirt.engine.core.common.businessentities.NonOperationalReason.STORAGE_DOMAIN_UNREACHABLE; + +import java.util.ArrayList; import java.util.Collections; import java.util.Date; +import java.util.List; import java.util.Map; import org.ovirt.engine.core.bll.IsoDomainListSyncronizer; import org.ovirt.engine.core.bll.LockIdNameAttribute; import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; +import org.ovirt.engine.core.bll.job.ExecutionHandler; import org.ovirt.engine.core.common.AuditLogType; +import org.ovirt.engine.core.common.action.SetNonOperationalVdsParameters; import org.ovirt.engine.core.common.action.StorageDomainPoolParametersBase; +import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMapId; @@ -18,6 +25,7 @@ import org.ovirt.engine.core.common.vdscommands.ActivateStorageDomainVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.compat.TransactionScopeOption; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.transaction.TransactionMethod; @@ -68,7 +76,7 @@ new ActivateStorageDomainVDSCommandParameters(getStoragePool().getId(), getStorageDomain().getId())); log.infoFormat("ActivateStorage Domain. After Connect all hosts to pool. Time:{0}", new Date()); - refreshAllVdssInPool(false); + refreshAllVdssInPool(); TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { @Override public Void runInTransaction() { @@ -90,6 +98,21 @@ setSucceeded(true); } + private void refreshAllVdssInPool() { + List<Guid> vdsIdsToSetNonOperational = new ArrayList<Guid>(); + runSynchronizeOperation(new RefreshPoolSingleAsyncOperationFactory(), vdsIdsToSetNonOperational); + for (Guid vdsId : vdsIdsToSetNonOperational) { + SetNonOperationalVdsParameters tempVar = + new SetNonOperationalVdsParameters(vdsId, STORAGE_DOMAIN_UNREACHABLE); + tempVar.setSaveToDb(true); + tempVar.setStorageDomainId(getStorageDomain().getId()); + tempVar.setTransactionScopeOption(TransactionScopeOption.RequiresNew); + getBackend().runInternalAction(VdcActionType.SetNonOperationalVds, + tempVar, + ExecutionHandler.createInternalJobContext()); + } + } + @Override public AuditLogType getAuditLogTypeValue() { if (getParameters().isRunSilent()) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java index a7163a5..b03719b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java @@ -1,20 +1,14 @@ package org.ovirt.engine.core.bll.storage; -import static org.ovirt.engine.core.common.businessentities.NonOperationalReason.STORAGE_DOMAIN_UNREACHABLE; - -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.List; import org.ovirt.engine.core.bll.context.CompensationContext; -import org.ovirt.engine.core.bll.job.ExecutionHandler; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.VdcObjectType; -import org.ovirt.engine.core.common.action.SetNonOperationalVdsParameters; import org.ovirt.engine.core.common.action.StorageDomainParametersBase; -import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.LUN_storage_server_connection_map; import org.ovirt.engine.core.common.businessentities.LUN_storage_server_connection_map_id; import org.ovirt.engine.core.common.businessentities.LUNs; @@ -30,7 +24,6 @@ import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.NGuid; -import org.ovirt.engine.core.compat.TransactionScopeOption; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dao.DiskImageDAO; @@ -230,19 +223,6 @@ } getStorageDomain().setstatus(status); getStoragePoolIsoMapDAO().updateStatus(map.getId(), status); - } - } - - protected void refreshAllVdssInPool(boolean connect) { - List<Guid> vdsIdsToSetNonOperational = new ArrayList<Guid>(); - runSynchronizeOperation(new RefreshPoolSingleAsyncOperationFactory(), vdsIdsToSetNonOperational); - for (Guid vdsId : vdsIdsToSetNonOperational) { - SetNonOperationalVdsParameters tempVar = new SetNonOperationalVdsParameters(vdsId, - STORAGE_DOMAIN_UNREACHABLE); - tempVar.setSaveToDb(true); - tempVar.setStorageDomainId(getStorageDomain().getId()); - tempVar.setTransactionScopeOption(TransactionScopeOption.RequiresNew); - getBackend().runInternalAction(VdcActionType.SetNonOperationalVds, tempVar, ExecutionHandler.createInternalJobContext()); } } -- To view, visit http://gerrit.ovirt.org/8560 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56f55bceee3c07826a3767e38554adf553ca2121 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
