Unverified Commit 2bddb916 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

Turbopack: Stop persisting background task correctly on stop (#82727)

### What?

Fixes a race condition with the persisting background tasks when stopping the backend.
parent 97dbf5f2
...@@ -2137,7 +2137,9 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> { ...@@ -2137,7 +2137,9 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
let until = last_snapshot + time; let until = last_snapshot + time;
if until > Instant::now() { if until > Instant::now() {
let mut stop_listener = self.stopping_event.listen(); let mut stop_listener = self.stopping_event.listen();
if !self.stopping.load(Ordering::Acquire) { if self.stopping.load(Ordering::Acquire) {
return;
}
let mut idle_start_listener = self.idle_start_event.listen(); let mut idle_start_listener = self.idle_start_event.listen();
let mut idle_end_listener = self.idle_end_event.listen(); let mut idle_end_listener = self.idle_end_event.listen();
let mut idle_time = if turbo_tasks.is_idle() { let mut idle_time = if turbo_tasks.is_idle() {
...@@ -2148,7 +2150,7 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> { ...@@ -2148,7 +2150,7 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
loop { loop {
tokio::select! { tokio::select! {
_ = &mut stop_listener => { _ = &mut stop_listener => {
break; return;
}, },
_ = &mut idle_start_listener => { _ = &mut idle_start_listener => {
idle_time = Instant::now() + IDLE_TIMEOUT; idle_time = Instant::now() + IDLE_TIMEOUT;
...@@ -2169,7 +2171,6 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> { ...@@ -2169,7 +2171,6 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
} }
} }
} }
}
let this = self.clone(); let this = self.clone();
let snapshot = this.snapshot(); let snapshot = this.snapshot();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment