Skip to content

Ensure log entries printed from config subsys honor config #34620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Oct 21, 2024
Merged

Ensure log entries printed from config subsys honor config #34620

merged 1 commit into from
Oct 21, 2024

Conversation

jingyuanliang
Copy link
Contributor

Previously:

ERROR 2024-08-30T08:12:43.551554643Z [resource.labels.containerName: cilium-agent] time="2024-08-30T08:12:43Z" level=info msg="Memory available for map entries (0.003% of 16778747904B): 41946869B" subsys=config
ERROR 2024-08-30T08:12:43.551576396Z [resource.labels.containerName: cilium-agent] time="2024-08-30T08:12:43Z" level=info msg="option bpf-ct-global-tcp-max set by dynamic sizing to 147181" subsys=config
ERROR 2024-08-30T08:12:43.551583030Z [resource.labels.containerName: cilium-agent] time="2024-08-30T08:12:43Z" level=info msg="option bpf-ct-global-any-max set by dynamic sizing to 73590" subsys=config
ERROR 2024-08-30T08:12:43.551590656Z [resource.labels.containerName: cilium-agent] time="2024-08-30T08:12:43Z" level=info msg="option bpf-nat-global-max set by dynamic sizing to 147181" subsys=config
ERROR 2024-08-30T08:12:43.551596179Z [resource.labels.containerName: cilium-agent] time="2024-08-30T08:12:43Z" level=info msg="option bpf-neigh-global-max set by dynamic sizing to 147181" subsys=config
ERROR 2024-08-30T08:12:43.551601442Z [resource.labels.containerName: cilium-agent] time="2024-08-30T08:12:43Z" level=info msg="option bpf-sock-rev-map-max set by dynamic sizing to 73590" subsys=config
INFO 2024-08-30T08:12:43.552747343Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":" --agent-health-port='9879'", "subsys":"daemon"}
INFO 2024-08-30T08:12:43.552771656Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":" --agent-labels=''", "subsys":"daemon"}
INFO 2024-08-30T08:12:43.552779882Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":" --agent-liveness-update-interval='1s'", "subsys":"daemon"}
INFO 2024-08-30T08:12:43.552786331Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":" --agent-not-ready-taint-key='node.cilium.io/agent-not-ready'", "subsys":"daemon"}
INFO 2024-08-30T08:12:43.552792162Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":" --allocator-list-timeout='3m0s'", "subsys":"daemon"}
INFO 2024-08-30T08:12:43.552797838Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":" --allow-icmp-frag-needed='true'", "subsys":"daemon"}
INFO 2024-08-30T08:12:43.552803098Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":" --allow-localhost='auto'", "subsys":"daemon"}
INFO 2024-08-30T08:12:43.552816255Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":" --annotate-k8s-node='false'", "subsys":"daemon"}

Now:

INFO 2024-08-30T12:43:45.089921545Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":"Memory available for map entries (0.003% of 16778747904B): 41946869B", "subsys":"config"}
INFO 2024-08-30T12:43:45.089962473Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":"option bpf-ct-global-tcp-max set by dynamic sizing to 147181", "subsys":"config"}
INFO 2024-08-30T12:43:45.089972237Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":"option bpf-ct-global-any-max set by dynamic sizing to 73590", "subsys":"config"}
INFO 2024-08-30T12:43:45.089979941Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":"option bpf-nat-global-max set by dynamic sizing to 147181", "subsys":"config"}
INFO 2024-08-30T12:43:45.089986757Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":"option bpf-neigh-global-max set by dynamic sizing to 147181", "subsys":"config"}
INFO 2024-08-30T12:43:45.089993161Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":"option bpf-sock-rev-map-max set by dynamic sizing to 73590", "subsys":"config"}
INFO 2024-08-30T12:43:45.091182490Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":" --agent-health-port='9879'", "subsys":"daemon"}
INFO 2024-08-30T12:43:45.091214633Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":" --agent-labels=''", "subsys":"daemon"}
INFO 2024-08-30T12:43:45.091222817Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":" --agent-liveness-update-interval='1s'", "subsys":"daemon"}
INFO 2024-08-30T12:43:45.091230225Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":" --agent-not-ready-taint-key='node.cilium.io/agent-not-ready'", "subsys":"daemon"}
INFO 2024-08-30T12:43:45.091236900Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":" --allocator-list-timeout='3m0s'", "subsys":"daemon"}
INFO 2024-08-30T12:43:45.091243285Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":" --allow-icmp-frag-needed='true'", "subsys":"daemon"}
INFO 2024-08-30T12:43:45.091249425Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":" --allow-localhost='auto'", "subsys":"daemon"}
INFO 2024-08-30T12:43:45.091256013Z [resource.labels.containerName: cilium-agent] {"level":"info", "msg":" --annotate-k8s-node='false'", "subsys":"daemon"}

