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

Update queueset_test.go for FinalSeats #105592

Merged
merged 1 commit into from
Oct 12, 2021
Merged

Update queueset_test.go for FinalSeats #105592

merged 1 commit into from
Oct 12, 2021

Conversation

MikeSpreitzer
Copy link
Member

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

This PR updates queueset_test.go to track the introduction of FinalSeats.

This PR gives up on calculating expected results for tests with added latency,
because I did not find an easy way to do it.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Oct 10, 2021
@k8s-ci-robot k8s-ci-robot added area/apiserver sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Oct 10, 2021
@MikeSpreitzer
Copy link
Member Author

MikeSpreitzer commented Oct 10, 2021 •
edited

/sig api-machinery
/cc @wojtek-t
/cc @tkashem
@deads2k
@lavalamp

@k8s-ci-robot
Copy link
Contributor

@MikeSpreitzer: The label(s) sig/api-machiner cannot be applied, because the repository doesn't have them.

In response to this:

/sig api-machiner
/cc @wojtek-t
/cc @tkashem
@deads2k
@lavalamp

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.

@MikeSpreitzer
Copy link
Member Author

/retest

wojtek-t
wojtek-t reviewed Oct 11, 2021
View reviewed changes
staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go Outdated
width uint
// initialSeats is the number of seats this request occupies in the first phase of execution
initialSeats uint
finalSeats uint
Copy link
Member

Choose a reason for hiding this comment

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

nit: add a comment about final seats too

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 11, 2021
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 11, 2021
@MikeSpreitzer
Copy link
Member Author

The force-push to 7879a865a79 is a rebase onto master and update of the comments on finalSeats and padDuration.

@MikeSpreitzer
Copy link
Member Author

The force-push to 4c8299634a3 clarified the wording in the comment on padDuration.

@MikeSpreitzer
Copy link
Member Author

The force-push to 4c11c30c2d6 improved debug logging from queueset_test.go in two ways.

One is adding the scenario name into

		uss.t.Logf("%s: End of first half of scenario %q", uss.clk.Now().Format(nsTimeFmt), uss.name)

and

		uss.t.Logf("%s: End of first half of scenario %q", uss.clk.Now().Format(nsTimeFmt), uss.name)

The other is making TestSeparations include the test name in the queueSet name.

@MikeSpreitzer
Copy link
Member Author

Here is a rendering of the queueset_tests produced by commit 4c11c30c2d6a23fb200d0b9c0f3e4f5c9d60cfad .

queueset_test.pdf

wojtek-t
wojtek-t reviewed Oct 12, 2021
View reviewed changes
staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go Outdated
@@ -140,12 +142,13 @@ func (uc uniformClient) setSplit() uniformClient {
return uc
}

func (uc uniformClient) seats(width uint) uniformClient {
uc.width = width
func (uc uniformClient) width1(seats uint) uniformClient {
Copy link
Member

Choose a reason for hiding this comment

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

Apparently I didn't save this comment yesterday.

I'm not a huge fan of "width1". Can we maybe call it "initialWidth" or sth?

Copy link
Member

Choose a reason for hiding this comment

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

or initialSeats?

Copy link
Member Author

Choose a reason for hiding this comment

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

Go won't let us have a method and field with the same name.

@MikeSpreitzer
Update queueset_test.go for FinalSeats
0fc595e 
Track the introduction of FinalSeats.

Give up on calculating expected results for tests with added latency,
because I did not find an easy and obvious way to do it.
@MikeSpreitzer
Copy link
Member Author

The force-push to 0fc595e renames the uniformClient method that sets the initialSeats field.

@wojtek-t
Copy link
Member

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MikeSpreitzer, 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

@fedebongio
Copy link
Contributor

/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 Oct 12, 2021
@k8s-ci-robot k8s-ci-robot merged commit cf5eced into kubernetes:master Oct 12, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Oct 12, 2021
@MikeSpreitzer MikeSpreitzer deleted the test-final-seats branch October 13, 2021 04:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wojtek-t wojtek-t wojtek-t left review comments

@lavalamp lavalamp Awaiting requested review from lavalamp

@yue9944882 yue9944882 Awaiting requested review from yue9944882

@tkashem tkashem Awaiting requested review from tkashem

Assignees

@wojtek-t wojtek-t

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. 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. release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/L Denotes a PR that changes 100-499 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.

None yet
4 participants
@MikeSpreitzer @k8s-ci-robot @wojtek-t @fedebongio