Eli Mesika has submitted this change and it was merged. Change subject: core: Deadlock detected when performing plug/unplug VNIC action ...................................................................... core: Deadlock detected when performing plug/unplug VNIC action A previous patch already sorted all updates by the entity ID. This patch makes sure that VmDeviceUtil.updateBootOrderInVmDeviceAndStoreToDB stores in a batch a sorted list of the VmDevices, so that no dead lock can occur. As a side effect, a performance boost for the update occurs, as instead of in a loop all updates go through batch. Change-Id: I40e04d943076d046c379d40004157585cb141771 Bug-Url: https://bugzilla.redhat.com/1102689 Signed-off-by: lzelkha(a)redhat.com <lzelkha(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDeviceDAO.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDeviceDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmDeviceDAOTest.java 4 files changed, 43 insertions(+), 7 deletions(-) Approvals: Liran Zelkha: Verified Yair Zaslavsky: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/28830 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I40e04d943076d046c379d40004157585cb141771 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liran Zelkha <lzelkha(a)redhat.com&gt; Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com&gt; Gerrit-Reviewer: Eli Mesika <elimesika(a)gmail.com&gt; Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com&gt; Gerrit-Reviewer: Liran Zelkha <lzelkha(a)redhat.com&gt; Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com&gt; Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com&gt; Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com&gt; Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server