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.

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

Refresh Timestamp when pod is not present in the three sub-queues #97302

Merged
merged 2 commits into from Dec 22, 2020

Conversation

jindezgm
Copy link
Contributor

The pInfo.Timestamp is refreshed but the sort in activeQ or podBackoffQ is not be updated when pod is already present in the backoff or active queue.
AddUnschedulableIfNotPresent() return error if pod is already present in the backoff or active queue, and there is no re-add.
So refresh pInfo.Timestamp when the pod is not present in the three sub-queues, otherwise need to update the order of the pod in the active or backoff queue, for example p.activeQ.Update(pInfo)

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:


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


The pInfo.Timestamp is refreshed but the sort in activeQ or podBackoffQ is not be updated when pod  is already present in the backoff or active queue.
AddUnschedulableIfNotPresent() return error if pod is already present in the backoff or active queue, and there is no re-add.
So  refresh  pInfo.Timestamp when  the pod is not present in the three sub-queues, otherwise need to update the order of the pod in the active or backoff queue, for example p.activeQ.Update(pInfo)
@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. 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. labels Dec 15, 2020
@k8s-ci-robot
Copy link
Contributor

Welcome @jindezgm!

It looks like this is your first PR to kubernetes/kubernetes 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/kubernetes has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

@jindezgm: This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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 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. labels Dec 15, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @jindezgm. 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-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. labels Dec 15, 2020
@k8s-ci-robot k8s-ci-robot added sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Dec 15, 2020
Copy link
Member

@chendave chendave left a comment

Choose a reason for hiding this comment

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

/lgtm

/ok-to-test

if _, exists, _ := p.activeQ.Get(pInfo); exists {
return fmt.Errorf("pod: %v is already present in the active queue", nsNameForPod(pod))
}
if _, exists, _ := p.podBackoffQ.Get(pInfo); exists {
return fmt.Errorf("pod %v is already present in the backoff queue", nsNameForPod(pod))
}

// Refresh the timestamp since the pod is re-added.
pInfo.Timestamp = p.clock.Now()

Copy link
Member

Choose a reason for hiding this comment

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

lgtm, but I cannot see what's the real impact, the pods in the activeQ will still be popped up with the original order.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If the Pod in activeQ have the same priority, they will be FIFO according to the enqueue time.
If the enqueue time is refreshed, the order in the activeQ should be updated.
So I don’t think should refresh the enqueue time

@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 Dec 15, 2020
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 15, 2020
@chendave
Copy link
Member

/kind cleanup

if this does have a negative impact, pls change this label to "bug" instead.

@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Dec 15, 2020
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 15, 2020
@chendave
Copy link
Member

please squash, otherwise lgtm.

/release-note-none

@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 Dec 16, 2020
@alculquicondor
Copy link
Member

The change looks reasonable, but did you find any problems in real clusters?

If so, do you think you can expose the problem with a unit test? It would also dictate whether we should backport this.

@chendave
Copy link
Member

If so, do you think you can expose the problem with a unit test? It would also dictate whether we should backport this.

+1, it would be great to see a UT for this if possible.

@jindezgm
Copy link
Contributor Author

I did not find the problem in the real cluster, only analyzed the code logic.
The key to the following UT is: whether call AddUnschedulableIfNotPresent() with same pod twice, if not then the problem raised will not occur, but this doesn’t mean no problem.

func TestPriorityQueue_AddUnschedulableIfNotPresent_IfPresent(t *testing.T) {
	less := newDefaultQueueSort()
	// Easy to test in nanoseconds
	q := NewPriorityQueue(less, WithPodInitialBackoffDuration(time.Nanosecond))
	totalNum := 2
	for i := 0; i < totalNum; i++ {
		// Same priority, and the sorting depends on the time to add the queue
		priority := int32(0)
		p := v1.Pod{
			ObjectMeta: metav1.ObjectMeta{
				Name:      fmt.Sprintf("pod%d", i),
				Namespace: fmt.Sprintf("ns%d", i),
				UID:       types.UID(fmt.Sprintf("upns%d", i)),
			},
			Spec: v1.PodSpec{
				Priority: &priority,
			},
		}
		q.Add(&p)
	}

	// Pop and Unschedulable
	p1, _ := q.Pop()
	c1 := q.SchedulingCycle()
	q.AddUnschedulableIfNotPresent(p1, c1)

	// Pop and Unschedulable again
	p2, _ := q.Pop()
	c2 := q.SchedulingCycle()
	q.AddUnschedulableIfNotPresent(p2, c2)

	// Wait for more than the pods backoff time
	time.Sleep(time.Microsecond)

	// Move all to active
	q.MoveAllToActiveOrBackoffQueue("test")

	// Will the same Pod be added to the unschedulable queue twice?
	q.AddUnschedulableIfNotPresent(p1, c1)
	p1, _ = q.Pop()
	p2, _ = q.Pop()
	if less(p2, p1) {
		t.Error("The priority is low but it is poped first")
	}

	// Easy to test delay in seconds
	q.podInitialBackoffDuration = time.Second

	// Pods backoff 1 second.
	p1.Attempts, p2.Attempts = 1, 1
	q.AddUnschedulableIfNotPresent(p1, q.SchedulingCycle())
	q.AddUnschedulableIfNotPresent(p2, q.SchedulingCycle())
	q.MoveAllToActiveOrBackoffQueue("test")

	// 500 milliseconds have passed
	time.Sleep(500 * time.Millisecond)

	// Will the same Pod be added to the unschedulable queue twice?
	q.AddUnschedulableIfNotPresent(p1, q.SchedulingCycle())

	// flush backoff completed pods.
	stopc := make(chan struct{})
	defer close(stopc)
	go wait.Until(q.flushBackoffQCompleted, time.Millisecond*100, stopc)

	// The backoff of the POD is 1 second, 500ms have passed, and the time for the pod to pop is about 500ms
	now := time.Now()
	q.Pop()
	if duration := time.Now().Sub(now); duration > time.Millisecond*700 {
		t.Errorf("Pop pod too long %dms > 700ms", duration.Milliseconds())
	}
}

@alculquicondor
Copy link
Member

A Pod would already be present if an Update happens while a Pod is being scheduled.

But I suspect this doesn't lead to anything major.

/approve
/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alculquicondor, jindezgm

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 Dec 22, 2020
@k8s-ci-robot k8s-ci-robot merged commit 8c6f244 into kubernetes:master Dec 22, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Dec 22, 2020
@jindezgm jindezgm deleted the patch-1 branch December 23, 2020 03:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/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. needs-triage Indicates an issue or PR lacks a `triage/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-none Denotes a PR that doesn't merit a release note. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants