From Piotr Kliczewski <piotr.kliczewski(a)gmail.com>:
Piotr Kliczewski has submitted this change and it was merged.
Change subject: core: fix possible deadlock
......................................................................
core: fix possible deadlock
VmsMonitoring.analyzeVms() method takes a lock for each VM,
which will not be unlocked when an exception is thrown
inside VmAnalyzer.analyze().
On exception, analyzeVms() will not return anything and
the calling method, perform(), will call unlockVms()
with an empty list.
Change-Id: I5926f935e64f51a17a3ff0ca8a19309ae7792b0c
Bug-Url:
https://bugzilla.redhat.com/1391933
Signed-off-by: Andrej Krejcir <akrejcir(a)redhat.com>
Signed-off-by: Arik Hadas <ahadas(a)redhat.com>
---
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VmsMonitoring.java
1 file changed, 12 insertions(+), 3 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Arik Hadas: Verified; Looks good to me, approved
--
To view, visit
https://gerrit.ovirt.org/67036
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5926f935e64f51a17a3ff0ca8a19309ae7792b0c
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0.6
Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>