(#17371) Re-initialize settings metadata after run_mode determined #1361
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
Currently metadata for settings (e.g. mode, owner) is initialized during parsing of the config file, at which point the run_mode isn't known. The initialization loops over each section of the config and since one of the sections is determined by the run_mode, this means it doesn't get searched. Setting file metadata inside a section such as [master] has no effect. This patch causes the setting metadata to be set twice - once during early startup before the run_mode is known (for settings used globally) and again once the run_mode is known so that configuration in specialised sections take effect.
zaphod42
added a commit
that referenced
this pull request
Jan 3, 2013
(#17371) Re-initialize settings metadata after run_mode determined
|
|
||
| on(agent, puppet('master', '--compile', 'fake_node', '--confdir', get_test_file_path(agent, ''))) | ||
|
|
||
| on(agent, "stat --format '%U:%G %a' #{logdir}") do |
There was a problem hiding this comment.
@zaphod42 I started down a similar path of using stat directly to retrieve file modes, but the --format option isn't supported on the version I have on my mac (we don't run the acceptance tests on that, yet). Instead there's:
$ stat -f %p foo.txt 100755
Note that it includes S_IFREG in the resulting mode, whereas on GNU coreutils stat, I just get 755.
I assume the --format option is only supported on the version in GNU coreutils, but I don't know if that is on our Solaris acceptance test VM, and I have no idea what Windows will do here.
It may be better to invoke ruby -e to stat the file, and mask off any higher order bits S_IFREG, etc.
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.
Currently metadata for settings (e.g. mode, owner) is initialized during
parsing of the config file, at which point the run_mode isn't known. The
initialization loops over each section of the config and since one of the
sections is determined by the run_mode, this means it doesn't get
searched. Setting file metadata inside a section such as [master] has no
effect.
This patch causes the setting metadata to be set twice - once during early
startup before the run_mode is known (for settings used globally) and
again once the run_mode is known so that configuration in specialised
sections take effect.
Overrides PR #1316