Michael Kublin has uploaded a new change for review. Change subject: engine: Continue preporation for removing a global lock at SPM calls ......................................................................
engine: Continue preporation for removing a global lock at SPM calls Removed usage of getmCurrentIrsHost() all over commands. For example, at FenceVdsManualyCommand it reduced one query to DB Change-Id: Iaa5b20da89594f0fd245cfb87794c29b31273193 Signed-off-by: Michael Kublin <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FenceVdsManualyCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ResetIrsVDSCommandParameters.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVdsStatusVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ResetIrsVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SpmStopOnIrsVDSCommand.java 6 files changed, 23 insertions(+), 37 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/9025/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FenceVdsManualyCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FenceVdsManualyCommand.java index 16957da..c26af8c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FenceVdsManualyCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FenceVdsManualyCommand.java @@ -205,11 +205,9 @@ private void resetIrs() { if (getStoragePool().getspm_vds_id() != null) { - VDS currentSPMVds = - DbFacade.getInstance().getVdsDao().get(getStoragePool().getspm_vds_id()); ResetIrsVDSCommandParameters tempVar = new ResetIrsVDSCommandParameters(getStoragePool() - .getId(), currentSPMVds.gethost_name(), currentSPMVds.getId()); + .getId(), getStoragePool().getspm_vds_id().getValue()); tempVar.setIgnoreStopFailed(true); Backend.getInstance() .getResourceManager() diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java index 66db360..81f04c0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java @@ -181,7 +181,7 @@ } if (spm != null) { ResetIrsVDSCommandParameters tempVar2 = new ResetIrsVDSCommandParameters( - getStoragePool().getId(), spm.gethost_name(), spm.getId()); + getStoragePool().getId(), spm.getId()); tempVar2.setIgnoreStopFailed(true); commandSucceeded = Backend.getInstance().getResourceManager() .RunVdsCommand(VDSCommandType.ResetIrs, tempVar2).getSucceeded(); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ResetIrsVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ResetIrsVDSCommandParameters.java index dc24ae5..18ab42f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ResetIrsVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ResetIrsVDSCommandParameters.java @@ -3,14 +3,11 @@ import org.ovirt.engine.core.compat.*; public class ResetIrsVDSCommandParameters extends IrsBaseVDSCommandParameters { - public ResetIrsVDSCommandParameters(Guid storagePoolId, String hostName, Guid vdsId) { + public ResetIrsVDSCommandParameters(Guid storagePoolId, Guid vdsId) { super(storagePoolId); setVdsId(vdsId); - _hostName = hostName; } - - private String _hostName; - + private Guid privateVdsId; public Guid getVdsId() { @@ -19,10 +16,6 @@ public void setVdsId(Guid value) { privateVdsId = value; - } - - public String getHostName() { - return _hostName; } private boolean privateIgnoreStopFailed; @@ -40,9 +33,8 @@ @Override public String toString() { - return String.format("%s, hostName = %s, vdsId = %s, ignoreStopFailed = %s", + return String.format("%s, vdsId = %s, ignoreStopFailed = %s", super.toString(), - getHostName(), getVdsId(), getIgnoreStopFailed()); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVdsStatusVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVdsStatusVDSCommand.java index 099975e..b6cc048 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVdsStatusVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVdsStatusVDSCommand.java @@ -35,8 +35,7 @@ .getInstance() .runVdsCommand( VDSCommandType.ResetIrs, - new ResetIrsVDSCommandParameters(vds.getstorage_pool_id(), vds - .gethost_name(), vds.getId())).getSucceeded()); + new ResetIrsVDSCommandParameters(vds.getstorage_pool_id(), vds.getId())).getSucceeded()); } } else { getVDSReturnValue().setSucceeded(false); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ResetIrsVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ResetIrsVDSCommand.java index 1450cb2..0341f9b 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ResetIrsVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ResetIrsVDSCommand.java @@ -17,26 +17,23 @@ @Override protected void ExecuteVDSCommand() { P parameters = getParameters(); - if (StringHelper.EqOp(parameters.getHostName(), getCurrentIrsProxyData().getmCurrentIrsHost()) || - StringHelper.isNullOrEmpty(getCurrentIrsProxyData().getmCurrentIrsHost())) { - Guid vdsId = parameters.getVdsId(); - if (ResourceManager - .getInstance() - .runVdsCommand(VDSCommandType.SpmStop, - new SpmStopVDSCommandParameters(vdsId, parameters.getStoragePoolId())).getSucceeded() - || parameters.getIgnoreStopFailed()) { - getCurrentIrsProxyData().ResetIrs(); - storage_pool pool = DbFacade.getInstance().getStoragePoolDao().get(parameters.getStoragePoolId()); - if (pool != null && (pool.getstatus() == StoragePoolStatus.NotOperational)) { - ResourceManager - .getInstance() - .getEventListener() - .storagePoolStatusChange(parameters.getStoragePoolId(), StoragePoolStatus.Problematic, - AuditLogType.SYSTEM_CHANGE_STORAGE_POOL_STATUS_RESET_IRS, VdcBllErrors.ENGINE); - } - } else { - getVDSReturnValue().setSucceeded(false); + Guid vdsId = parameters.getVdsId(); + if (ResourceManager + .getInstance() + .runVdsCommand(VDSCommandType.SpmStop, + new SpmStopVDSCommandParameters(vdsId, parameters.getStoragePoolId())).getSucceeded() + || parameters.getIgnoreStopFailed()) { + getCurrentIrsProxyData().ResetIrs(); + storage_pool pool = DbFacade.getInstance().getStoragePoolDao().get(parameters.getStoragePoolId()); + if (pool != null && (pool.getstatus() == StoragePoolStatus.NotOperational)) { + ResourceManager + .getInstance() + .getEventListener() + .storagePoolStatusChange(parameters.getStoragePoolId(), StoragePoolStatus.Problematic, + AuditLogType.SYSTEM_CHANGE_STORAGE_POOL_STATUS_RESET_IRS, VdcBllErrors.ENGINE); } + } else { + getVDSReturnValue().setSucceeded(false); } } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SpmStopOnIrsVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SpmStopOnIrsVDSCommand.java index ea29008..3801990 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SpmStopOnIrsVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SpmStopOnIrsVDSCommand.java @@ -13,6 +13,6 @@ ResourceManager.getInstance().runVdsCommand( VDSCommandType.ResetIrs, new ResetIrsVDSCommandParameters(getParameters().getStoragePoolId(), - getCurrentIrsProxyData().getmCurrentIrsHost(), getCurrentIrsProxyData().getCurrentVdsId())); + getCurrentIrsProxyData().getCurrentVdsId())); } } -- To view, visit http://gerrit.ovirt.org/9025 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa5b20da89594f0fd245cfb87794c29b31273193 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
