Tal Nisan has submitted this change and it was merged. Change subject: core: ensure unique unit for VirtIO_SCSI and SPAR_VSCSI disks ...................................................................... core: ensure unique unit for VirtIO_SCSI and SPAR_VSCSI disks Ensuring a unique address unit value for disks attached with VirtIO_SCSI or SPAR_VSCSI interfaces. The selected units may collide as the search process is depended on the VmDevice addresses which are updated asynchronously by the VmsMonitoring. E.g. when hot-plugging multiple disks using a script, identical unit values might be selected for different disks. Hence: * Moved address creation logic to BLL layer (AbstractDiskVmCommand). * Updating VmDevice address in DB right after selecting an available unit value. * Taking an EngineLock on 'getDiskAddressMap' method to avoid races. Change-Id: I5e621618e8891fca52b48bff437cc4c2a1f695db Bug-Url: https://bugzilla.redhat.com/1206374 Signed-off-by: Daniel Erez <derez(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/locks/LockingGroup.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HotPlugDiskVDSParameters.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugDiskVDSCommand.java 4 files changed, 112 insertions(+), 62 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Daniel Erez: Verified Jenkins CI: Verified; Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/42019 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5e621618e8891fca52b48bff437cc4c2a1f695db Gerrit-PatchSet: 7 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Daniel Erez <derez(a)redhat.com&gt; Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt; Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com&gt; Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com&gt; Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com&gt; Gerrit-Reviewer: automation(a)ovirt.org