[go: nahoru, domu]
Skip to content
This repository has been archived by the owner on Nov 16, 2023. It is now read-only.

Remove unnecessary recoverFrameworkWorkItems #38

Merged
merged 1 commit into from
Aug 12, 2019
Merged

Remove unnecessary recoverFrameworkWorkItems #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 5 additions & 36 deletions pkg/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,11 @@ func (c *FrameworkController) syncFramework(key string) (returnedErr error) {
if f.Status != nil {
// Recover f related things, since it is the first time we see it and
// its Status is not nil.
c.recoverFrameworkWorkItems(f)
// No need to recover previous enqueued items, because the Informer has
// already delivered the Add events for all recovered Frameworks which
// caused all Frameworks will be enqueued to sync.
// No need to recover previous scheduled to enqueue items, because the
// schedule will be recovered during sync.
}

// f.Status must be the same as the remote one, since it is the first
Expand Down Expand Up @@ -582,41 +586,6 @@ func (c *FrameworkController) syncFramework(key string) (returnedErr error) {
}
}

// No need to recover the non-AddAfter items, because the Informer has already
// delivered the Add events for all recovered Frameworks which caused all
// Frameworks will be enqueued to sync.
func (c *FrameworkController) recoverFrameworkWorkItems(f *ci.Framework) {
logPfx := fmt.Sprintf("[%v]: recoverFrameworkWorkItems: ", f.Key())
klog.Infof(logPfx + "Started")
defer func() { klog.Infof(logPfx + "Completed") }()

if f.Status == nil {
return
}

c.recoverTimeoutChecks(f)
}

func (c *FrameworkController) recoverTimeoutChecks(f *ci.Framework) {
// If a check is already timeout, the timeout will be handled by the following
// sync after the recover, so no need to enqueue it again.
if f.Status.State == ci.FrameworkCompleted {
c.enqueueFrameworkCompletedRetainTimeoutCheck(f, true)
return
}
c.enqueueFrameworkAttemptCreationTimeoutCheck(f, true)
c.enqueueFrameworkRetryDelayTimeoutCheck(f, true)

for _, taskRoleStatus := range f.TaskRoleStatuses() {
for _, taskStatus := range taskRoleStatus.TaskStatuses {
taskRoleName := taskRoleStatus.Name
taskIndex := taskStatus.Index
c.enqueueTaskAttemptCreationTimeoutCheck(f, taskRoleName, taskIndex, true)
c.enqueueTaskRetryDelayTimeoutCheck(f, taskRoleName, taskIndex, true)
}
}
}

func (c *FrameworkController) enqueueFrameworkCompletedRetainTimeoutCheck(
f *ci.Framework, failIfTimeout bool) bool {
if f.Status.State != ci.FrameworkCompleted {
Expand Down