Michael Kublin has uploaded a new change for review. Change subject: engine: Removing UpdateSpmHostNameVDSCommand class ......................................................................
engine: Removing UpdateSpmHostNameVDSCommand class The following command contains a potential bug and also the functionality of update host_name is removed, so need for special command Change-Id: I3485ff235be53e4365c8732f88c0c053f4718fb6 Signed-off-by: Michael Kublin <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpdateSpmHostNameVDSCommandParameters.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/IrsBrokerCommand.java D backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/UpdateSpmHostNameVDSCommand.java 5 files changed, 3 insertions(+), 83 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/72/9572/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java index 3e966c2..4638bf5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java @@ -15,16 +15,13 @@ import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSStatus; import org.ovirt.engine.core.common.businessentities.VDSType; -import org.ovirt.engine.core.common.businessentities.VdsSpmStatus; import org.ovirt.engine.core.common.businessentities.network_cluster; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.validation.group.PowerManagementCheck; import org.ovirt.engine.core.common.validation.group.UpdateEntity; import org.ovirt.engine.core.common.vdscommands.SetVdsStatusVDSCommandParameters; -import org.ovirt.engine.core.common.vdscommands.UpdateSpmHostNameVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; -import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.transaction.TransactionMethod; @@ -121,14 +118,6 @@ updateVdsData(); if (NeedToUpdateVdsBroker()) { InitializeVds(); - } - // if host_name changed and host is spm we need to update irsBroker cache with the new host_name - if (!Guid.Empty.equals(_oldVds.getstorage_pool_id()) && _oldVds.getspm_status() != VdsSpmStatus.None && - !StringUtils.equals(_oldVds.gethost_name(), getParameters().getVdsStaticData().gethost_name())) { - runVdsCommand(VDSCommandType.UpdateSpmHostName, - new UpdateSpmHostNameVDSCommandParameters(_oldVds.getstorage_pool_id(), - _oldVds.gethost_name(), - getParameters().getVdsStaticData().gethost_name())); } if (getParameters().getInstallVds()) { InstallVdsParameters tempVar = new InstallVdsParameters(getVdsId(), getParameters().getRootPassword()); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpdateSpmHostNameVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpdateSpmHostNameVDSCommandParameters.java deleted file mode 100644 index da5e622..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpdateSpmHostNameVDSCommandParameters.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.ovirt.engine.core.common.vdscommands; - -import org.ovirt.engine.core.compat.Guid; - -public class UpdateSpmHostNameVDSCommandParameters extends IrsBaseVDSCommandParameters { - - private String newHostName; - private String oldHostName; - - public UpdateSpmHostNameVDSCommandParameters(Guid storagePoolId, String oldHostName, String newHostName) { - super(storagePoolId); - this.setOldHostName(oldHostName); - this.setNewHostName(newHostName); - } - - public void setNewHostName(String newHostName) { - this.newHostName = newHostName; - } - - public String getNewHostName() { - return newHostName; - } - - public void setOldHostName(String oldHostName) { - this.oldHostName = oldHostName; - } - - public String getOldHostName() { - return oldHostName; - } - - @Override - public String toString() { - return String.format("%s, newHostName = %s, oldHostName = %s", - super.toString(), - getNewHostName(), - getOldHostName()); - } -} 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 92ddbf4..1de953d 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 @@ -116,7 +116,6 @@ ResetISOPath("org.ovirt.engine.core.vdsbroker.irsbroker"), MarkPoolInReconstructMode("org.ovirt.engine.core.vdsbroker.irsbroker"), ExtendStorageDomain("org.ovirt.engine.core.vdsbroker.irsbroker"), - UpdateSpmHostName("org.ovirt.engine.core.vdsbroker.irsbroker"), HotPlugDisk("org.ovirt.engine.core.vdsbroker.vdsbroker"), HotUnPlugDisk("org.ovirt.engine.core.vdsbroker.vdsbroker"), HotPlugNic("org.ovirt.engine.core.vdsbroker.vdsbroker"), diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java index d01994f..2349b88 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java @@ -152,15 +152,6 @@ } private String privatemCurrentIrsHost; - - public String getmCurrentIrsHost() { - return privatemCurrentIrsHost; - } - - public void setmCurrentIrsHost(String value) { - privatemCurrentIrsHost = value; - } - private IIrsServer privatemIrsProxy; private IIrsServer getmIrsProxy() { @@ -479,7 +470,7 @@ public void Init(VDS vds) { mCurrentVdsId = vds.getId(); setmIrsPort(vds.getport()); - setmCurrentIrsHost(vds.gethost_name()); + privatemCurrentIrsHost = vds.gethost_name(); } public boolean failover() { @@ -991,7 +982,7 @@ } public String getIsoDirectory() { - String tempVar = getmCurrentIrsHost(); + String tempVar = privatemCurrentIrsHost; return String.format("\\\\%1$s\\CD", ((tempVar != null) ? tempVar : gethostFromVds())); } @@ -1008,7 +999,7 @@ if (privatemIrsProxy != null) { XmlRpcUtils.shutDownConnection(((IrsServerWrapper) privatemIrsProxy).getHttpClient()); } - setmCurrentIrsHost(null); + privatemCurrentIrsHost = null; privatemIrsProxy = null; mCurrentVdsId = null; } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/UpdateSpmHostNameVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/UpdateSpmHostNameVDSCommand.java deleted file mode 100644 index c0abfae..0000000 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/UpdateSpmHostNameVDSCommand.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.ovirt.engine.core.vdsbroker.irsbroker; - -import org.apache.commons.lang.StringUtils; -import org.ovirt.engine.core.common.vdscommands.UpdateSpmHostNameVDSCommandParameters; - -public class UpdateSpmHostNameVDSCommand<P extends UpdateSpmHostNameVDSCommandParameters> extends IrsBrokerCommand<P> { - public UpdateSpmHostNameVDSCommand(P parameters) { - super(parameters); - } - - // overriding ExecuteVDSCommand in order not to wait in getIrsProxy locking - @Override - protected void ExecuteVDSCommand() { - // only if hostName in IrsProxy cache is the same as sent hostName - // update to new hostName - if (StringUtils.equals(getCurrentIrsProxyData().getmCurrentIrsHost(), getParameters().getOldHostName())) { - getCurrentIrsProxyData().setmCurrentIrsHost(getParameters().getNewHostName()); - } - } -} -- To view, visit http://gerrit.ovirt.org/9572 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3485ff235be53e4365c8732f88c0c053f4718fb6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Kublin <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
