- Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: core: MemoryStorageHandler simple predicates
by amureini＠redhat.com 20 Jul '16

20 Jul '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: MemoryStorageHandler simple predicates ...................................................................... core: MemoryStorageHandler simple predicates With Java 8's predicates, The StorageDomainStatusFilter and StorageDomainTypeFilter become one-line lambdas expression, and it's a bit pointless to maintain them as their own classes. This patch removes them and replaces them with public static final members in MemoryStorageHandler. As their respective tests were just re-implementing the exact same logic and checking it against itself. This kind of test is somewhat pointless, so this patch just removes them. Change-Id: I49849a5cc1d97875448462b8e65891d2451976c2 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryStorageHandler.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/sdfilters/StorageDomainStatusFilter.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/sdfilters/StorageDomainTypeFilter.java D backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/sdfilters/StorageDomainStatusFilterTest.java D backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/sdfilters/StorageDomainTypeFilterTest.java 5 files changed, 11 insertions(+), 94 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests Idan Shaby: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/60685 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I49849a5cc1d97875448462b8e65891d2451976c2 Gerrit-PatchSet: 6 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: Remove StorageDomainFilter
by amureini＠redhat.com 20 Jul '16

20 Jul '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: Remove StorageDomainFilter ...................................................................... core: Remove StorageDomainFilter StorageDomainFilter was a wrapper for two methods - an abstract method returning a Predicate and a filterStorageDomains method that applied that filtered a List<StorageDomain> by that predicate. Since in Java 8's filtering a list is so easy, there's really no reason to have this in a dedicated class. This patch removes the StorageDomainFilter class and just keeps the Predicates and moves the filtering to MemoryStorageHandler. A side effect of this patch is a slightly improved performance of the filtering. Even though the current implementation potentially still has to perform M (filters) * N (domains) evaluations, it collects the result only once, instead of having to construct a list M times. Change-Id: I3795e2f81919fbb6ed92636343d04ed913de937f Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryStorageHandler.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/sdfilters/StorageDomainFilter.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/sdfilters/StorageDomainSpaceRequirementsFilter.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/sdfilters/StorageDomainStatusFilter.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/sdfilters/StorageDomainTypeFilter.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/MemoryStorageHandlerTest.java D backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/sdfilters/StorageDomainFilterTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/sdfilters/StorageDomainSpaceRequirementsFilterTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/sdfilters/StorageDomainStatusFilterTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/sdfilters/StorageDomainTypeFilterTest.java 10 files changed, 37 insertions(+), 111 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests Idan Shaby: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/60684 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3795e2f81919fbb6ed92636343d04ed913de937f Gerrit-PatchSet: 6 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: MemoryStorageHandler: reduce a list of Comparators
by amureini＠redhat.com 20 Jul '16

20 Jul '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: MemoryStorageHandler: reduce a list of Comparators ...................................................................... core: MemoryStorageHandler: reduce a list of Comparators This patch streams the list of Comparators and then reduces them instead of reimplementing Java's Stream#reduce. Change-Id: I9c196d6fa486ac28739679b6ee8f3e57702bb45d Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryStorageHandler.java 1 file changed, 4 insertions(+), 6 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests Idan Shaby: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/60683 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9c196d6fa486ac28739679b6ee8f3e57702bb45d Gerrit-PatchSet: 6 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: MemoryStorageHandler: Comparator.comparing
by amureini＠redhat.com 20 Jul '16

20 Jul '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: MemoryStorageHandler: Comparator.comparing ...................................................................... core: MemoryStorageHandler: Comparator.comparing Use Java 8's Comparator.comapring instead of reinventing the wheel. Change-Id: I421e5478088a8b008d3128daa8d25e0bca1b9afc Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryStorageHandler.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/sdcomparators/StorageDomainAvailableDiskSizeComparator.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/sdcomparators/StorageTypeFileFirstComparator.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/sdcomparators/StorageTypeSharedFirstComparator.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/sdcomparators/StorageDomainAvailableDiskSizeComparatorTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/sdcomparators/StorageTypeFileFirstComparatorTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/sdcomparators/StorageTypeSharedFirstComparatorTest.java 7 files changed, 21 insertions(+), 50 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests Idan Shaby: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/60657 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I421e5478088a8b008d3128daa8d25e0bca1b9afc Gerrit-PatchSet: 6 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: MemoryStorageHandler comparators direction
by amureini＠redhat.com 20 Jul '16

20 Jul '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: MemoryStorageHandler comparators direction ...................................................................... core: MemoryStorageHandler comparators direction Define the comparators in the MemoryStorageHandler in positive terms, so the comparators can actually define the order they expect between domains instead of assuming the MemoryStorageHandler will reverse it. Change-Id: Ie1dc03d7a0cb3bd1a03de8e492202d8d9ab164b3 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryStorageHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/sdcomparators/StorageDomainAvailableDiskSizeComparator.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/sdcomparators/StorageDomainNumberOfVmDisksComparator.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/sdcomparators/StorageTypeFileFirstComparator.java R backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/sdcomparators/StorageTypeSharedFirstComparator.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/MemoryStorageHandlerTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/sdcomparators/StorageDomainAvailableDiskSizeComparatorTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/sdcomparators/StorageDomainNumberOfVmDisksComparatorTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/sdcomparators/StorageTypeFileFirstComparatorTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/sdcomparators/StorageTypeSharedFirstComparatorTest.java 10 files changed, 32 insertions(+), 30 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests Idan Shaby: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/60656 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie1dc03d7a0cb3bd1a03de8e492202d8d9ab164b3 Gerrit-PatchSet: 6 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: StorageDomainNumberOfVmDisksComparator domain list
by amureini＠redhat.com 20 Jul '16

20 Jul '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: StorageDomainNumberOfVmDisksComparator domain list ...................................................................... core: StorageDomainNumberOfVmDisksComparator domain list Remove the domain list parameter from StorageDomainNumberOfVmDisksComparator. The list of domains can be inferred from the collection of disks, and any domains missing from that list can assumed to have 0 relevant disks on them by using getOrDefault(key, 0). Change-Id: I24af6711c92f05215846364e85151717aed4a668 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryStorageHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/sdcomparators/StorageDomainNumberOfVmDisksComparator.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/MemoryStorageHandlerTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/sdcomparators/StorageDomainNumberOfVmDisksComparatorTest.java 4 files changed, 12 insertions(+), 26 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests Idan Shaby: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/60654 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I24af6711c92f05215846364e85151717aed4a668 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: StorageDomainNumberOfVmDisksComparator streaming
by amureini＠redhat.com 20 Jul '16

20 Jul '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: StorageDomainNumberOfVmDisksComparator streaming ...................................................................... core: StorageDomainNumberOfVmDisksComparator streaming The StorageDomainNumberOfVmDisksComparator constructor converts a collections of DiskImages to a map from the storage domain id to the number of VMs located on it. This is much easier to do with Java 8's steam APIs instead of reinventing the wheel ourselves. As a side effect of this patch, the Map was converted from Map<Guid, Integer> to Map<Guid, Long> to conform to Collectors.counting()'s API. This may add some minor memory consumption overhead, as Longs are larger than Integers, but this is negligible as this Comparator is extremely short lived. Change-Id: Id8271fd39eb270090f25ebd9bd32351d61fa465b Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/sdcomparators/StorageDomainNumberOfVmDisksComparator.java 1 file changed, 7 insertions(+), 15 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests Idan Shaby: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/60655 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8271fd39eb270090f25ebd9bd32351d61fa465b Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: rm MemoryStorageHandleTest#StorageDomainRejectingFilter
by amureini＠redhat.com 20 Jul '16

20 Jul '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: rm MemoryStorageHandleTest#StorageDomainRejectingFilter ...................................................................... core: rm MemoryStorageHandleTest#StorageDomainRejectingFilter StorageDomainRejectingFilter can be replaced with a one-liner simple lambda, there's no reason to bloat the code with an entire class for it. Change-Id: Ida531dfa246761b6d508e53ad3a64fa370e7d5a8 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/MemoryStorageHandlerTest.java 1 file changed, 4 insertions(+), 18 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests Idan Shaby: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/60690 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ida531dfa246761b6d508e53ad3a64fa370e7d5a8 Gerrit-PatchSet: 7 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: MemoryStorageHandlerTest collections
by amureini＠redhat.com 20 Jul '16

20 Jul '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: MemoryStorageHandlerTest collections ...................................................................... core: MemoryStorageHandlerTest collections Use Collections.singletonList instead of Arrays.asList with a single argument for a [minor] performance improvement. Change-Id: I028ce83a8a6b56f58672458a21e5767c3bf312f4 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/MemoryStorageHandlerTest.java 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests Idan Shaby: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/60689 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I028ce83a8a6b56f58672458a21e5767c3bf312f4 Gerrit-PatchSet: 7 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: MemoryStorageHandlerTest type inference
by amureini＠redhat.com 20 Jul '16

20 Jul '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: MemoryStorageHandlerTest type inference ...................................................................... core: MemoryStorageHandlerTest type inference Change-Id: Icce372e7bedb9bd2c461efb9827ed6dceac7f3d8 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/memory/MemoryStorageHandlerTest.java 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests Idan Shaby: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/60688 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icce372e7bedb9bd2c461efb9827ed6dceac7f3d8 Gerrit-PatchSet: 7 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0