Skip to content
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

Automated cherry pick of #111477: Share a single etcd3 client logger across all clients #111649

Merged
merged 4 commits into from
Aug 10, 2022
Merged

Automated cherry pick of #111477: Share a single etcd3 client logger across all clients #111649

merged 4 commits into from
Aug 10, 2022

Conversation

negz
Copy link
Contributor

@negz negz commented Aug 2, 2022 •
edited
Loading

Cherry pick of #111477 on release-1.23.

#111477: Share a single etcd3 client logger across all clients

For details on the cherry pick process, see the cherry pick requests page.

Reduce API server memory when many CRDs are loaded by sharing a single etcd3 client logger across all clients

negz added 4 commits August 2, 2022 15:49
@negz
Disable the etcd3 client logger
9a60b0c 
This logger is responsible for 20% of the API server's memory usage when
many CRDs are installed. See the below issue for more context.

kubernetes#111476

Signed-off-by: Nic Cope <nicc@rk0n.org>
@negz
Share a single etcd3 client logger across all clients
c7399df 
Currently the API server creates one etcd client per CRD. If clients
aren't provided a logger they'll each create their own. These loggers
can account for ~20% of API server memory consumption on a cluster with
hundreds of CRDs.

Signed-off-by: Nic Cope <nicc@rk0n.org>
@negz
Give etcd client logger a name
61432c1 
Logic copied from https://github.com/etcd-io/etcd/blob/v3.5.4/client/v3/client.go#L374

Signed-off-by: Nic Cope <nicc@rk0n.org>
@negz
Copy etcd client debug level logic from upstream
fe8b09d 
Replicated from https://github.com/etcd-io/etcd/blob/v3.5.4/client/v3/logger.go#L47

The logic of this function doesn't make a lot of sense to me, but
copying it will avoid any behaviour change.

Signed-off-by: Nic Cope <nicc@rk0n.org>
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Aug 2, 2022
@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 2, 2022
@k8s-ci-robot
Copy link
Contributor

Hi @negz. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-priority Indicates a PR lacks a `priority/foo` label and requires one. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Aug 2, 2022
@negz negz changed the title Automated cherry pick of #111477: Disable the etcd3 client logger Automated cherry pick of #111477: Share a single etcd3 client logger across all clients Aug 2, 2022
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Aug 2, 2022
@k8s-ci-robot k8s-ci-robot added area/apiserver sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Aug 2, 2022
negz
negz commented Aug 2, 2022
View reviewed changes
staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go
Comment on lines +87 to +89
c := logutil.DefaultZapLoggerConfig
c.Level = zap.NewAtomicLevelAt(etcdClientDebugLevel())
l, err := c.Build()
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note that the original PR used logutil.CreateDefaultZapLogger. That function was introduced in etcd v3.5.3, whereas this release branch uses v.3.5.1. The logic here matches that of CreateDefaultZapLogger per https://github.com/etcd-io/etcd/blob/v3.5.4/client/pkg/logutil/zap.go#L24.

@sttts
Copy link
Contributor

sttts commented Aug 3, 2022

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 3, 2022
@cici37
Copy link
Contributor

cici37 commented Aug 4, 2022

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Aug 4, 2022
@negz
Copy link
Contributor Author

negz commented Aug 8, 2022

/kind bug

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Aug 8, 2022
@wojtek-t
Copy link
Member

wojtek-t commented Aug 9, 2022

/lgtm
/approve

@kubernetes/release-managers @cpanato - for cherrypick approval

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 9, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: negz, wojtek-t

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 9, 2022
@negz
Copy link
Contributor Author

negz commented Aug 9, 2022

/cc kubernetes/release-managers

@k8s-ci-robot k8s-ci-robot requested a review from a team August 9, 2022 07:09
@Verolop
Copy link

Verolop commented Aug 10, 2022

/lgtm

@Verolop Verolop added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Aug 10, 2022
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Aug 10, 2022
@Verolop
Copy link

Verolop commented Aug 10, 2022

/test pull-kubernetes-e2e-kind-ipv6

@Verolop
Copy link

Verolop commented Aug 10, 2022

/retest-required

@k8s-ci-robot k8s-ci-robot merged commit 92215fa into kubernetes:release-1.23 Aug 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hongchaodeng hongchaodeng Awaiting requested review from hongchaodeng

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

Assignees

@Verolop Verolop

@wojtek-t wojtek-t

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.23
Development

Successfully merging this pull request may close these issues.
6 participants
@negz @k8s-ci-robot @sttts @cici37 @wojtek-t @Verolop