Arik Hadas has submitted this change and it was merged. Change subject: core: restructuring proceedDownVm ...................................................................... core: restructuring proceedDownVm 1. Early return if the status of the VM is not down to reduce nested levels 2. Do the destroy first, then continue with other processing 3. This method handles 3 cases: - hibernation (SavingState -> Down) - failure in migration source (MigratingFrom -> Down) - other cases (* -> Down) A switch-case representation is more declarative for that. Change-Id: Ib4377a0bafbbfc32dd5b3b7ccc0f843d462be8e6 Signed-off-by: Arik Hadas <ahadas(a)redhat.com&gt; --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VmAnalyzer.java 1 file changed, 33 insertions(+), 25 deletions(-) Approvals: Shahar Havivi: Looks good to me, approved Jenkins CI: Passed CI tests Arik Hadas: Verified -- To view, visit https://gerrit.ovirt.org/55734 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib4377a0bafbbfc32dd5b3b7ccc0f843d462be8e6 Gerrit-PatchSet: 7 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com&gt; Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com&gt; Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com&gt; Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;