(maint) Merge 6.4.x to master #7983
Merged
+146
−57
Conversation
This file contains hidden or 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
To prevent thundering herds, puppetserver may return Retry-After and ask the agent to sleep. When this happens, this commit closes the connection prior to sleeping. It also ensures that closed connections are not added back to the pool. This reduces resource usage on puppetserver.
…alias-fix-comma-inside-commands-handling (PUP-10287) mailalias: comma inside commands fix
(PUP-10227) Close the HTTP connection
Previous to this commit, the puppet settings defaults were loaded when the defaults.rb file was required. That design makes it difficult to generate new settings objects; additionally, code that executes by simply requiring the file seems less than ideal. This change stops the code from executing by simply requiring the defaults.rb file, and refactors it to become a class method that modifies a settings object that is passed in. As a result of this refactor, the `Puppet.define_settings` method is no longer required as a bridge to the @@settings object and is set as deprecated.
This is a separate commit to keep the white space change for all the settings contained.
…ctor-settings-to-55x (PUP-10142) refactor settings initialization
Stub the "Net::HTTP#started?" method so finish happens as expected. Protect against Net::HTTP#finish being called twice, and ensure the "Closing connection" debug message is printed after the redirect, since Pool#close_connection will be a noop.
(PUP-10227) Preserve expectation for http.finish
This reverts commit a5ae340.
* 5.5.x:
Revert "(PUP-10142) Add white space for #initialize_default_settings!"
(PUP-10227) Preserve expectation for http.finish
(PUP-10142) Add white space for #initialize_default_settings!
(PUP-10142) Refactor settings default initialization
(PUP-10287) mailalias: comma inside commands fix
(PUP-10227) Close the HTTP connection
Conflicts:
lib/puppet/defaults.rb
lib/puppet/network/http/pool.rb
lib/puppet/provider/mailalias/aliases.rb
spec/fixtures/integration/provider/mailalias/aliases/test1
spec/unit/network/http/connection_spec.rb
Mailalias was removed in puppet 6
Replaced `Puppet.settings` with `settings` in:
settings.override_default(:catalog_cache_terminus, :store_configs)
Updates the nocache_pool to finish the connection if it's been started. In
5.5.x, the nocache pool did not explicitly start and finish connections, but
that was modified in d46a3b1.
Previously our default value of strict_hostname_checking was false which allowed matching dotted segments of a nodes certname (its CN in its certificate) as well as the segments of its fqdn fact, or hostname + domain fact. This was for compatibility when fact based classification within a site.pp was a more common pattern and node declarations were much less powerful than they are now. With the ability to use regular expressions in a node declaration the auto segmenting is no longer needed and with the ability to use facts directly, to use fact interpetation in hiera lookups, or create a custom external node classifier the injecting of facts into the nodes "name" is unneeded. The desire is to remove the setting completely in Puppet 7, while leaving it in 6 so those that depend on this behavior have time to re-write their site.pps to the newer styles. strict_hostname_checking setting is not marked deprecated completely because it will cause deprecation notices on setting access, which happens as part of normal compilation for now. However it does mark "node_name" setting as deprecated completely because it is now only referenced in code that by default will not run (and will only run if users change strict_hostname_checking back to false).
(maint) Merge 5.5.x to 6.4.x
(PUP-10238) Change default value of strict_hostname_checking to true
* upstream/5.5.x: (PUP-10238) Change default value of strict_hostname_checking to true
* upstream/6.4.x: (PUP-10238) Change default value of strict_hostname_checking to true Revert "(PUP-10142) Add white space for #initialize_default_settings!" (PUP-10227) Preserve expectation for http.finish (PUP-10142) Add white space for #initialize_default_settings! (PUP-10142) Refactor settings default initialization (PUP-10287) mailalias: comma inside commands fix (PUP-10227) Close the HTTP connection Conflicts: lib/puppet/defaults.rb Conflict due to new facterng setting in master. Remove "dynamic constant assignment" rubocop error.
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.