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 #118189: TopologyAwareHints: Take lock in HasPopulatedHints #120372

Merged
merged 1 commit into from
Sep 7, 2023
Merged

Automated cherry pick of #118189: TopologyAwareHints: Take lock in HasPopulatedHints #120372

merged 1 commit into from
Sep 7, 2023

Conversation

Miciah
Copy link
Contributor

@Miciah Miciah commented Sep 1, 2023 •
edited

Cherry pick of #118189 on release-1.28.

#118189: TopologyAwareHints: Take lock in HasPopulatedHints

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

Fix a concurrent map access in TopologyCache's `HasPopulatedHints` method.

@Miciah
TopologyAwareHints: Take lock in HasPopulatedHints
dda909d 
Prevent potential concurrent map access by taking a lock before reading the
topology cache's hintsPopulatedByService map.

* staging/src/k8s.io/endpointslice/topologycache/topologycache.go
(setHintsLocked, hasPopulatedHintsLocked): New helper functions.  These are
the same as the existing SetHints and HasPopulatedHints methods except that
these helpers assume that a lock is already held.
(SetHints): Use setHintsLocked.
(HasPopulatedHints): Take a lock and use hasPopulatedHintsLocked.
(AddHints): Take a lock and use setHintsLocked and hasPopulatedHintsLocked.
* staging/src/k8s.io/endpointslice/topologycache/topologycache_test.go
(TestTopologyCacheRace): Add a goroutine that calls HasPopulatedHints.
@k8s-ci-robot k8s-ci-robot added this to the v1.28 milestone Sep 1, 2023
@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/S Denotes a PR that changes 10-29 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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 1, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @Miciah. 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-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Sep 1, 2023
@k8s-ci-robot k8s-ci-robot added sig/network Categorizes an issue or PR as relevant to SIG Network. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Sep 1, 2023
@Miciah Miciah mentioned this pull request Sep 1, 2023
Merged
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. 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 Sep 1, 2023
@Miciah
Copy link
Contributor Author

Miciah commented Sep 1, 2023

/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 Sep 1, 2023
@robscott
Copy link
Member

robscott commented Sep 1, 2023

Thanks @Miciah! I'm not sure how we missed this, but probably both the original PR and this one should have had a release note, do you mind adding one here?

/sig network
/priority important-soon
/ok-to-test
/triage accepted
/approve

@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. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. triage/accepted Indicates an issue or PR is ready to be actively worked on. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Sep 1, 2023
@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 release-note-none Denotes a PR that doesn't merit a release note. labels Sep 2, 2023
@Miciah
Copy link
Contributor Author

Miciah commented Sep 2, 2023

Thanks @Miciah! I'm not sure how we missed this, but probably both the original PR and this one should have had a release note, do you mind adding one here?

I've added a short release note. Let me know if it needs to be more detailed. Thanks!

@atiratree
Copy link
Member

/lgtm
/cc kubernetes/release-managers

@k8s-ci-robot k8s-ci-robot requested a review from a team September 7, 2023 18:00
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 7, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 3c65de790589320677ce269e5d70748f01366369

@xmudrii
Copy link
Member

xmudrii commented Sep 7, 2023

@Miciah @robscott @atiratree I see that this bug is affecting at least Kubernetes v1.27 (#118188). Should this change be cherry-picked to the release-1.27 branch as well and potentially other release branches?

@robscott
Copy link
Member

robscott commented Sep 7, 2023

@xmudrii yes, I think we should cherry pick this back to all supported versions.

@atiratree
Copy link
Member

yes, there are cherry-picks to 1.27 and 1.26: #120323 and #120324

@xmudrii
Copy link
Member

xmudrii commented Sep 7, 2023

Please get these cherry-picks lgtm-ed+approved as well and I'll be happy to cherry-pick-approve these PRs.

@robscott
Copy link
Member

robscott commented Sep 7, 2023

Please get these cherry-picks lgtm-ed+approved as well and I'll be happy to cherry-pick-approve these PRs.

Done, thanks!

@atiratree
Copy link
Member

@robscott you probably opened a wrong tab for the 1.26 one :)

@robscott
Copy link
Member

robscott commented Sep 7, 2023

@robscott you probably opened a wrong tab for the 1.26 one :)

🤦 should be good now, I managed to approve one of the cherry-picks 2x...

xmudrii
xmudrii approved these changes Sep 7, 2023
View reviewed changes
Copy link
Member

@xmudrii xmudrii left a comment

Choose a reason for hiding this comment

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

Thanks a lot everyone for providing feedback on this!
/lgtm
/approve

@xmudrii xmudrii added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 7, 2023
@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 Sep 7, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Miciah, robscott, xmudrii

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

@xmudrii
Copy link
Member

xmudrii commented Sep 7, 2023

/retest

@k8s-ci-robot k8s-ci-robot merged commit afc6b4e into kubernetes:release-1.28 Sep 7, 2023
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xmudrii xmudrii xmudrii approved these changes

@robscott robscott Awaiting requested review from robscott

@thockin thockin Awaiting requested review from thockin

Assignees

@atiratree atiratree

@xmudrii xmudrii

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/network Categorizes an issue or PR as relevant to SIG Network. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
[sig-release] Bug Triage
Archived in project
Milestone
v1.28
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Miciah @k8s-ci-robot @robscott @atiratree @xmudrii