Skip to content

solver: fix slow-cache status tracking with preprocess#1871

Merged
tiborvass merged 1 commit into
moby:masterfrom
tonistiigi:scheduler-fix-for-testing
Dec 11, 2020
Merged

solver: fix slow-cache status tracking with preprocess#1871
tiborvass merged 1 commit into
moby:masterfrom
tonistiigi:scheduler-fix-for-testing

Conversation

@tonistiigi

@tonistiigi tonistiigi commented Dec 3, 2020

Copy link
Copy Markdown
Member

This reverts commit 7061291 from #1863 with some modification.

Preprocess should not be taken into account when calculating
cache-slow state. But it should be used to detect if dep is complete
so preprocess runs before parent's exec function.

Signed-off-by: Tonis Tiigi [email protected]

Preprocess should not be taken into account when calculating
cache-slow state. But it should be used to detect if dep is complete
so preprocess runs before parent's exec function.

Signed-off-by: Tonis Tiigi <[email protected]>
@tonistiigi
tonistiigi force-pushed the scheduler-fix-for-testing branch from 81ac853 to 2f247f0 Compare December 11, 2020 06:59
@tonistiigi tonistiigi changed the title Revert "solver: remove scheduler fix" solver: fix slow-cache status tracking with preprocess Dec 11, 2020
Comment thread solver/edge.go
}
effectiveState := dep.state
if dep.state == edgeStatusCacheSlow && isSlowIncomplete {
if dep.state == edgeStatusCacheSlow && isSlowCacheIncomplete {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

if isSlowCacheIncomplete && (dep.state == edgeStatusCacheSlow || dep.state == edgeStatusComplete) {
    effectiveState = edgeStatusCacheFast
}

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

unrelated

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants