From Allon Mureinik <amureini(a)redhat.com>:
Allon Mureinik has submitted this change and it was merged. (
https://gerrit.ovirt.org/79381 )
Change subject: core: DiskValidator#isDiskPluggedToAnyNonDownVm(true)
......................................................................
core: DiskValidator#isDiskPluggedToAnyNonDownVm(true)
Commit 8d3cc2 unified the functionality of
isDiskPluggedToAnyNonDownVm and isDiskPluggedToVmsThatAreNotDown, but
botched the condition where checkOnlyVmsSnapshotPluggedTo=true.
In case it was set to true, the original
isDiskPluggedToVmsThatAreNotDown skipped VMs that had snapshots
plugged to them, while the unified code includes them in the filter
instead of excluding them.
This patch rectifies that mistake, and adds a proper test to assure
it is not broken again.
Change-Id: Ib7c02f8f621b98f252e8d81bcf3852c5a8d8fdf6
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/storage/DiskValidator.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/storage/DiskValidatorTest.java
2 files changed, 17 insertions(+), 4 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Allon Mureinik: Verified; Looks good to me, approved
--
To view, visit
https://gerrit.ovirt.org/79381
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7c02f8f621b98f252e8d81bcf3852c5a8d8fdf6
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>