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,36 +2137,37 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> { ...@@ -2137,36 +2137,37 @@ 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) {
let mut idle_start_listener = self.idle_start_event.listen(); return;
let mut idle_end_listener = self.idle_end_event.listen(); }
let mut idle_time = if turbo_tasks.is_idle() { let mut idle_start_listener = self.idle_start_event.listen();
Instant::now() + IDLE_TIMEOUT let mut idle_end_listener = self.idle_end_event.listen();
} else { let mut idle_time = if turbo_tasks.is_idle() {
far_future() Instant::now() + IDLE_TIMEOUT
}; } else {
loop { far_future()
tokio::select! { };
_ = &mut stop_listener => { loop {
break; tokio::select! {
}, _ = &mut stop_listener => {
_ = &mut idle_start_listener => { return;
idle_time = Instant::now() + IDLE_TIMEOUT; },
idle_start_listener = self.idle_start_event.listen() _ = &mut idle_start_listener => {
}, idle_time = Instant::now() + IDLE_TIMEOUT;
_ = &mut idle_end_listener => { idle_start_listener = self.idle_start_event.listen()
idle_time = until + IDLE_TIMEOUT; },
idle_end_listener = self.idle_end_event.listen() _ = &mut idle_end_listener => {
}, idle_time = until + IDLE_TIMEOUT;
_ = tokio::time::sleep_until(until) => { idle_end_listener = self.idle_end_event.listen()
},
_ = tokio::time::sleep_until(until) => {
break;
},
_ = tokio::time::sleep_until(idle_time) => {
if turbo_tasks.is_idle() {
break; break;
}, }
_ = tokio::time::sleep_until(idle_time) => { },
if turbo_tasks.is_idle() {
break;
}
},
}
} }
} }
} }
......
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