Yaniv Bronhaim has uploaded a new change for review. Change subject: getAllTasksList\Status with spUUID retrieves info only if host is the SPM ......................................................................
getAllTasksList\Status with spUUID retrieves info only if host is the SPM Request for tasks statuses or list with the optional argument spUUID will return only if the host is the SPM. Without spUUID param vdsm will return all tasks it can find. Vdsm side patch: http://gerrit.ovirt.org/#/c/12517/ Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=880547 Signed-off-by: Yaniv Bronhaim <[email protected]> Change-Id: Iff7d8db4e4ad6b3f809085aff7216ac8a457b633 --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMTaskGuidBaseVDSCommandParameters.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SPMGetAllTasksInfoVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SPMGetAllTasksStatusesVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksInfoVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksStatusesVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java 8 files changed, 22 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/13450/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMTaskGuidBaseVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMTaskGuidBaseVDSCommandParameters.java index fbbe1cb..f70ff5f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMTaskGuidBaseVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMTaskGuidBaseVDSCommandParameters.java @@ -2,9 +2,9 @@ import org.ovirt.engine.core.compat.Guid; -public class HSMTaskGuidBaseVDSCommandParameters extends VdsIdVDSCommandParametersBase { +public class HSMTaskGuidBaseVDSCommandParameters extends SpIdVDSCommandParametersBase { public HSMTaskGuidBaseVDSCommandParameters(Guid vdsId, Guid taskId) { - super(vdsId); + super(null, vdsId); setTaskId(taskId); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SPMGetAllTasksInfoVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SPMGetAllTasksInfoVDSCommand.java index 6acd53b..8a4429b 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SPMGetAllTasksInfoVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SPMGetAllTasksInfoVDSCommand.java @@ -1,8 +1,8 @@ package org.ovirt.engine.core.vdsbroker.irsbroker; import org.ovirt.engine.core.common.vdscommands.IrsBaseVDSCommandParameters; +import org.ovirt.engine.core.common.vdscommands.SpIdVDSCommandParametersBase; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; -import org.ovirt.engine.core.common.vdscommands.VdsIdVDSCommandParametersBase; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.vdsbroker.ResourceManager; @@ -21,7 +21,8 @@ setReturnValue(ResourceManager .getInstance() .runVdsCommand(VDSCommandType.HSMGetAllTasksInfo, - new VdsIdVDSCommandParametersBase(getCurrentIrsProxyData().getCurrentVdsId())) + new SpIdVDSCommandParametersBase(getParameters().getStoragePoolId(), + getCurrentIrsProxyData().getCurrentVdsId())) .getReturnValue()); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SPMGetAllTasksStatusesVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SPMGetAllTasksStatusesVDSCommand.java index 8430395..aff6e49 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SPMGetAllTasksStatusesVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SPMGetAllTasksStatusesVDSCommand.java @@ -1,8 +1,8 @@ package org.ovirt.engine.core.vdsbroker.irsbroker; import org.ovirt.engine.core.common.vdscommands.IrsBaseVDSCommandParameters; +import org.ovirt.engine.core.common.vdscommands.SpIdVDSCommandParametersBase; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; -import org.ovirt.engine.core.common.vdscommands.VdsIdVDSCommandParametersBase; import org.ovirt.engine.core.utils.log.Logged; import org.ovirt.engine.core.utils.log.Logged.LogLevel; import org.ovirt.engine.core.vdsbroker.ResourceManager; @@ -16,6 +16,7 @@ @Override protected void ExecuteIrsBrokerCommand() { setVDSReturnValue(ResourceManager.getInstance().runVdsCommand(VDSCommandType.HSMGetAllTasksStatuses, - new VdsIdVDSCommandParametersBase(getCurrentIrsProxyData().getCurrentVdsId()))); + new SpIdVDSCommandParametersBase(getParameters().getStoragePoolId(), + getCurrentIrsProxyData().getCurrentVdsId()))); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksInfoVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksInfoVDSCommand.java index e5d6c10..4924669 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksInfoVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksInfoVDSCommand.java @@ -4,10 +4,10 @@ import org.ovirt.engine.core.common.asynctasks.AsyncTaskCreationInfo; import org.ovirt.engine.core.common.asynctasks.AsyncTaskType; -import org.ovirt.engine.core.common.vdscommands.VdsIdVDSCommandParametersBase; +import org.ovirt.engine.core.common.vdscommands.SpIdVDSCommandParametersBase; import org.ovirt.engine.core.compat.Guid; -public class HSMGetAllTasksInfoVDSCommand<P extends VdsIdVDSCommandParametersBase> extends VdsBrokerCommand<P> { +public class HSMGetAllTasksInfoVDSCommand<P extends SpIdVDSCommandParametersBase> extends VdsBrokerCommand<P> { private TaskInfoListReturnForXmlRpc _result; private static final String VERB_KEY = "verb"; @@ -17,7 +17,7 @@ @Override protected void ExecuteVdsBrokerCommand() { - _result = getBroker().getAllTasksInfo(); + _result = getBroker().getAllTasksInfo(getParameters().getStoragePoolId().toString()); ProceedProxyReturnValue(); setReturnValue(ParseTaskInfoList(_result.TaskInfoList)); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksStatusesVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksStatusesVDSCommand.java index d3bf65b..11dfcae 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksStatusesVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksStatusesVDSCommand.java @@ -6,14 +6,14 @@ import org.ovirt.engine.core.common.businessentities.AsyncTaskResultEnum; import org.ovirt.engine.core.common.businessentities.AsyncTaskStatus; import org.ovirt.engine.core.common.businessentities.AsyncTaskStatusEnum; -import org.ovirt.engine.core.common.vdscommands.VdsIdVDSCommandParametersBase; +import org.ovirt.engine.core.common.vdscommands.SpIdVDSCommandParametersBase; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.utils.log.Logged; import org.ovirt.engine.core.utils.log.Logged.LogLevel; import org.ovirt.engine.core.vdsbroker.xmlrpc.XmlRpcStruct; @Logged(executionLevel = LogLevel.DEBUG) -public class HSMGetAllTasksStatusesVDSCommand<P extends VdsIdVDSCommandParametersBase> extends VdsBrokerCommand<P> { +public class HSMGetAllTasksStatusesVDSCommand<P extends SpIdVDSCommandParametersBase> extends VdsBrokerCommand<P> { private TaskStatusListReturnForXmlRpc _result; public HSMGetAllTasksStatusesVDSCommand(P parameters) { @@ -22,7 +22,7 @@ @Override protected void ExecuteVdsBrokerCommand() { - _result = getBroker().getAllTasksStatuses(); + _result = getBroker().getAllTasksStatuses(getParameters().getStoragePoolId().toString()); ProceedProxyReturnValue(); setReturnValue(ParseTaskStatusList(_result.TaskStatusList)); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java index d8f0ba3..0cd1a8f 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java @@ -169,11 +169,11 @@ TaskStatusReturnForXmlRpc getTaskStatus(String taskUUID); - TaskStatusListReturnForXmlRpc getAllTasksStatuses(); + TaskStatusListReturnForXmlRpc getAllTasksStatuses(String spUUID); TaskInfoReturnForXmlRpc getTaskInfo(String taskUUID); - TaskInfoListReturnForXmlRpc getAllTasksInfo(); + TaskInfoListReturnForXmlRpc getAllTasksInfo(String spUUID); StatusOnlyReturnForXmlRpc stopTask(String taskUUID); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java index 2a0aa59..7421c0c 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java @@ -154,11 +154,11 @@ public Map<String, Object> getTaskStatus(String taskUUID); - public Map<String, Object> getAllTasksStatuses(); + public Map<String, Object> getAllTasksStatuses(String spUUID); public Map<String, Object> getTaskInfo(String taskUUID); - public Map<String, Object> getAllTasksInfo(); + public Map<String, Object> getAllTasksInfo(String spUUID); public Map<String, Object> stopTask(String taskUUID); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java index 13ea1f6..2a3ef88 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java @@ -835,9 +835,9 @@ } @Override - public TaskStatusListReturnForXmlRpc getAllTasksStatuses() { + public TaskStatusListReturnForXmlRpc getAllTasksStatuses(String spUUID) { try { - Map<String, Object> xmlRpcReturnValue = vdsServer.getAllTasksStatuses(); + Map<String, Object> xmlRpcReturnValue = vdsServer.getAllTasksStatuses(spUUID); TaskStatusListReturnForXmlRpc wrapper = new TaskStatusListReturnForXmlRpc(xmlRpcReturnValue); return wrapper; } catch (UndeclaredThrowableException ute) { @@ -859,9 +859,9 @@ } @Override - public TaskInfoListReturnForXmlRpc getAllTasksInfo() { + public TaskInfoListReturnForXmlRpc getAllTasksInfo(String spUUID) { try { - Map<String, Object> xmlRpcReturnValue = vdsServer.getAllTasksInfo(); + Map<String, Object> xmlRpcReturnValue = vdsServer.getAllTasksInfo(spUUID); TaskInfoListReturnForXmlRpc wrapper = new TaskInfoListReturnForXmlRpc(xmlRpcReturnValue); return wrapper; } catch (UndeclaredThrowableException ute) { -- To view, visit http://gerrit.ovirt.org/13450 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iff7d8db4e4ad6b3f809085aff7216ac8a457b633 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
