Pass log-level to containerd #37419
Merged
Pass log-level to containerd #37419
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
thaJeztah
added
area/runtime
status/2-code-review
impact/changelog
and removed
status/0-triage
labels
|
ping @mlaventure @vdemeester PTAL I'm wondering if we should remove the default moby/libcontainerd/remote_daemon_linux.go Lines 31 to 33 in fd2f2a9 |
vdemeester
approved these changes
Jul 9, 2018
|
Let me update the PR and remove the default |
dockerd allows the `--log-level` to be specified, but this log-level was not forwarded to the containerd process. This patch sets containerd's log-level to the same as dockerd if a custom level is provided. Now that `--log-level` is also passed to containerd, the default "info" is removed, so that containerd's default (or the level configured in containerd.toml) is still used if no log-level is set. Before this change: containerd would always be started without a log-level set (only the level that's configured in `containerd.toml`); ``` root 1014 2.5 2.1 496484 43468 pts/0 Sl+ 12:23 0:00 dockerd root 1023 1.2 1.1 681768 23832 ? Ssl 12:23 0:00 \_ docker-containerd --config /var/run/docker/containerd/containerd.toml ``` After this change: when running `dockerd` without options (same as current); ``` root 1014 2.5 2.1 496484 43468 pts/0 Sl+ 12:23 0:00 dockerd root 1023 1.2 1.1 681768 23832 ? Ssl 12:23 0:00 \_ docker-containerd --config /var/run/docker/containerd/containerd.toml ``` when running `dockerd --debug`: ``` root 600 0.8 2.1 512876 43180 pts/0 Sl+ 12:20 0:00 dockerd --debug root 608 0.6 1.1 624428 23672 ? Ssl 12:20 0:00 \_ docker-containerd --config /var/run/docker/containerd/containerd.toml --log-level debug ``` when running `dockerd --log-level=panic` ``` root 747 0.6 2.1 496548 43996 pts/0 Sl+ 12:21 0:00 dockerd --log-level=panic root 755 0.7 1.1 550696 24100 ? Ssl 12:21 0:00 \_ docker-containerd --config /var/run/docker/containerd/containerd.toml --log-level panic ``` combining `--debug` and `--log-level` (`--debug` takes precedence): ``` root 880 2.7 2.1 634692 43336 pts/0 Sl+ 12:23 0:00 dockerd --debug --log-level=panic root 888 1.0 1.1 616232 23652 ? Ssl 12:23 0:00 \_ docker-containerd --config /var/run/docker/containerd/containerd.toml --log-level debug ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
pass_loglevel_to_containerd
branch
from
921b36b
to
aaa1392
Compare
Codecov Report
@@ Coverage Diff @@
## master #37419 +/- ##
=========================================
Coverage ? 34.91%
=========================================
Files ? 610
Lines ? 44886
Branches ? 0
=========================================
Hits ? 15673
Misses ? 27096
Partials ? 2117 |
|
updated 👍 |
mlaventure
approved these changes
Jul 9, 2018
Flaky swarm tests ? |
|
Yup those are flaky 😒 |
|
restarted to make them go green |
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.
fixes #37343
dockerd allows the
--log-levelto be specified, but this log-level was not forwarded to the containerd process.This patch sets containerd's log-level to the same as dockerd if a custom level is provided.
Now that
--log-levelis also passed to containerd, the default "info" is removed, so that containerd's default (or the level configured in containerd.toml) is still used if no log-level is set.Before this change:
containerd would always be started without a log-level set (only the level that's configured in
containerd.toml);After this change:
when running
dockerdwithout options (same as current);when running
dockerd --debug:when running
dockerd --log-level=paniccombining
--debugand--log-level(--debugtakes precedence):Signed-off-by: Sebastiaan van Stijn github@gone.nl
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)