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

fix data race in TestPriorityQueue_AssignedPodAdded #73022

Merged
merged 1 commit into from
Jan 18, 2019
Merged

fix data race in TestPriorityQueue_AssignedPodAdded #73022

merged 1 commit into from
Jan 18, 2019

Conversation

denkensk
Copy link
Member

@denkensk denkensk commented Jan 17, 2019 •
edited
Loading

What type of PR is this?

/kind bug
/sig scheduling

What this PR does / why we need it:
I'm very sorry about that. This problem did not occur in the ci of code merged, but in another ci.
UnschedulablePodsMap is not thread-safe. In scheduling_queue.go, lock will be acquired before operating UnschedulablePodsMap. But in scheduling_queue_test.go, lock isn‘t be acquired. In the previous case, only a single thread runs so it's ok. But after add goroutine flushUnschedulableQLeftover, there will be data race. So I need to acquire lock before operating UnschedulablePodsMap.

Which issue(s) this PR fixes:
Fixes #73021

Special notes for your reviewer:

acquire lock before operating unschedulablepodsmap

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jan 17, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @denkensk. 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 the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jan 17, 2019
@k8s-ci-robot k8s-ci-robot added sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jan 17, 2019
@dims
Copy link
Member

dims commented Jan 17, 2019

/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 Jan 17, 2019
@denkensk
Copy link
Member Author

/priority important-soon

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jan 17, 2019
bsalamat
bsalamat reviewed Jan 17, 2019
View reviewed changes
pkg/scheduler/internal/queue/scheduling_queue_test.go Outdated
@@ -95,6 95,18 @@ var highPriorityPod, highPriNominatedPod, medPriorityPod, unschedulablePod = v1.
},
}

func addOrUpdateUnschedulableQ(p *PriorityQueue, pod *v1.Pod) {
Copy link
Member

Choose a reason for hiding this comment

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

s/addOrUpdateUnschedulableQ/addOrUpdateUnschedulablePod/

Copy link
Member Author

Choose a reason for hiding this comment

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

Done thank you

pkg/scheduler/internal/queue/scheduling_queue_test.go Outdated
p.unschedulableQ.addOrUpdate(pod)
}

func getUnschedulableQ(p *PriorityQueue, pod *v1.Pod) *v1.Pod {
Copy link
Member

Choose a reason for hiding this comment

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

s/getUnschedulableQ/getUnschedulablePod/

Copy link
Member Author

Choose a reason for hiding this comment

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

Done thank you

@denkensk denkensk force-pushed the fix-data-race-in-scheduling-queue-test branch from 2986d89 to 28e6bbc Compare January 17, 2019 20:24
bsalamat
bsalamat reviewed Jan 17, 2019
View reviewed changes
Copy link
Member

@bsalamat bsalamat left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@denkensk, thanks for fixing the the data race test.

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bsalamat, denkensk

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 Jan 17, 2019
@denkensk
Copy link
Member Author

/kind bug

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. and removed needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Jan 18, 2019
@k8s-ci-robot k8s-ci-robot merged commit c999dc3 into kubernetes:master Jan 18, 2019
@denkensk denkensk deleted the fix-data-race-in-scheduling-queue-test branch January 18, 2019 03:19
@Huang-Wei Huang-Wei mentioned this pull request Jan 18, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bsalamat bsalamat bsalamat left review comments

@k82cn k82cn Awaiting requested review from k82cn

Assignees

@bsalamat bsalamat

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

data race in TestPriorityQueue_AssignedPodAdded
4 participants
@denkensk @k8s-ci-robot @dims @bsalamat