Alona Kaplan has submitted this change and it was merged. Change subject: engine: Block GetCaps and SetupNetworks running in parallel ...................................................................... engine: Block GetCaps and SetupNetworks running in parallel - The monitoring-lock was expanded to the whole SetupNetworks execution. All the refreshCaps calls already have monitoring lock. - Since the monitoring lock is a waiting lock, added the exlusive lock of SetupNetworks (with non-waiting manner) to the getCaps event mechanism. Change-Id: Iea864d9159358cc67d5fd305f2ff8e5ac796dc6e Bug-Url: https://bugzilla.redhat.com/1324479 Signed-off-by: Alona Kaplan <alkaplan@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HostLocking.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RefreshHostCapabilitiesCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdsEventListener.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/EngineMessage.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/HostConnectionRefresher.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/frontend/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 12 files changed, 55 insertions(+), 31 deletions(-) Approvals: Alona Kaplan: Verified; Passed CI tests Moti Asayag: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/59318 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iea864d9159358cc67d5fd305f2ff8e5ac796dc6e Gerrit-PatchSet: 9 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <alkaplan@redhat.com> Gerrit-Reviewer: Alona Kaplan <alkaplan@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Mucha <mmucha@redhat.com> Gerrit-Reviewer: Moti Asayag <masayag@redhat.com> Gerrit-Reviewer: Yevgeny Zaspitsky <yzaspits@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>