Allon Mureinik has uploaded a new change for review. Change subject: core: Don't send SetStoragePoolDescription ......................................................................
core: Don't send SetStoragePoolDescription The storage pool description is never read in VDSM and thus updating it is a useless (and expensive!) call. Moreover, this call cannot be trusted - since it's only sent if the DC's status is UP, there may very well be a situation where the DC's name in the engine and the pool's description in VDSM do not match. This patch removes this redundant and harmful call. Topic: remove-sp-description Change-Id: I5664c9912d07f9fbb99af315e904270597adbd73 Bug-Url: https://bugzilla.redhat.com/1096215 Signed-off-by: Allon Mureinik <amure...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetStoragePoolDescriptionVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java D backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SetStoragePoolDescriptionVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcIIrsServer.java 8 files changed, 0 insertions(+), 79 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/30464/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java index 707b22b..aebfdac 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java @@ -24,7 +24,6 @@ import org.ovirt.engine.core.common.errors.VdcBLLException; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.common.utils.VersionStorageFormatUtil; -import org.ovirt.engine.core.common.vdscommands.SetStoragePoolDescriptionVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.UpgradeStoragePoolVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.compat.Guid; @@ -66,17 +65,7 @@ @Override protected void executeCommand() { updateQuotaCache(); - if (_oldStoragePool.getStatus() == StoragePoolStatus.Up) { - if (!StringUtils.equals(_oldStoragePool.getName(), getStoragePool().getName())) { - runVdsCommand(VDSCommandType.SetStoragePoolDescription, - new SetStoragePoolDescriptionVDSCommandParameters( - getStoragePool().getId(), getStoragePool().getName()) - ); - } - } - copyUnchangedStoragePoolProperties(getStoragePool(), _oldStoragePool); - getStoragePoolDAO().updatePartial(getStoragePool()); updateStoragePoolFormatType(); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetStoragePoolDescriptionVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetStoragePoolDescriptionVDSCommandParameters.java deleted file mode 100644 index f9e4dba..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetStoragePoolDescriptionVDSCommandParameters.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.ovirt.engine.core.common.vdscommands; - -import org.ovirt.engine.core.compat.Guid; - -public class SetStoragePoolDescriptionVDSCommandParameters extends IrsBaseVDSCommandParameters { - private String privateDescription; - - public String getDescription() { - return privateDescription; - } - - private void setDescription(String value) { - privateDescription = value; - } - - public SetStoragePoolDescriptionVDSCommandParameters(Guid storagePoolId, String description) { - super(storagePoolId); - setDescription(description); - } - - public SetStoragePoolDescriptionVDSCommandParameters() { - } - - @Override - public String toString() { - return String.format("%s, description = %s", super.toString(), getDescription()); - } -} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java index 0b68804..e4c40ec 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java @@ -81,7 +81,6 @@ FormatStorageDomain("org.ovirt.engine.core.vdsbroker.vdsbroker"), SetStorageDomainDescription("org.ovirt.engine.core.vdsbroker.irsbroker"), GetStorageDomainStats("org.ovirt.engine.core.vdsbroker.vdsbroker"), - SetStoragePoolDescription("org.ovirt.engine.core.vdsbroker.irsbroker"), GetStoragePoolInfo("org.ovirt.engine.core.vdsbroker.irsbroker"), DestroyStoragePool("org.ovirt.engine.core.vdsbroker.irsbroker"), DeleteImageGroup("org.ovirt.engine.core.vdsbroker.irsbroker"), diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java index 951a776..31a0087 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java @@ -58,8 +58,6 @@ StatusOnlyReturnForXmlRpc extendStorageDomain(String sdUUID, String spUUID, String[] devlist, boolean force); - StatusOnlyReturnForXmlRpc setStoragePoolDescription(String spUUID, String description); - StoragePoolInfoReturnForXmlRpc getStoragePoolInfo(String spUUID); StatusOnlyReturnForXmlRpc destroyStoragePool(String spUUID, int hostSpmId, String SCSIKey); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java index 43b43af..bd219b4 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java @@ -65,8 +65,6 @@ public Map<String, Object> extendStorageDomain(String sdUUID, String spUUID, String[] devlist, boolean force); - public Map<String, Object> setStoragePoolDescription(String spUUID, String description); - public Map<String, Object> getStoragePoolInfo(String spUUID); public Map<String, Object> destroyStoragePool(String spUUID, int hostSpmId, String SCSIKey); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java index bee1b1f..0821819 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java @@ -187,13 +187,6 @@ } @Override - public StatusOnlyReturnForXmlRpc setStoragePoolDescription(String spUUID, String description) { - Map<String, Object> xmlRpcReturnValue = irsServer.setStoragePoolDescription(spUUID, description); - StatusOnlyReturnForXmlRpc wrapper = new StatusOnlyReturnForXmlRpc(xmlRpcReturnValue); - return wrapper; - } - - @Override public StoragePoolInfoReturnForXmlRpc getStoragePoolInfo(String spUUID) { Map<String, Object> xmlRpcReturnValue = irsServer.getStoragePoolInfo(spUUID); StoragePoolInfoReturnForXmlRpc wrapper = new StoragePoolInfoReturnForXmlRpc(xmlRpcReturnValue); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SetStoragePoolDescriptionVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SetStoragePoolDescriptionVDSCommand.java deleted file mode 100644 index 687a7a4..0000000 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SetStoragePoolDescriptionVDSCommand.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.ovirt.engine.core.vdsbroker.irsbroker; - -import org.ovirt.engine.core.common.vdscommands.SetStoragePoolDescriptionVDSCommandParameters; - -public class SetStoragePoolDescriptionVDSCommand<P extends SetStoragePoolDescriptionVDSCommandParameters> - extends IrsBrokerCommand<P> { - public SetStoragePoolDescriptionVDSCommand(P parameters) { - super(parameters); - } - - @Override - protected void executeIrsBrokerCommand() { - status = getIrsProxy().setStoragePoolDescription(getParameters().getStoragePoolId().toString(), - getParameters().getDescription()); - proceedProxyReturnValue(); - } -} diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcIIrsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcIIrsServer.java index 9b6c6f2..179d7c8 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcIIrsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcIIrsServer.java @@ -349,17 +349,6 @@ } @Override - public StatusOnlyReturnForXmlRpc setStoragePoolDescription(String spUUID, String description) { - JsonRpcRequest request = - new RequestBuilder("StoragePool.setDescription").withParameter("storagepoolID", spUUID) - .withParameter("description", description) - .build(); - Map<String, Object> response = - new FutureMap(this.client, request); - return new StatusOnlyReturnForXmlRpc(response); - } - - @Override public StoragePoolInfoReturnForXmlRpc getStoragePoolInfo(String spUUID) { // duplicated in IVdsServer#getStoragePoolInfo JsonRpcRequest request = -- To view, visit http://gerrit.ovirt.org/30464 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5664c9912d07f9fbb99af315e904270597adbd73 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amure...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
