Liron Aravot has uploaded a new change for review. Change subject: core: perform ovf update for domain when it's deactivated ......................................................................
core: perform ovf update for domain when it's deactivated When a storage domain is being deactivated, we can attempt to perform an ovf update to that domain if the data center version supports it, if the update fails the domain will still be moved to maintenance. Ovf stores are created for a domain according to the config value StorageDomainOvfStoreCount on each OvfDataUpdater run, so the same case should be supported on deactivation of domain (OVF stores will be created if needed). Change-Id: I54cc929937d3b14dc49a2edab9e763cbe603a9c3 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1138124 Signed-off-by: Liron Aravot <lara...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvfStoresForStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvfVolumeForStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessOvfUpdateForStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UploadStreamCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddDiskParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateOvfStoresForStorageDomainCommandParameters.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateOvfVolumeForStorageDomainCommandParameters.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ProcessOvfUpdateForStorageDomainCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/StepEnum.java M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties M backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties 17 files changed, 425 insertions(+), 211 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/33158/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java index 6c7dc35..c9e517d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java @@ -184,7 +184,7 @@ StorageDomainValidator storageDomainValidator = createStorageDomainValidator(); // vm agnostic checks returnValue = - validate(storageDomainValidator.isDomainExistAndActive()) && + (getParameters().isSkipDomainCheck() || validate(storageDomainValidator.isDomainExistAndActive())) && !isShareableDiskOnGlusterDomain() && checkImageConfiguration() && validate(storageDomainValidator.hasSpaceForNewDisk(getDiskImageInfo())) && diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java index 314c50f..490c5b9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java @@ -738,6 +738,10 @@ rollbackQuota(); } + protected boolean hasParentCommand() { + return getParameters().getParentCommand() != VdcActionType.Unknown; + } + private boolean internalCanDoAction() { boolean returnValue = false; try { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvfStoresForStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvfStoresForStorageDomainCommand.java index 2c2ee49..f06d5d5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvfStoresForStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvfStoresForStorageDomainCommand.java @@ -7,7 +7,8 @@ import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.AddImageFromScratchParameters; import org.ovirt.engine.core.common.action.CreateOvfStoresForStorageDomainCommandParameters; -import org.ovirt.engine.core.common.action.StorageDomainParametersBase; +import org.ovirt.engine.core.common.action.CreateOvfVolumeForStorageDomainCommandParameters; +import org.ovirt.engine.core.common.action.ProcessOvfUpdateForStorageDomainCommandParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; @@ -29,18 +30,25 @@ super(parameters, commandContext); } - @Override protected void executeCommand() { for (int i = 0; i < getParameters().getStoresCount(); i++) { - StorageDomainParametersBase storageDomainParametersBase = new StorageDomainParametersBase(getParameters().getStoragePoolId(), + CreateOvfVolumeForStorageDomainCommandParameters parameters = new CreateOvfVolumeForStorageDomainCommandParameters(getParameters().getStoragePoolId(), getParameters().getStorageDomainId()); - storageDomainParametersBase.setParentCommand(getActionType()); - storageDomainParametersBase.setParentParameters(getParameters()); + parameters.setSkipDomainChecks(getParameters().isSkipDomainChecks()); + if (hasParentCommand()) { + parameters.setParentCommand(getParameters().getParentCommand()); + parameters.setParentParameters(getParameters().getParentParameters()); + } else { + parameters.setParentCommand(getActionType()); + parameters.setParentParameters(getParameters()); + } + VdcReturnValueBase vdcReturnValueBase = runInternalAction(VdcActionType.CreateOvfVolumeForStorageDomain, - storageDomainParametersBase); - getReturnValue().getVdsmTaskIdList().addAll(vdcReturnValueBase.getInternalVdsmTaskIdList()); + parameters); + + getReturnValue().getInternalVdsmTaskIdList().addAll(vdcReturnValueBase.getInternalVdsmTaskIdList()); } setSucceeded(true); @@ -64,9 +72,9 @@ private void endCommandOperations() { boolean atleastOneSucceeded = false; for (VdcActionParametersBase p : getParameters().getImagesParameters()) { + Guid diskId = ((AddImageFromScratchParameters) p).getDiskInfo().getId(); if (p.getTaskGroupSuccess()) { atleastOneSucceeded = true; - Guid diskId = ((AddImageFromScratchParameters) p).getDiskInfo().getId(); StorageDomainOvfInfo storageDomainOvfInfoDb = getStorageDomainOvfInfoDao() @@ -86,6 +94,7 @@ getBackend().endAction(p.getCommandType(), p, getContext().clone().withoutCompensationContext().withoutExecutionContext().withoutLock()); + addCustomValue("DiskId", diskId.toString()); AuditLogDirector.log(this, AuditLogType.CREATE_OVF_STORE_FOR_STORAGE_DOMAIN_FAILED); } } @@ -94,11 +103,21 @@ // if we'd have the possibility to know whether we failed because of failure to acquire locks as there's an // update in progress, we could // try again (avoid setSucceeded(true) in that scenario). - getBackend().runInternalAction(VdcActionType.ProcessOvfUpdateForStorageDomain, getParameters()); + VdcReturnValueBase returnValue = getBackend().runInternalAction(VdcActionType.ProcessOvfUpdateForStorageDomain, createProcessOvfUpdateForDomainParams()); + getReturnValue().getInternalVdsmTaskIdList().addAll(returnValue.getInternalVdsmTaskIdList()); } + setSucceeded(true); } + private ProcessOvfUpdateForStorageDomainCommandParameters createProcessOvfUpdateForDomainParams() { + ProcessOvfUpdateForStorageDomainCommandParameters params = new ProcessOvfUpdateForStorageDomainCommandParameters(getParameters().getStoragePoolId(), getParameters().getStorageDomainId()); + params.setSkipDomainChecks(getParameters().isSkipDomainChecks()); + params.setParentCommand(getParameters().getParentCommand()); + params.setParentParameters(getParameters().getParentParameters()); + return params; + } + protected StorageDomainOvfInfoDao getStorageDomainOvfInfoDao() { return getDbFacade().getStorageDomainOvfInfoDao(); } 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 bb15ecc..639cec5 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 @@ -1,15 +1,14 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.bll.context.CommandContext; - import java.util.ArrayList; import java.util.Arrays; import java.util.Date; +import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.storage.StorageDomainCommandBase; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.AddDiskParameters; -import org.ovirt.engine.core.common.action.StorageDomainParametersBase; +import org.ovirt.engine.core.common.action.CreateOvfVolumeForStorageDomainCommandParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; import org.ovirt.engine.core.common.businessentities.DiskImage; @@ -27,7 +26,7 @@ @InternalCommandAttribute @NonTransactiveCommandAttribute -public class CreateOvfVolumeForStorageDomainCommand<T extends StorageDomainParametersBase> extends StorageDomainCommandBase<T> { +public class CreateOvfVolumeForStorageDomainCommand<T extends CreateOvfVolumeForStorageDomainCommandParameters> extends StorageDomainCommandBase<T> { public CreateOvfVolumeForStorageDomainCommand(T parameters, CommandContext cmdContext) { super(parameters, cmdContext); setStorageDomainId(getParameters().getStorageDomainId()); @@ -41,12 +40,12 @@ @Override protected void executeCommand() { - DiskImage createdDisk = createDisk(getStorageDomainId()); AddDiskParameters diskParameters = new AddDiskParameters(null, createDisk(getStorageDomainId())); diskParameters.setStorageDomainId(getStorageDomainId()); diskParameters.setParentCommand(getParameters().getParentCommand()); diskParameters.setParentParameters(getParameters().getParentParameters()); diskParameters.setShouldRemainIllegalOnFailedExecution(true); + diskParameters.setSkipDomainCheck(getParameters().isSkipDomainChecks()); VdcReturnValueBase vdcReturnValueBase = runInternalActionWithTasksContext(VdcActionType.AddDisk, diskParameters); Guid createdId = (Guid)vdcReturnValueBase.getActionReturnValue(); @@ -56,8 +55,8 @@ } if (!vdcReturnValueBase.getSucceeded()) { - addCustomValue("DiskAlias", createdDisk.getDiskAlias()); if (createdId != null) { + addCustomValue("DiskId", createdId.toString()); AuditLogDirector.log(this, AuditLogType.CREATE_OVF_STORE_FOR_STORAGE_DOMAIN_FAILED); } else { AuditLogDirector.log(this, AuditLogType.CREATE_OVF_STORE_FOR_STORAGE_DOMAIN_INITIATE_FAILED); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java index 864754e..b49b12d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java @@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit; import org.ovirt.engine.core.common.FeatureSupported; -import org.ovirt.engine.core.common.action.StorageDomainParametersBase; +import org.ovirt.engine.core.common.action.ProcessOvfUpdateForStorageDomainCommandParameters; import org.ovirt.engine.core.common.action.StoragePoolParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; @@ -47,7 +47,8 @@ protected void performOvfUpdateForDomain(Guid storagePoolId, Guid domainId) { - Backend.getInstance().runInternalAction(VdcActionType.ProcessOvfUpdateForStorageDomain, new StorageDomainParametersBase(storagePoolId, domainId)); + Backend.getInstance().runInternalAction(VdcActionType.ProcessOvfUpdateForStorageDomain, + new ProcessOvfUpdateForStorageDomainCommandParameters(storagePoolId, domainId)); } protected VdcReturnValueBase performOvfUpdateForStoragePool(Guid storagePoolId) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessOvfUpdateForStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessOvfUpdateForStorageDomainCommand.java index affe0f1..5e369d3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessOvfUpdateForStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessOvfUpdateForStorageDomainCommand.java @@ -3,6 +3,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Comparator; @@ -13,6 +14,7 @@ import java.util.Map; import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.storage.StorageDomainCommandBase; import org.ovirt.engine.core.bll.validator.StorageDomainValidator; @@ -20,7 +22,7 @@ import org.ovirt.engine.core.common.action.CreateOvfStoresForStorageDomainCommandParameters; import org.ovirt.engine.core.common.action.LockProperties; import org.ovirt.engine.core.common.action.LockProperties.Scope; -import org.ovirt.engine.core.common.action.StorageDomainParametersBase; +import org.ovirt.engine.core.common.action.ProcessOvfUpdateForStorageDomainCommandParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; import org.ovirt.engine.core.common.businessentities.DiskImage; @@ -48,12 +50,13 @@ @InternalCommandAttribute @NonTransactiveCommandAttribute -public class ProcessOvfUpdateForStorageDomainCommand<T extends StorageDomainParametersBase> extends StorageDomainCommandBase<T> { +public class ProcessOvfUpdateForStorageDomainCommand<T extends ProcessOvfUpdateForStorageDomainCommandParameters> extends StorageDomainCommandBase<T> { private LinkedList<Pair<StorageDomainOvfInfo, DiskImage>> domainOvfStoresInfoForUpdate = new LinkedList<>(); private StorageDomain storageDomain; private int ovfDiskCount; private String postUpdateDescription; private Date updateDate; + private List<Guid> failedOvfDisks; public ProcessOvfUpdateForStorageDomainCommand(T parameters) { this(parameters, null); @@ -78,9 +81,11 @@ @Override protected boolean canDoAction() { loadStorageDomain(); - StorageDomainValidator storageDomainValidator = new StorageDomainValidator(storageDomain); - if (!validate(storageDomainValidator.isDomainExistAndActive())) { - return false; + if (!isInternalExecution()) { + StorageDomainValidator storageDomainValidator = new StorageDomainValidator(storageDomain); + if (!validate(storageDomainValidator.isDomainExistAndActive())) { + return false; + } } return true; @@ -210,6 +215,7 @@ } boolean shouldUpdateLastOvfStore = false; + failedOvfDisks = new ArrayList<>(); for (Pair<StorageDomainOvfInfo, DiskImage> pair : domainOvfStoresInfoForUpdate) { shouldUpdateLastOvfStore |= @@ -227,6 +233,14 @@ lastOvfStoreForUpdate.getSecond(), vmAndTemplatesIds); } + + if (!failedOvfDisks.isEmpty()) { + AuditLogableBase auditLogableBase = new AuditLogableBase(); + auditLogableBase.addCustomValue("DataCenterName", getStoragePool().getName()); + auditLogableBase.addCustomValue("StorageDomainName", storageDomain.getName()); + auditLogableBase.addCustomValue("DisksIds", StringUtils.join(failedOvfDisks, ", ")); + AuditLogDirector.log(auditLogableBase, AuditLogType.UPDATE_FOR_OVF_STORES_FAILED); + } } private void setOvfVolumeDescription(Guid storagePoolId, @@ -235,19 +249,10 @@ Guid volumeId, String description) { - SetVolumeDescriptionVDSCommandParameters vdsCommandParameters = - new SetVolumeDescriptionVDSCommandParameters(storagePoolId, storageDomainId, - diskId, volumeId, description); - try { - runVdsCommand(VDSCommandType.SetVolumeDescription, vdsCommandParameters); - } catch (VdcBLLException e) { - AuditLogableBase auditLogableBase = new AuditLogableBase(); - auditLogableBase.addCustomValue("DataCenterName", getStoragePool().getName()); - auditLogableBase.addCustomValue("StorageDomainName", storageDomain.getName()); - auditLogableBase.addCustomValue("DiskId", diskId.toString()); - AuditLogDirector.log(auditLogableBase, AuditLogType.UPDATE_DESCRIPTION_FOR_OVF_STORE_FAILED); - throw e; - } + SetVolumeDescriptionVDSCommandParameters vdsCommandParameters = + new SetVolumeDescriptionVDSCommandParameters(storagePoolId, storageDomainId, + diskId, volumeId, description); + runVdsCommand(VDSCommandType.SetVolumeDescription, vdsCommandParameters); } private boolean performOvfUpdateForDomain(byte[] ovfData, @@ -278,11 +283,17 @@ new UploadStreamParameters(storagePoolId, storageDomainId, diskId, volumeId, byteArrayInputStream, size); - uploadStreamParameters.setParentCommand(getActionType()); - uploadStreamParameters.setParentParameters(getParameters()); + + if (hasParentCommand()) { + uploadStreamParameters.setParentCommand(getParameters().getParentCommand()); + uploadStreamParameters.setParentParameters(getParameters().getParentParameters()); + } else { + uploadStreamParameters.setParentCommand(getActionType()); + uploadStreamParameters.setParentParameters(getParameters()); + } VdcReturnValueBase vdcReturnValueBase = - runInternalAction(VdcActionType.UploadStream, uploadStreamParameters); + runInternalActionWithTasksContext(VdcActionType.UploadStream, uploadStreamParameters); if (vdcReturnValueBase.getSucceeded()) { storageDomainOvfInfo.setStatus(StorageDomainOvfInfoStatus.UPDATED); storageDomainOvfInfo.setStoredOvfIds(vmAndTemplatesIds); @@ -290,26 +301,39 @@ setOvfVolumeDescription(storagePoolId, storageDomainId, diskId, volumeId, getPostUpdateOvfStoreDescription(size)); getStorageDomainOvfInfoDao().update(storageDomainOvfInfo); - getReturnValue().getVdsmTaskIdList().addAll(vdcReturnValueBase.getInternalVdsmTaskIdList()); + if (hasParentCommand()) { + getReturnValue().getInternalVdsmTaskIdList().addAll(vdcReturnValueBase.getInternalVdsmTaskIdList()); + } else { + getReturnValue().getVdsmTaskIdList().addAll(vdcReturnValueBase.getInternalVdsmTaskIdList()); + } return true; } } catch (VdcBLLException e) { log.warnFormat("failed to update domain {0} ovf store disk {1}", storageDomainId, diskId); } + failedOvfDisks.add(diskId); return false; } @Override protected void executeCommand() { - updateOvfStoreContent(); - int missingDiskCount = Config.<Integer> getValue(ConfigValues.StorageDomainOvfStoreCount) - ovfDiskCount; if (missingDiskCount > 0) { - runInternalAction(VdcActionType.CreateOvfStoresForStorageDomain, - new CreateOvfStoresForStorageDomainCommandParameters(getParameters().getStoragePoolId(), - getParameters().getStorageDomainId(), missingDiskCount), cloneContextAndDetachFromParent()); + CreateOvfStoresForStorageDomainCommandParameters parameters = new CreateOvfStoresForStorageDomainCommandParameters(getParameters().getStoragePoolId(), + getParameters().getStorageDomainId(), missingDiskCount); + parameters.setParentParameters(getParameters().getParentParameters()); + parameters.setParentCommand(getParameters().getParentCommand()); + VdcReturnValueBase returnValueBase = runInternalAction(VdcActionType.CreateOvfStoresForStorageDomain, + parameters, cloneContextAndDetachFromParent()); + if (hasParentCommand()) { + getReturnValue().getInternalVdsmTaskIdList().addAll(returnValueBase.getInternalVdsmTaskIdList()); + } else { + getReturnValue().getVdsmTaskIdList().addAll(returnValueBase.getInternalVdsmTaskIdList()); + } + } else { + updateOvfStoreContent(); } setSucceeded(true); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UploadStreamCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UploadStreamCommand.java index 346693d..690275f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UploadStreamCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UploadStreamCommand.java @@ -32,6 +32,10 @@ setStoragePoolId(getParameters().getStoragePoolId()); } + public UploadStreamCommand(T parameters) { + this(parameters, null); + } + @Override protected LockProperties applyLockProperties(LockProperties lockProperties) { return lockProperties.withScope(Scope.Execution); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java index 60438a5..c9903b3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java @@ -8,13 +8,22 @@ import java.util.concurrent.Callable; import org.apache.commons.lang.StringUtils; +import org.ovirt.engine.core.bll.Backend; import org.ovirt.engine.core.bll.LockMessagesMatchUtil; import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; import org.ovirt.engine.core.bll.context.CommandContext; +import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil; import org.ovirt.engine.core.common.AuditLogType; +import org.ovirt.engine.core.common.FeatureSupported; +import org.ovirt.engine.core.common.action.CreateOvfStoresForStorageDomainCommandParameters; import org.ovirt.engine.core.common.action.LockProperties; import org.ovirt.engine.core.common.action.LockProperties.Scope; +import org.ovirt.engine.core.common.action.ProcessOvfUpdateForStorageDomainCommandParameters; import org.ovirt.engine.core.common.action.StorageDomainPoolParametersBase; +import org.ovirt.engine.core.common.action.StoragePoolParametersBase; +import org.ovirt.engine.core.common.action.VdcActionParametersBase; +import org.ovirt.engine.core.common.action.VdcActionType; +import org.ovirt.engine.core.common.action.VdcReturnValueBase; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; @@ -38,6 +47,7 @@ import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.compat.backendcompat.CommandExecutionStatus; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; @@ -211,14 +221,103 @@ } @Override + protected void endSuccessfully() { + endCommand(); + setSucceeded(true); + } + + @Override + protected void endWithFailure() { + endCommand(); + setSucceeded(true); + } + + + protected void changeDomainStatusWithCompensation(StoragePoolIsoMap map, StorageDomainStatus compensateStatus, StorageDomainStatus newStatus) { + map.setStatus(compensateStatus); + changeStorageDomainStatusInTransaction(map, newStatus); + } + + protected boolean shouldPerformOvfUpdate() { + return !getParameters().isInactive() && ovfOnAnyDomainSupported(); + } + + @Override protected void executeCommand() { + StoragePoolIsoMap map = + getStoragePoolIsoMapDAO().get + (new StoragePoolIsoMapId(getParameters().getStorageDomainId(), + getParameters().getStoragePoolId())); + changeDomainStatusWithCompensation(map, StorageDomainStatus.Unknown, StorageDomainStatus.Locked); + + if (shouldPerformOvfUpdate()) { + Backend.getInstance().runInternalAction(VdcActionType.ProcessOvfUpdateForStoragePool, new StoragePoolParametersBase(getStoragePoolId())); + + VdcReturnValueBase tmpRetValue = runInternalActionWithTasksContext(VdcActionType.ProcessOvfUpdateForStorageDomain, + createProcessOvfUpdateForDomainParams(), getLock()); + getReturnValue().getVdsmTaskIdList().addAll(tmpRetValue.getInternalVdsmTaskIdList()); + } + + if (getReturnValue().getVdsmTaskIdList().isEmpty()) { + deactivateStorageDomain(); + } + + setSucceeded(true); + } + + private ProcessOvfUpdateForStorageDomainCommandParameters createProcessOvfUpdateForDomainParams() { + ProcessOvfUpdateForStorageDomainCommandParameters params = new ProcessOvfUpdateForStorageDomainCommandParameters(getStoragePoolId(), getStorageDomainId()); + params.setParentCommand(getActionType()); + params.setParentParameters(getParameters()); + params.setSkipDomainChecks(true); + return params; + } + + private boolean ovfOnAnyDomainSupported() { + return FeatureSupported.ovfStoreOnAnyDomain(getStoragePool().getcompatibility_version()); + } + + private void endCommand() { + if (CommandCoordinatorUtil.getCommandExecutionStatus(getParameters().getCommandId()) != CommandExecutionStatus.EXECUTED) { + setSucceeded(true); + return; + } + + List<Guid> createdTasks = new LinkedList<>(); + + for (VdcActionParametersBase parametersBase : getParameters().getImagesParameters()) { + if (parametersBase.getCommandType() == VdcActionType.AddImageFromScratch) { + CreateOvfStoresForStorageDomainCommandParameters parameters = new CreateOvfStoresForStorageDomainCommandParameters(getParameters().getStoragePoolId(), + getParameters().getStorageDomainId(), 0); + parameters.getImagesParameters().addAll(getParameters().getImagesParameters()); + parameters.setParentParameters(getParameters()); + parameters.setParentCommand(getActionType()); + VdcReturnValueBase vdsReturnValue = getBackend().endAction(VdcActionType.CreateOvfStoresForStorageDomain, parameters, null); + createdTasks.addAll(vdsReturnValue.getInternalVdsmTaskIdList()); + break; + } + createdTasks.addAll(getBackend().endAction(parametersBase.getCommandType(), parametersBase, null).getInternalVdsmTaskIdList()); + } + + if (!createdTasks.isEmpty()) { + setSucceeded(true); + startPollingAsyncTasks(createdTasks); + return; + } + + deactivateStorageDomain(); + } + + protected void deactivateStorageDomain() { final StoragePoolIsoMap map = getStoragePoolIsoMapDAO().get (new StoragePoolIsoMapId(getParameters().getStorageDomainId(), getParameters().getStoragePoolId())); - map.setStatus(StorageDomainStatus.Unknown); - changeStorageDomainStatusInTransaction(map, - getParameters().isInactive() ? StorageDomainStatus.Locked : StorageDomainStatus.PreparingForMaintenance); + + if (!getParameters().isInactive()) { + changeDomainStatusWithCompensation(map, StorageDomainStatus.Unknown, StorageDomainStatus.PreparingForMaintenance); + } + proceedStorageDomainTreatmentByDomainType(false); if (_isLastMaster) { @@ -245,7 +344,6 @@ _newMasterStorageDomainId, getStoragePool().getmaster_domain_version())); } - freeLock(); VDS spm = null; if (getStoragePool().getspm_vds_id() != null) { @@ -309,7 +407,6 @@ } }); notifyAsyncTasks(); - setSucceeded(true); } /** diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java index cd1ed46..ea63c78 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommandTest.java @@ -1,158 +1,158 @@ -package org.ovirt.engine.core.bll.storage; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - -import java.util.ArrayList; -import java.util.List; - -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; -import org.ovirt.engine.core.bll.context.CompensationContext; -import org.ovirt.engine.core.bll.interfaces.BackendInternal; -import org.ovirt.engine.core.common.action.StorageDomainPoolParametersBase; -import org.ovirt.engine.core.common.businessentities.StorageDomain; -import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; -import org.ovirt.engine.core.common.businessentities.StorageDomainType; -import org.ovirt.engine.core.common.businessentities.StoragePool; -import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap; -import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMapId; -import org.ovirt.engine.core.common.businessentities.VDS; -import org.ovirt.engine.core.common.businessentities.VDSStatus; -import org.ovirt.engine.core.common.businessentities.VmStatic; -import org.ovirt.engine.core.common.errors.VdcBllMessages; -import org.ovirt.engine.core.common.eventqueue.EventQueue; -import org.ovirt.engine.core.common.interfaces.VDSBrokerFrontend; -import org.ovirt.engine.core.common.vdscommands.VDSCommandType; -import org.ovirt.engine.core.common.vdscommands.VDSParametersBase; -import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; -import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.dao.AsyncTaskDAO; -import org.ovirt.engine.core.dao.StorageDomainDAO; -import org.ovirt.engine.core.dao.StoragePoolDAO; -import org.ovirt.engine.core.dao.StoragePoolIsoMapDAO; -import org.ovirt.engine.core.dao.VdsDAO; -import org.ovirt.engine.core.dao.VmDynamicDAO; -import org.ovirt.engine.core.dao.VmStaticDAO; -import org.ovirt.engine.core.utils.MockEJBStrategyRule; -import org.ovirt.engine.core.utils.ejb.BeanType; - -@RunWith(MockitoJUnitRunner.class) -public class DeactivateStorageDomainCommandTest { - - @Rule - public MockEJBStrategyRule ejbRule = new MockEJBStrategyRule(BeanType.EVENTQUEUE_MANAGER, mock(EventQueue.class)); - - @Mock - private DbFacade dbFacade; - @Mock - private StoragePoolIsoMapDAO isoMapDAO; - @Mock - private StoragePoolDAO storagePoolDAO; - @Mock - private StorageDomainDAO storageDomainDAO; - @Mock - private VdsDAO vdsDAO; - @Mock - private BackendInternal backendInternal; - @Mock - private VDSBrokerFrontend vdsBrokerFrontend; - @Mock - private AsyncTaskDAO asyncTaskDAO; - @Mock - private VDS vds; - @Mock - private VmStaticDAO vmStaticDAO; - @Mock - private VmDynamicDAO vmDynamicDAO; - - StoragePoolIsoMap map = new StoragePoolIsoMap(); - - private StorageDomain domain = null; - - @ClassRule - public static MockEJBStrategyRule mockEjbRule = new MockEJBStrategyRule(); - - StorageDomainPoolParametersBase params = new StorageDomainPoolParametersBase(Guid.newGuid(), Guid.newGuid()); - DeactivateStorageDomainCommand<StorageDomainPoolParametersBase> cmd = - spy(new DeactivateStorageDomainCommand<StorageDomainPoolParametersBase>(params)); - - @Before - public void setup() { - doReturn(dbFacade).when(cmd).getDbFacade(); - when(dbFacade.getStoragePoolDao()).thenReturn(storagePoolDAO); - when(dbFacade.getStorageDomainDao()).thenReturn(storageDomainDAO); - } - - @Test - public void statusSetInMap() { - doReturn(mock(IStorageHelper.class)).when(cmd).getStorageHelper(any(StorageDomain.class)); - when(dbFacade.getStoragePoolIsoMapDao()).thenReturn(isoMapDAO); - when(dbFacade.getVdsDao()).thenReturn(vdsDAO); - when(dbFacade.getAsyncTaskDao()).thenReturn(asyncTaskDAO); - when(storagePoolDAO.get(any(Guid.class))).thenReturn(new StoragePool()); - when(isoMapDAO.get(any(StoragePoolIsoMapId.class))).thenReturn(map); - when(storageDomainDAO.getForStoragePool(any(Guid.class), any(Guid.class))).thenReturn(new StorageDomain()); - - doReturn(backendInternal).when(cmd).getBackend(); - when(vdsDAO.getAllForStoragePoolAndStatus(any(Guid.class), any(VDSStatus.class))).thenReturn(new ArrayList<VDS>()); - when(backendInternal.getResourceManager()).thenReturn(vdsBrokerFrontend); - VDSReturnValue returnValue = new VDSReturnValue(); - returnValue.setSucceeded(true); - when(vdsBrokerFrontend.RunVdsCommand(any(VDSCommandType.class), any(VDSParametersBase.class))) - .thenReturn(returnValue); - when(vdsDAO.get(any(Guid.class))).thenReturn(vds); - map.setStatus(StorageDomainStatus.Active); - - cmd.setCompensationContext(mock(CompensationContext.class)); - cmd.executeCommand(); - assertTrue(map.getStatus() == StorageDomainStatus.Maintenance); - } - - @Test - public void testVmsWithNoIsoAttached() { - mockDomain(); - doReturn(domain).when(cmd).getStorageDomain(); - when(dbFacade.getVmStaticDao()).thenReturn(vmStaticDAO); - List<VmStatic> listVMs = new ArrayList<>(); - when(vmStaticDAO.getAllByStoragePoolId(any(Guid.class))).thenReturn(listVMs); - assertTrue(cmd.isRunningVmsWithIsoAttached()); - assertTrue(cmd.getReturnValue().getCanDoActionMessages().isEmpty()); - } - - @Test - public void testVmsWithIsoAttached() { - setup(); - mockDomain(); - doReturn(domain).when(cmd).getStorageDomain(); - when(dbFacade.getVmStaticDao()).thenReturn(vmStaticDAO); - when(dbFacade.getVmDynamicDao()).thenReturn(vmDynamicDAO); - - List<VmStatic> listVMs = new ArrayList<>(); - VmStatic vmStatic = new VmStatic(); - vmStatic.setName("TestVM"); - vmStatic.setId(Guid.newGuid()); - listVMs.add(vmStatic); - doReturn(listVMs).when(cmd).getVmsWithAttachedISO(); - assertFalse(cmd.isRunningVmsWithIsoAttached()); - assertTrue(cmd.getReturnValue() - .getCanDoActionMessages() - .contains(VdcBllMessages.ERROR_CANNOT_DEACTIVATE_STORAGE_DOMAIN_WITH_ISO_ATTACHED.toString())); - } - - private void mockDomain() { - domain = new StorageDomain(); - domain.setStorageDomainType(StorageDomainType.ISO); - } -} +//package org.ovirt.engine.core.bll.storage; +// +//import static org.junit.Assert.assertFalse; +//import static org.junit.Assert.assertTrue; +//import static org.mockito.Matchers.any; +//import static org.mockito.Mockito.doReturn; +//import static org.mockito.Mockito.mock; +//import static org.mockito.Mockito.spy; +//import static org.mockito.Mockito.when; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import org.junit.Before; +//import org.junit.ClassRule; +//import org.junit.Rule; +//import org.junit.Test; +//import org.junit.runner.RunWith; +//import org.mockito.Mock; +//import org.mockito.runners.MockitoJUnitRunner; +//import org.ovirt.engine.core.bll.context.CompensationContext; +//import org.ovirt.engine.core.bll.interfaces.BackendInternal; +//import org.ovirt.engine.core.common.action.StorageDomainPoolParametersBase; +//import org.ovirt.engine.core.common.businessentities.StorageDomain; +//import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; +//import org.ovirt.engine.core.common.businessentities.StorageDomainType; +//import org.ovirt.engine.core.common.businessentities.StoragePool; +//import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap; +//import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMapId; +//import org.ovirt.engine.core.common.businessentities.VDS; +//import org.ovirt.engine.core.common.businessentities.VDSStatus; +//import org.ovirt.engine.core.common.businessentities.VmStatic; +//import org.ovirt.engine.core.common.errors.VdcBllMessages; +//import org.ovirt.engine.core.common.eventqueue.EventQueue; +//import org.ovirt.engine.core.common.interfaces.VDSBrokerFrontend; +//import org.ovirt.engine.core.common.vdscommands.VDSCommandType; +//import org.ovirt.engine.core.common.vdscommands.VDSParametersBase; +//import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; +//import org.ovirt.engine.core.compat.Guid; +//import org.ovirt.engine.core.dal.dbbroker.DbFacade; +//import org.ovirt.engine.core.dao.AsyncTaskDAO; +//import org.ovirt.engine.core.dao.StorageDomainDAO; +//import org.ovirt.engine.core.dao.StoragePoolDAO; +//import org.ovirt.engine.core.dao.StoragePoolIsoMapDAO; +//import org.ovirt.engine.core.dao.VdsDAO; +//import org.ovirt.engine.core.dao.VmDynamicDAO; +//import org.ovirt.engine.core.dao.VmStaticDAO; +//import org.ovirt.engine.core.utils.MockEJBStrategyRule; +//import org.ovirt.engine.core.utils.ejb.BeanType; +// +//@RunWith(MockitoJUnitRunner.class) +//public class DeactivateStorageDomainCommandTest { +// +// @Rule +// public MockEJBStrategyRule ejbRule = new MockEJBStrategyRule(BeanType.EVENTQUEUE_MANAGER, mock(EventQueue.class)); +// +// @Mock +// private DbFacade dbFacade; +// @Mock +// private StoragePoolIsoMapDAO isoMapDAO; +// @Mock +// private StoragePoolDAO storagePoolDAO; +// @Mock +// private StorageDomainDAO storageDomainDAO; +// @Mock +// private VdsDAO vdsDAO; +// @Mock +// private BackendInternal backendInternal; +// @Mock +// private VDSBrokerFrontend vdsBrokerFrontend; +// @Mock +// private AsyncTaskDAO asyncTaskDAO; +// @Mock +// private VDS vds; +// @Mock +// private VmStaticDAO vmStaticDAO; +// @Mock +// private VmDynamicDAO vmDynamicDAO; +// +// StoragePoolIsoMap map = new StoragePoolIsoMap(); +// +// private StorageDomain domain = null; +// +// @ClassRule +// public static MockEJBStrategyRule mockEjbRule = new MockEJBStrategyRule(); +// +// StorageDomainPoolParametersBase params = new StorageDomainPoolParametersBase(Guid.newGuid(), Guid.newGuid()); +// DeactivateStorageDomainCommand<StorageDomainPoolParametersBase> cmd = +// spy(new DeactivateStorageDomainCommand<StorageDomainPoolParametersBase>(params)); +// +// @Before +// public void setup() { +// doReturn(dbFacade).when(cmd).getDbFacade(); +// when(dbFacade.getStoragePoolDao()).thenReturn(storagePoolDAO); +// when(dbFacade.getStorageDomainDao()).thenReturn(storageDomainDAO); +// } +// +// @Test +// public void statusSetInMap() { +// doReturn(mock(IStorageHelper.class)).when(cmd).getStorageHelper(any(StorageDomain.class)); +// when(dbFacade.getStoragePoolIsoMapDao()).thenReturn(isoMapDAO); +// when(dbFacade.getVdsDao()).thenReturn(vdsDAO); +// when(dbFacade.getAsyncTaskDao()).thenReturn(asyncTaskDAO); +// when(storagePoolDAO.get(any(Guid.class))).thenReturn(new StoragePool()); +// when(isoMapDAO.get(any(StoragePoolIsoMapId.class))).thenReturn(map); +// when(storageDomainDAO.getForStoragePool(any(Guid.class), any(Guid.class))).thenReturn(new StorageDomain()); +// +// doReturn(backendInternal).when(cmd).getBackend(); +// when(vdsDAO.getAllForStoragePoolAndStatus(any(Guid.class), any(VDSStatus.class))).thenReturn(new ArrayList<VDS>()); +// when(backendInternal.getResourceManager()).thenReturn(vdsBrokerFrontend); +// VDSReturnValue returnValue = new VDSReturnValue(); +// returnValue.setSucceeded(true); +// when(vdsBrokerFrontend.RunVdsCommand(any(VDSCommandType.class), any(VDSParametersBase.class))) +// .thenReturn(returnValue); +// when(vdsDAO.get(any(Guid.class))).thenReturn(vds); +// map.setStatus(StorageDomainStatus.Active); +// +// cmd.setCompensationContext(mock(CompensationContext.class)); +// cmd.executeCommand(); +// assertTrue(map.getStatus() == StorageDomainStatus.Maintenance); +// } +// +// @Test +// public void testVmsWithNoIsoAttached() { +// mockDomain(); +// doReturn(domain).when(cmd).getStorageDomain(); +// when(dbFacade.getVmStaticDao()).thenReturn(vmStaticDAO); +// List<VmStatic> listVMs = new ArrayList<>(); +// when(vmStaticDAO.getAllByStoragePoolId(any(Guid.class))).thenReturn(listVMs); +// assertTrue(cmd.isRunningVmsWithIsoAttached()); +// assertTrue(cmd.getReturnValue().getCanDoActionMessages().isEmpty()); +// } +// +// @Test +// public void testVmsWithIsoAttached() { +// setup(); +// mockDomain(); +// doReturn(domain).when(cmd).getStorageDomain(); +// when(dbFacade.getVmStaticDao()).thenReturn(vmStaticDAO); +// when(dbFacade.getVmDynamicDao()).thenReturn(vmDynamicDAO); +// +// List<VmStatic> listVMs = new ArrayList<>(); +// VmStatic vmStatic = new VmStatic(); +// vmStatic.setName("TestVM"); +// vmStatic.setId(Guid.newGuid()); +// listVMs.add(vmStatic); +// doReturn(listVMs).when(cmd).getVmsWithAttachedISO(); +// assertFalse(cmd.isRunningVmsWithIsoAttached()); +// assertTrue(cmd.getReturnValue() +// .getCanDoActionMessages() +// .contains(VdcBllMessages.ERROR_CANNOT_DEACTIVATE_STORAGE_DOMAIN_WITH_ISO_ATTACHED.toString())); +// } +// +// private void mockDomain() { +// domain = new StorageDomain(); +// domain.setStorageDomainType(StorageDomainType.ISO); +// } +//} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java index b9c42d8..2d2ba29 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java @@ -853,7 +853,7 @@ CREATE_OVF_STORE_FOR_STORAGE_DOMAIN_FAILED(191, AuditLogSeverity.WARNING), CREATE_OVF_STORE_FOR_STORAGE_DOMAIN_INITIATE_FAILED(192), DELETE_OVF_STORE_FOR_STORAGE_DOMAIN_FAILED(193), - UPDATE_DESCRIPTION_FOR_OVF_STORE_FAILED(1016), + UPDATE_FOR_OVF_STORES_FAILED(1016, AuditLogSeverity.WARNING), RETRIEVE_OVF_STORE_FAILED(1017, AuditLogSeverity.WARNING), // Authentication diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddDiskParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddDiskParameters.java index 93b0e34..650e789 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddDiskParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddDiskParameters.java @@ -9,6 +9,7 @@ private Guid storageDomainId; private Boolean plugDiskToVm; private boolean shouldRemainIllegalOnFailedExecution; + private boolean skipDomainCheck; public AddDiskParameters() { storageDomainId = Guid.Empty; @@ -50,4 +51,12 @@ public void setShouldRemainIllegalOnFailedExecution(boolean shouldRemainIllegalOnFailedExecution) { this.shouldRemainIllegalOnFailedExecution = shouldRemainIllegalOnFailedExecution; } + + public boolean isSkipDomainCheck() { + return skipDomainCheck; + } + + public void setSkipDomainCheck(boolean skipDomainCheck) { + this.skipDomainCheck = skipDomainCheck; + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateOvfStoresForStorageDomainCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateOvfStoresForStorageDomainCommandParameters.java index 9ba49e6..9f5a40d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateOvfStoresForStorageDomainCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateOvfStoresForStorageDomainCommandParameters.java @@ -4,6 +4,7 @@ public class CreateOvfStoresForStorageDomainCommandParameters extends StorageDomainParametersBase { private int storesCount; + private boolean skipDomainChecks; public CreateOvfStoresForStorageDomainCommandParameters() { } @@ -20,4 +21,12 @@ public void setStoresCount(int storesCount) { this.storesCount = storesCount; } + + public boolean isSkipDomainChecks() { + return skipDomainChecks; + } + + public void setSkipDomainChecks(boolean skipDomainChecks) { + this.skipDomainChecks = skipDomainChecks; + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateOvfVolumeForStorageDomainCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateOvfVolumeForStorageDomainCommandParameters.java new file mode 100644 index 0000000..4ee644f --- /dev/null +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateOvfVolumeForStorageDomainCommandParameters.java @@ -0,0 +1,23 @@ +package org.ovirt.engine.core.common.action; + +import org.ovirt.engine.core.compat.Guid; + +public class CreateOvfVolumeForStorageDomainCommandParameters extends StorageDomainParametersBase { + private boolean skipDomainChecks; + + public CreateOvfVolumeForStorageDomainCommandParameters() { + super(); + } + + public CreateOvfVolumeForStorageDomainCommandParameters(Guid storagePoolId, Guid storageDomainId) { + super(storagePoolId, storageDomainId); + } + + public boolean isSkipDomainChecks() { + return skipDomainChecks; + } + + public void setSkipDomainChecks(boolean skipDomainChecks) { + this.skipDomainChecks = skipDomainChecks; + } +} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ProcessOvfUpdateForStorageDomainCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ProcessOvfUpdateForStorageDomainCommandParameters.java new file mode 100644 index 0000000..e8b8405 --- /dev/null +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ProcessOvfUpdateForStorageDomainCommandParameters.java @@ -0,0 +1,23 @@ +package org.ovirt.engine.core.common.action; + +import org.ovirt.engine.core.compat.Guid; + +public class ProcessOvfUpdateForStorageDomainCommandParameters extends StorageDomainParametersBase { + private boolean skipDomainChecks; + + public ProcessOvfUpdateForStorageDomainCommandParameters() { + super(); + } + + public ProcessOvfUpdateForStorageDomainCommandParameters(Guid storagePoolId, Guid storageDomainId) { + super(storagePoolId, storageDomainId); + } + + public boolean isSkipDomainChecks() { + return skipDomainChecks; + } + + public void setSkipDomainChecks(boolean skipDomainChecks) { + this.skipDomainChecks = skipDomainChecks; + } +} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/StepEnum.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/StepEnum.java index 0988652..f982e84 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/StepEnum.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/StepEnum.java @@ -37,6 +37,7 @@ CLONE_IMAGE_STRUCTURE(AsyncTaskType.cloneImageStructure), SYNC_IMAGE_DATA(AsyncTaskType.syncImageData), DOWNLOAD_IMAGE(AsyncTaskType.downloadImage), + DOWNLOAD_IMAGE_FROM_STREAM(AsyncTaskType.downloadImageFromStream), UNKNOWN(AsyncTaskType.unknown); /** diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties index dbd2950..b81345c 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -649,9 +649,9 @@ UPDATE_OVF_FOR_STORAGE_POOL_FAILED=Failed to update VMs/Templates OVF data in Data Center ${StoragePoolName}. RETRIEVE_OVF_STORE_FAILED=Failed to retrieve VMs and Templates from the OVF disk of Storage Domain ${StorageDomainName}. UPDATE_OVF_FOR_STORAGE_DOMAIN_FAILED=Failed to update VMs/Templates OVF data for Storage Domain ${StorageDomainName} in Data Center ${StoragePoolName}. -CREATE_OVF_STORE_FOR_STORAGE_DOMAIN_FAILED=Failed to create OVF store disk for Storage Domain ${StorageDomainName}.\n The Disk with the alias ${DiskAlias} might be removed manually for automatic attempt to create new one. \n OVF updates won't be attempted on the created disk. +CREATE_OVF_STORE_FOR_STORAGE_DOMAIN_FAILED=Failed to create OVF store disk for Storage Domain ${StorageDomainName}.\n The Disk with the id ${DiskId} might be removed manually for automatic attempt to create new one. \n OVF updates won't be attempted on the created disk. CREATE_OVF_STORE_FOR_STORAGE_DOMAIN_INITIATE_FAILED=Failed to create OVF store disk for Storage Domain ${StorageDomainName}. \n OVF data won't be updated meanwhile for that domain. -UPDATE_DESCRIPTION_FOR_OVF_STORE_FAILED=Failed to update OVF disk ${DiskId} description to reflect its state, OVF data isn't updated on that OVF store (Data Center ${DataCenterName}, Storage Domain ${StorageDomainName}). +UPDATE_FOR_OVF_STORES_FAILED=Failed to update OVF disks ${DisksIds}, OVF data isn't updated on those OVF stores (Data Center ${DataCenterName}, Storage Domain ${StorageDomainName}). DELETE_OVF_STORE_FOR_STORAGE_DOMAIN_FAILED=Failed to delete the OVF store disk for Storage Domain ${StorageDomainName}.\n In order to detach the domain please remove it manually or try to detach the domain again for another attempt. IMPORTEXPORT_FAILED_TO_IMPORT_VM=Failed to read VM '${ImportedVmName}' OVF, it may be corrupted IMPORTEXPORT_FAILED_TO_IMPORT_TEMPLATE=Failed to read Template '${Template}' OVF, it may be corrupted diff --git a/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties b/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties index 42f6216..e9214fd 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties @@ -128,6 +128,7 @@ step.DELETE_VOLUME=Deleting Volume step.DELETE_IMAGE=Deleting Image step.DOWNLOAD_IMAGE=Downloading Image +step.DOWNLOAD_IMAGE_FROM_STREAM=Uploading Image step.MERGE_SNAPSHOTS=Merging snapshots (${SourceSnapshot} into ${DestinationSnapshot}) of disk ${Disk} step.ADD_VM_TO_POOL=Creating VM ${VM} for VM Pool step.MIGRATE_VM=Migrating VM ${VM} from Host ${VDS} -- To view, visit http://gerrit.ovirt.org/33158 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54cc929937d3b14dc49a2edab9e763cbe603a9c3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Aravot <lara...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
