From 8126b20de628f3f86d1b863ceca7f30128efb7ed Mon Sep 17 00:00:00 2001 From: Martin Ek Date: Sun, 12 Nov 2017 22:25:30 +0100 Subject: [PATCH] Recover each node synchronously This was done to avoid deadlocks in situations where two recovering domains have egresses to each other. See https://github.com/mit-pdos/distributary/pull/37#discussion_r150417972 --- src/controller/mod.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/controller/mod.rs b/src/controller/mod.rs index 0833ede98..f46ae440c 100644 --- a/src/controller/mod.rs +++ b/src/controller/mod.rs @@ -527,11 +527,6 @@ impl ControllerInner { let node = &self.ingredients[*index]; let domain = self.domains.get_mut(&node.domain()).unwrap(); domain.send(box payload::Packet::StartRecovery).unwrap(); - } - - for (_name, index) in self.inputs(()).iter() { - let node = &self.ingredients[*index]; - let domain = self.domains.get_mut(&node.domain()).unwrap(); domain.wait_for_ack().unwrap(); } }