actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-06-28 18:00:37 +02:00
Code Issues Releases Wiki Activity

Fix bug where worker service restart could skip failing services and not being able to restart multiple services (#318)

Browse Source
This commit is contained in:
fakeshadow
2021-04-05 12:39:05 -07:00
committed by GitHub
parent 995efcf427
commit 5961eb892e
2 changed files with 189 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
actix-server/src/worker.rs
View File

@ -283,7 +283,6 @@ impl ServerWorker {
fn check_readiness(&mut self, cx: &mut Context<'_>) -> Result<bool, (Token, usize)> {
let mut ready = self.conns.available(cx);
let mut failed = None;
for (idx, srv) in self.services.iter_mut().enumerate() {
if srv.status == WorkerServiceStatus::Available
|| srv.status == WorkerServiceStatus::Unavailable
@ -314,17 +313,14 @@ impl ServerWorker {
"Service {:?} readiness check returned error, restarting",
self.factories[srv.factory].name(Token(idx))
);
failed = Some((Token(idx), srv.factory));
srv.status = WorkerServiceStatus::Failed;
return Err((Token(idx), srv.factory));
}
}
}
}
if let Some(idx) = failed {
Err(idx)
} else {
Ok(ready)
}
Ok(ready)
}
}
@ -408,18 +404,19 @@ impl Future for ServerWorker {
let factory_id = restart.factory_id;
let token = restart.token;
let item = ready!(restart.fut.as_mut().poll(cx)).unwrap_or_else(|_| {
panic!(
"Can not restart {:?} service",
this.factories[factory_id].name(token)
)
});
// Only interest in the first item?
let (token, service) = item
let service = ready!(restart.fut.as_mut().poll(cx))
.unwrap_or_else(|_| {
panic!(
"Can not restart {:?} service",
this.factories[factory_id].name(token)
)
})
.into_iter()
.next()
.expect("No BoxedServerService. Restarting can not progress");
// Find the same token from vector. There should be only one
// So the first match would be enough.
.find(|(t, _)| *t == token)
.map(|(_, service)| service)
.expect("No BoxedServerService found");
trace!(
"Service {:?} has been restarted",