Log entries printed from config subsys during startup now honor logging config such as LogDriver, LogOpt or Debug.

@jingyuanliang jingyuanliang requested review from a team as code owners August 30, 2024 13:17
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Aug 30, 2024
@jingyuanliang jingyuanliang requested a review from giorio94 August 30, 2024 13:17
@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label Aug 30, 2024
@jingyuanliang jingyuanliang force-pushed the logerr branch 2 times, most recently from 6122789 to b2ca6e7 Compare August 30, 2024 14:11
@maintainer-s-little-helper
Copy link

Commit fbe1398 does not match "(?m)^Signed-off-by:".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Aug 30, 2024
@maintainer-s-little-helper
Copy link

Commit 3e27e8e does not match "(?m)^Signed-off-by:".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Aug 30, 2024
derailed
derailed reviewed Aug 30, 2024
View reviewed changes
Copy link
Contributor

@derailed derailed left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jingyuanliang Nice catch! Thank you for this update.

@dylandreimerink
Copy link
Member

/test

@jingyuanliang jingyuanliang force-pushed the logerr branch 3 times, most recently from 958a196 to 1d36ba1 Compare September 12, 2024 10:21
christarazi
christarazi reviewed Sep 12, 2024
View reviewed changes
@christarazi christarazi added area/daemon Impacts operation of the Cilium daemon. area/misc Impacts miscellaneous areas of the code not otherwise owned by another area. labels Sep 12, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Sep 12, 2024
@christarazi
Copy link
Member

/test

giorio94
giorio94 reviewed Sep 18, 2024
View reviewed changes
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Sep 18, 2024
@giorio94 giorio94 removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Sep 18, 2024
giorio94
giorio94 approved these changes Sep 18, 2024
View reviewed changes
Copy link
Member

@giorio94 giorio94 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

Two CI workflows are currently failing:

@jingyuanliang jingyuanliang force-pushed the logerr branch 3 times, most recently from 2cacb0b to ded0010 Compare September 18, 2024 19:58
@jingyuanliang
Copy link
Contributor Author 

[Build Cilium CLI binaries](https://github.com/cilium/cilium/actions/runs/10929211671/job/30339414400)
Unhandled exception. System.IO.IOException: No space left on device : '/home/runner/runners/2.319.1/_diag/Worker_20240918-195822-utc.log'
System.IO.IOException: No space left on device : '/home/runner/runners/2.319.1/_diag/Worker_20240918-195822-utc.log'

Anyone knows how to resolve this?

@giorio94
Copy link
Member

/test

@jingyuanliang jingyuanliang force-pushed the logerr branch 2 times, most recently from b785d10 to 06f75f8 Compare September 20, 2024 05:27
@jingyuanliang
Copy link
Contributor Author

/test

1 similar comment
@julianwiedmann
Copy link
Member

/test

@giorio94
Copy link
Member

@derailed Gentle ping 🙏

@aanm aanm enabled auto-merge October 11, 2024 10:12
@aanm
Copy link
Member

aanm commented Oct 11, 2024

/test

@aanm
Copy link
Member

aanm commented Oct 21, 2024

/test

@jingyuanliang @aanm
Ensure log entries printed from config subsys honor config
e23e4f9 
Signed-off-by: Jingyuan Liang <jingyuanliang@google.com>
@aanm
Copy link
Member

aanm commented Oct 21, 2024

/test

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Oct 21, 2024
@aanm aanm added this pull request to the merge queue Oct 21, 2024
Merged via the queue into cilium:main with commit cf80108 Oct 21, 2024
63 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@derailed derailed derailed left review comments

@christarazi christarazi christarazi approved these changes

@giorio94 giorio94 giorio94 approved these changes

Assignees
No one assigned
Labels
area/daemon Impacts operation of the Cilium daemon. area/misc Impacts miscellaneous areas of the code not otherwise owned by another area. kind/community-contribution This was a contribution made by a community member. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@jingyuanliang @dylandreimerink @christarazi @giorio94 @julianwiedmann @aanm @derailed