Cherry Picks for 3.3.1 #6662
Merged
Cherry Picks for 3.3.1 #6662
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
During fact importing, RhsmFactName objects are created in large quantity. Because first_or_create is very susceptible to race conditions, we rescue on RecordNotUnique within RhsmFactImporter#add_fact_name. However if duplicate record exception is thrown while in a transaction the entire transaction is aborted. The run phase does not use a transaction so the problem should not occur there. (cherry picked from commit 98bb66d)
(cherry picked from commit 62b3048)
Previously, an error with stack trace was logged when a host was not found by the katello_events job listener. Instead, just log a warning and move on. The `run` phase also checks if `@host` is set, so there's no need to raise an exeception. (cherry picked from commit 6ccc80f)
(cherry picked from commit ffe7dec)
Go to Content -> Errata and select the Installable check box Prior to this commit the "installable_for_hosts" method would create a introduce an extra 'inner join' causing the query to perform painfully slow. This commit fixes that by selectively adding that duplicate join table only if required. The installable repo query also had a duplicate join for the katello errata table. Which got removed in this commit Also fixed the unit tests to highlight the point that "Installable Errata" is determined by the repositories bound to that host. Basically the query says "Find all applicable errata on this host. Filter this list further by only including those repos that are enabled on this host" Fixed the unit tests to something that make more sense. Installable errata is determined purely by the repos that are bound to the host. It does not really matter what environment/content view this host belongs. CVE gives the master list of repos available to the host of which only a subset are enabled or bound. (cherry picked from commit bd158ce)
Org destroy was not properly unassociating environments and content views from hosts + hostgroups. Updated the plan to handle that (cherry picked from commit c6a4c5b)
(cherry picked from commit 630b33f)
(cherry picked from commit ef20b99)
For Puppet 3 to Puppet 4 upgrades, the distributor path for puppet content changes. When publishing or promoting we need to ensure that this update is detected and content lands in the new location. (cherry picked from commit 2b86ed7)
and instead require that a capsule object be present, and default to the default capsule (cherry picked from commit 51811d4)
(cherry picked from commit 22c390c)
|
@ehelms, thanks for your PR! By analyzing the history of the files in this pull request, we identified @jlsherrill, @parthaa and @johnpmitsch to be potential reviewers. |
|
There were the following issues with the commit message:
If you don't have a ticket number, please create an issue in Redmine. More guidelines are available in Coding Standards or on the Foreman wiki. This message was auto-generated by Foreman's prprocessor |
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.
No description provided.