improve daemon config reload; log active configuration #36019
Merged
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
a6993a4 to
2e17680
Compare
kolyshkin
reviewed
Jan 19, 2018
daemon/reload.go
Outdated
| return err | ||
| } | ||
| return nil | ||
| return daemon.reloadNetworkDiagnosticPort(conf, attributes) |
There was a problem hiding this comment.
I would not change this, otherwise if later you'll want to add another call, say daemon.reloadFooBar, you have to revert this back. Just a nipick of course.
|
LGTM |
2e17680 to
3dbb3e6
Compare
Signed-off-by: Sebastiaan van Stijn <[email protected]>
When succesfully reloading the daemon configuration, print a message
in the logs with the active configuration:
INFO[2018-01-15T15:36:20.901688317Z] Got signal to reload configuration, reloading from: /etc/docker/daemon.json
INFO[2018-01-14T02:23:48.782769942Z] Reloaded configuration: {"mtu":1500,"pidfile":"/var/run/docker.pid","data-root":"/var/lib/docker","exec-root":"/var/run/docker","group":"docker","deprecated-key-path":"/etc/docker/key.json","max-concurrent-downloads":3,"max-concurrent-uploads":5,"shutdown-timeout":15,"debug":true,"hosts":["unix:///var/run/docker.sock"],"log-level":"info","swarm-default-advertise-addr":"","metrics-addr":"","log-driver":"json-file","ip":"0.0.0.0","icc":true,"iptables":true,"ip-forward":true,"ip-masq":true,"userland-proxy":true,"disable-legacy-registry":true,"experimental":false,"network-control-plane-mtu":1500,"runtimes":{"runc":{"path":"docker-runc"}},"default-runtime":"runc","oom-score-adjust":-500,"default-shm-size":67108864,"default-ipc-mode":"shareable"}
Signed-off-by: Sebastiaan van Stijn <[email protected]>
3dbb3e6 to
8378dcf
Compare
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.
relates to:
docker infosuch as --init #31381 Expose daemon config state through thedocker infosuch as --initWhen reloading the daemon configuration file, log the active configuration after successfully reloading. Also do a small refactor, and move reload-related functions to
reload_XX.gofilesNote that configuration reloading is currently not an atomic operation; this is something we need to address: it's currently possible that only "half" of the configuration changes are loaded (which is not desirable).