Tal Nisan has uploaded a new change for review. Change subject: core: Avoid unnecessary VDSM update pool calls when no domains in pool ......................................................................
core: Avoid unnecessary VDSM update pool calls when no domains in pool If a pool does not have a master domain, there is no point to call VDSM commands to update the pool Change-Id: I8302972bb21fa076cd35fb308f5f660ca9200daa Signed-off-by: Tal Nisan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java 1 file changed, 10 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/23410/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 7d215eb..6577094 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 @@ -56,7 +56,7 @@ @Override protected void executeCommand() { updateQuotaCache(); - if (_oldStoragePool.getStatus() == StoragePoolStatus.Up) { + if (_oldStoragePool.getStatus() == StoragePoolStatus.Up && getMasterDomain() != null) { if (!StringUtils.equals(_oldStoragePool.getName(), getStoragePool().getName())) { runVdsCommand(VDSCommandType.SetStoragePoolDescription, new SetStoragePoolDescriptionVDSCommandParameters( @@ -96,8 +96,10 @@ return; } - StorageType spType = storagePool.getStorageType(); - final StorageFormatType targetFormat = VersionStorageFormatUtil.getPreferredForVersion(spVersion, spType); + + + final StorageFormatType targetFormat = + VersionStorageFormatUtil.getPreferredForVersion(spVersion, getMasterDomain() == null ? null : getMasterDomain().getStorageType()); storagePool.setStoragePoolFormatType(targetFormat); @@ -105,13 +107,15 @@ new TransactionMethod<Object>() { @Override public Object runInTransaction() { - getStoragePoolDAO().updatePartial(storagePool); - updateMemberDomainsFormat(targetFormat); + getStoragePoolDAO().updatePartial(storagePool); + if (getMasterDomain() != null) { + updateMemberDomainsFormat(targetFormat); + } return null; } }); - if (_oldStoragePool.getStatus() == StoragePoolStatus.Up) { + if (_oldStoragePool.getStatus() == StoragePoolStatus.Up && getMasterDomain() != null) { try { // No need to worry about "reupgrading" as VDSM will silently ignore // the request. -- To view, visit http://gerrit.ovirt.org/23410 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8302972bb21fa076cd35fb308f5f660ca9200daa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
