Fixes #28894 - load the pools from AR database instead of Candlepin #8550
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Can one of the admins verify this patch? |
matt8754
changed the title
matt8754
changed the title
|
[ok to test] |
|
@matt8754 how is a good way to test this, how many subs/hosts do you need? |
|
This is a good change. I can see an unnecessary call being made to candlepin before: after: I verified that this does not affect the output of the API. |
jturel
suggested changes
Jan 31, 2020
| @@ -5,8 +5,7 @@ module Glue::Candlepin::CandlepinObject | |||
| module ClassMethods | |||
| def get_for_organization(organization) | |||
| # returns objects from AR database rather than candlepin data | |||
| pool_ids = self.get_for_owner(organization.label).collect { |x| x['id'] } | |||
| self.where(:cp_id => pool_ids) | |||
| self.where(:organization => organization) | |||
There was a problem hiding this comment.
It looks like this method is only used in one place, and I don't think it makes sense to have a separate method anymore since it only has a single where clause.
Let's remove this method and update subscriptions_controller.rb:
+++ b/app/controllers/katello/api/v2/subscriptions_controller.rb
@@ -65,7 +65,7 @@ module Katello
return available_for_activation_key if params[:available_for] == "activation_key"
collection = Pool.readable
collection = collection.where(:unmapped_guest => false)
- collection = collection.get_for_organization(Organization.find(params[:organization_id])) if params[:organization_id]
+ collection = collection.where(organization: Organization.find(params[:organization_id])) if params[:organization_id]
collection = collection.for_activation_key(@activation_key) if params[:activation_key_id]
collection
end
I think the tests will need to be updated. You can verify locally with:
ktest ./test/controllers/api/v2/subscriptions_controller_test.rb
There was a problem hiding this comment.
Thanks, Jonathon. This is exactly what I came out first. However, I was worried about breaking the tests as they call get_for_organization. I'll take a look further for that.
Ideally, it would be good to have 3K+ hypervisors with the VDC sub attached. This would match the customer's env from which the issue happens. |
In case there is a large list of pools, this will improve the speed when loading up the subscription page.
|
[test katello] |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In case there is a large list of pools, this will improve the speed when loading up the subscription page.