Skip to content

fix(scheduler): handling running chores #8167

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

Merged
merged 2 commits into from
Nov 17, 2025
Merged

fix(scheduler): handling running chores #8167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c008001
fix: handling blocked chores in scheduler
Varixo Nov 17, 2025
f026a32
fix: early return if chore is already running
Varixo Nov 17, 2025
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
5 changes: 5 additions & 0 deletions .changeset/poor-peaches-roll.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@qwik.dev/core': patch
---

fix: correct running chores handling edge case
4 changes: 2 additions & 2 deletions packages/qwik/src/core/shared/scheduler-journal-block.unit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describe('should block journal flush during node-diff and component runs', () =>
let vA: ElementVNode = null!;
let vAHost: VirtualVNode = null!;
let choreQueue: ChoreArray;
let blockedChores: Set<Chore>;
let blockedChores: ChoreArray;
let runningChores: Set<Chore>;

async function waitForDrain() {
Expand All @@ -44,7 +44,7 @@ describe('should block journal flush during node-diff and component runs', () =>
const container = getDomContainer(document.body);
container.handleError = vi.fn();
choreQueue = new ChoreArray();
blockedChores = new Set();
blockedChores = new ChoreArray();
runningChores = new Set();
scheduler = createScheduler(
container,
Expand Down
31 changes: 24 additions & 7 deletions packages/qwik/src/core/shared/scheduler-rules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
} from '../client/vnode';
import { Task, TaskFlags } from '../use/use-task';
import type { QRLInternal } from './qrl/qrl-class';
import type { Chore } from './scheduler';
import { ChoreState, type Chore } from './scheduler';
import type { Container, HostElement } from './types';
import { ChoreType } from './util-chore-type';
import { ELEMENT_SEQ } from './utils/markers';
Expand Down Expand Up @@ -147,7 +147,8 @@ function findAncestorBlockingChore(chore: Chore, type: ChoreSetType): Chore | nu
blockingChore.$type$ < ChoreType.VISIBLE &&
blockingChore.$type$ !== ChoreType.TASK &&
blockingChore.$type$ !== ChoreType.QRL_RESOLVE &&
blockingChore.$type$ !== ChoreType.RUN_QRL
blockingChore.$type$ !== ChoreType.RUN_QRL &&
blockingChore.$state$ === ChoreState.NONE
) {
return blockingChore;
}
Expand All @@ -161,7 +162,7 @@ function findAncestorBlockingChore(chore: Chore, type: ChoreSetType): Chore | nu
export function findBlockingChore(
chore: Chore,
choreQueue: ChoreArray,
blockedChores: Set<Chore>,
blockedChores: ChoreArray,
runningChores: Set<Chore>,
container: Container
): Chore | null {
Expand All @@ -185,20 +186,32 @@ export function findBlockingChore(
// Check in choreQueue
// TODO(perf): better to iterate in reverse order?
for (const candidate of choreQueue) {
if (candidate.$type$ === rule.blockingType && rule.match(chore, candidate, container)) {
if (
candidate.$type$ === rule.blockingType &&
rule.match(chore, candidate, container) &&
candidate.$state$ === ChoreState.NONE
) {
return candidate;
}
}
// Check in blockedChores
for (const candidate of blockedChores) {
if (candidate.$type$ === rule.blockingType && rule.match(chore, candidate, container)) {
if (
candidate.$type$ === rule.blockingType &&
rule.match(chore, candidate, container) &&
candidate.$state$ === ChoreState.NONE
) {
return candidate;
}
}

// Check in runningChores
for (const candidate of runningChores) {
if (candidate.$type$ === rule.blockingType && rule.match(chore, candidate, container)) {
if (
candidate.$type$ === rule.blockingType &&
rule.match(chore, candidate, container) &&
candidate.$state$ !== ChoreState.FAILED
) {
return candidate;
}
}
Expand Down Expand Up @@ -236,7 +249,11 @@ export function findBlockingChoreForVisible(
}

for (const candidate of runningChores) {
if (candidate.$type$ === rule.blockingType && rule.match(chore, candidate, container)) {
if (
candidate.$type$ === rule.blockingType &&
rule.match(chore, candidate, container) &&
candidate.$state$ !== ChoreState.FAILED
) {
return candidate;
}
}
Expand Down
Loading
Loading