Red Hat Bugzilla – Bug 1559544
[RFE] Collect Container Project Quota Historical data in Project Roll-up
Last modified: 2018-05-07 16:47:29 EDT
New commits detected on ManageIQ/manageiq/gaprindashvili: https://github.com/ManageIQ/manageiq/commit/6864c7f34a52560658448dd73bd4ee66e245a8f3 commit 6864c7f34a52560658448dd73bd4ee66e245a8f3 Author: Adam Grare <agrare@redhat.com> AuthorDate: Mon Feb 26 09:38:22 2018 -0500 Commit: Adam Grare <agrare@redhat.com> CommitDate: Mon Feb 26 09:38:22 2018 -0500 Merge pull request #17020 from cben/deserializable_keys Compare decimal columns correctly in batch saver (cherry picked from commit d3f73488d6fc9ad878ae9192c5437ba6916d588e) https://bugzilla.redhat.com/show_bug.cgi?id=1559544 app/models/manager_refresh/save_collection/saver/base.rb | 17 +- app/models/manager_refresh/save_collection/saver/concurrent_safe_batch.rb | 15 +- spec/models/manager_refresh/save_inventory/init_data_helper.rb | 19 + spec/models/manager_refresh/save_inventory/saver_strategies_spec.rb | 40 + spec/models/manager_refresh/save_inventory/spec_parsed_data.rb | 15 + 5 files changed, 99 insertions(+), 7 deletions(-) https://github.com/ManageIQ/manageiq/commit/b7feaddc588c85b4903a9859de382bf12267ae96 commit b7feaddc588c85b4903a9859de382bf12267ae96 Author: Adam Grare <agrare@redhat.com> AuthorDate: Tue Mar 13 15:42:23 2018 -0400 Commit: Adam Grare <agrare@redhat.com> CommitDate: Tue Mar 13 15:42:23 2018 -0400 Merge pull request #16722 from cben/quota-history Keep container quota history by archiving (cherry picked from commit ffd2be0fd1b9ec6b7816d2622bae408e6f75b741) https://bugzilla.redhat.com/show_bug.cgi?id=1559544 app/models/container_project.rb | 3 +- app/models/container_quota.rb | 25 +- app/models/container_quota_item.rb | 14 + app/models/ems_refresh/save_inventory_container.rb | 8 +- app/models/manageiq/providers/container_manager.rb | 3 +- 5 files changed, 48 insertions(+), 5 deletions(-)
New commits detected on ManageIQ/manageiq-providers-kubernetes/gaprindashvili: https://github.com/ManageIQ/manageiq-providers-kubernetes/commit/33cb4d2fdced67872f5f61a0ca591cc5f295544f commit 33cb4d2fdced67872f5f61a0ca591cc5f295544f Author: Mooli Tayer <mtayer@redhat.com> AuthorDate: Thu Jan 11 08:47:13 2018 -0500 Commit: Mooli Tayer <mtayer@redhat.com> CommitDate: Thu Jan 11 08:47:13 2018 -0500 Merge pull request #193 from cben/vcr-spec-counts refresher_spec: Refactor counts assertions, check volumes after deletions (cherry picked from commit a80fca529c956c732afdc594402fdb8638192801) https://bugzilla.redhat.com/show_bug.cgi?id=1559544 spec/models/manageiq/providers/kubernetes/container_manager/refresher_spec.rb | 81 +- 1 file changed, 48 insertions(+), 33 deletions(-) https://github.com/ManageIQ/manageiq-providers-kubernetes/commit/a8fa11f74ba56063be14e1ee9f74b11461791b02 commit a8fa11f74ba56063be14e1ee9f74b11461791b02 Author: Mooli Tayer <mtayer@redhat.com> AuthorDate: Mon Jan 29 00:48:02 2018 -0500 Commit: Mooli Tayer <mtayer@redhat.com> CommitDate: Mon Jan 29 00:48:02 2018 -0500 Merge pull request #216 from cben/quota-tests Updated VCR from openshift repo, updated quota & volume specs (cherry picked from commit ca27fb701363dc6e8bb17a93c17d60b2c1785443) https://bugzilla.redhat.com/show_bug.cgi?id=1559544 spec/models/manageiq/providers/kubernetes/container_manager/refresher_spec.rb | 152 +- spec/vcr_cassettes/manageiq/providers/kubernetes/container_manager/refresher_after_deletions.txt | 119 + spec/vcr_cassettes/manageiq/providers/kubernetes/container_manager/refresher_after_deletions.yml | 6246 +- spec/vcr_cassettes/manageiq/providers/kubernetes/container_manager/refresher_before_deletions.txt | 146 + spec/vcr_cassettes/manageiq/providers/kubernetes/container_manager/refresher_before_deletions.yml | 6283 +- 5 files changed, 3395 insertions(+), 9551 deletions(-) https://github.com/ManageIQ/manageiq-providers-kubernetes/commit/ca32b8981e6b7aee82177e1ff39673136535aa8a commit ca32b8981e6b7aee82177e1ff39673136535aa8a Author: Adam Grare <agrare@redhat.com> AuthorDate: Tue Mar 13 15:53:05 2018 -0400 Commit: Adam Grare <agrare@redhat.com> CommitDate: Tue Mar 13 15:53:05 2018 -0400 Merge pull request #198 from cben/quota-history Keep quota history by archiving (cherry picked from commit 5ec31943f85dcbdbc1f37026430019bffcc6ed60) https://bugzilla.redhat.com/show_bug.cgi?id=1559544 app/models/manageiq/providers/kubernetes/container_manager/inventory_collections.rb | 11 +- app/models/manageiq/providers/kubernetes/container_manager/refresh_parser.rb | 27 +- manageiq-providers-kubernetes.gemspec | 1 + spec/models/manageiq/providers/kubernetes/container_manager/refresher_spec.rb | 49 +- 4 files changed, 60 insertions(+), 28 deletions(-)
New commit detected on ManageIQ/manageiq-providers-openshift/gaprindashvili: https://github.com/ManageIQ/manageiq-providers-openshift/commit/75da91217e4c4a44f72a3297e65979ca1914bcac commit 75da91217e4c4a44f72a3297e65979ca1914bcac Author: Mooli Tayer <mtayer@redhat.com> AuthorDate: Mon Jan 29 00:47:16 2018 -0500 Commit: Mooli Tayer <mtayer@redhat.com> CommitDate: Mon Jan 29 00:47:16 2018 -0500 Merge pull request #83 from cben/vcr-for-kubernetes-too VCR updates for tests in kubernetes repo (cherry picked from commit 542fa531611ea6c100d7382f3b13698d64bd6034) https://bugzilla.redhat.com/show_bug.cgi?id=1559544 spec/models/manageiq/providers/openshift/container_manager/refresher_spec.rb | 8 +- spec/vcr_cassettes/manageiq/providers/openshift/container_manager/refresher_after_deletions.txt | 162 +- spec/vcr_cassettes/manageiq/providers/openshift/container_manager/refresher_after_deletions.yml | 1626 +- spec/vcr_cassettes/manageiq/providers/openshift/container_manager/refresher_before_deletions.txt | 194 +- spec/vcr_cassettes/manageiq/providers/openshift/container_manager/refresher_before_deletions.yml | 1657 +- spec/vcr_cassettes/manageiq/providers/openshift/container_manager/test_objects_record.sh | 39 +- spec/vcr_cassettes/manageiq/providers/openshift/container_manager/test_objects_template.yml | 94 +- 7 files changed, 1926 insertions(+), 1854 deletions(-)
New commit detected on ManageIQ/manageiq/gaprindashvili: https://github.com/ManageIQ/manageiq/commit/9eab6ed7184247107950a79187c496e80f5e3026 commit 9eab6ed7184247107950a79187c496e80f5e3026 Author: Satoe Imaishi <simaishi@redhat.com> AuthorDate: Fri Mar 23 14:24:35 2018 -0400 Commit: Satoe Imaishi <simaishi@redhat.com> CommitDate: Fri Mar 23 14:24:35 2018 -0400 Revert "Merge pull request #17020 from cben/deserializable_keys" This reverts commit 6864c7f34a52560658448dd73bd4ee66e245a8f3. https://bugzilla.redhat.com/show_bug.cgi?id=1559544 app/models/manager_refresh/save_collection/saver/base.rb | 17 +- app/models/manager_refresh/save_collection/saver/concurrent_safe_batch.rb | 15 +- spec/models/manager_refresh/save_inventory/init_data_helper.rb | 19 - spec/models/manager_refresh/save_inventory/saver_strategies_spec.rb | 40 - spec/models/manager_refresh/save_inventory/spec_parsed_data.rb | 15 - 5 files changed, 7 insertions(+), 99 deletions(-)
New commit detected on ManageIQ/manageiq/gaprindashvili: https://github.com/ManageIQ/manageiq/commit/d583069e8931ca425d11b68d2fa51f3f72b189e3 commit d583069e8931ca425d11b68d2fa51f3f72b189e3 Author: Keenan Brock <keenan@thebrocks.net> AuthorDate: Thu Mar 22 13:06:04 2018 -0400 Commit: Keenan Brock <keenan@thebrocks.net> CommitDate: Thu Mar 22 13:06:04 2018 -0400 Merge pull request #17167 from cben/quota-purging Purging of ContainerQuota & ContainerQuotaItem (cherry picked from commit 388f266cce5d4588325de3f961dc14873db20a9c) https://bugzilla.redhat.com/show_bug.cgi?id=1559544 app/models/container_quota.rb | 1 + app/models/container_quota/purging.rb | 25 + app/models/container_quota_item.rb | 1 + app/models/container_quota_item/purging.rb | 20 + app/models/miq_schedule_worker/jobs.rb | 2 + config/settings.yml | 1 + spec/models/container_quota/purging_spec.rb | 63 + spec/models/container_quota_item/purging_spec.rb | 70 + 8 files changed, 183 insertions(+)
#17020 backport, take two: https://github.com/ManageIQ/manageiq/pull/17214
New commits detected on ManageIQ/manageiq/gaprindashvili: https://github.com/ManageIQ/manageiq/commit/b45b8deafddee145e21d61be45a90b3743e4514f commit b45b8deafddee145e21d61be45a90b3743e4514f Author: Beni Cherniavsky-Paskin <cben@redhat.com> AuthorDate: Tue Mar 27 12:46:27 2018 -0400 Commit: Beni Cherniavsky-Paskin <cben@redhat.com> CommitDate: Tue Mar 27 12:46:27 2018 -0400 Revert "Revert "Merge pull request #17020 from cben/deserializable_keys"" This reverts commit 9eab6ed7184247107950a79187c496e80f5e3026, again merging pull request #17020 from cben/deserializable_keys Compare decimal columns correctly in batch saver (cherry picked from commit d3f73488d6fc9ad878ae9192c5437ba6916d588e) https://bugzilla.redhat.com/show_bug.cgi?id=1559544 app/models/manager_refresh/save_collection/saver/base.rb | 17 +- app/models/manager_refresh/save_collection/saver/concurrent_safe_batch.rb | 15 +- spec/models/manager_refresh/save_inventory/init_data_helper.rb | 19 + spec/models/manager_refresh/save_inventory/saver_strategies_spec.rb | 40 + spec/models/manager_refresh/save_inventory/spec_parsed_data.rb | 15 + 5 files changed, 99 insertions(+), 7 deletions(-) https://github.com/ManageIQ/manageiq/commit/2d79f26398faef2e3611009411b90caf4057e210 commit 2d79f26398faef2e3611009411b90caf4057e210 Author: Ladislav Smola <lsmola@redhat.com> AuthorDate: Fri Mar 23 12:35:29 2018 -0400 Commit: Ladislav Smola <lsmola@redhat.com> CommitDate: Fri Mar 23 12:35:29 2018 -0400 In g release, lazy_find accepts only string https://bugzilla.redhat.com/show_bug.cgi?id=1559544 spec/models/manager_refresh/save_inventory/saver_strategies_spec.rb | 6 +- 1 file changed, 4 insertions(+), 2 deletions(-)
AFAICT, all PRs have been backported. Tests pass (re-tested provider repos on travis after backporting) and minimal manual testing done (refreshed, edited one quota & deleted another, refreshed, DB looks good).
Since the problem described in this bug report should be resolved in a recent advisory, it has been closed with a resolution of ERRATA. For information on the advisory, and where to find the updated files, follow the link below. If the solution does not work for you, open a new bug report. https://access.redhat.com/errata/RHSA-2018:1328