Allon Mureinik has submitted this change and it was merged. Change subject: core: fix free space validation when performing merge ...................................................................... core: fix free space validation when performing merge When performing a merge operation on snapshot consisting of multiple disks on the same storage domain, the operation will fail because of IllegalStateException caused by duplicate key, because a separate entry is created for each disk and because they are on the same storage domain, the map will have the same key for multiple entries. This is solved by mapping a storage domain (guid) to a list of SubchainInfo instead, this way all subchains from the same domain will be under the same entry. Change-Id: Ie60744140d84f979732e352559d49a1c1cfbf143 Bug-Url: https://bugzilla.redhat.com/1450866 Signed-off-by: Benny Zlotnik <bzlotnik(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/storage/MultipleStorageDomainsValidator.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/storage/StorageDomainValidator.java 2 files changed, 18 insertions(+), 11 deletions(-) Approvals: Benny Zlotnik: Verified Jenkins CI: Passed CI tests Allon Mureinik: Looks good to me, approved Ala Hino: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/76854 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie60744140d84f979732e352559d49a1c1cfbf143 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Benny Zlotnik <bzlotnik(a)redhat.com&gt; Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Benny Zlotnik <bzlotnik(a)redhat.com&gt; Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;