From 3a7e2f87b80cbdac853e68550ce3e81278985efa Mon Sep 17 00:00:00 2001 From: Matt Keeter Date: Mon, 14 Oct 2024 14:33:22 -0400 Subject: [PATCH] Small fixes --- upstairs/src/dummy_downstairs_tests.rs | 4 ++-- upstairs/src/lib.rs | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/upstairs/src/dummy_downstairs_tests.rs b/upstairs/src/dummy_downstairs_tests.rs index c9686ed4e..870232405 100644 --- a/upstairs/src/dummy_downstairs_tests.rs +++ b/upstairs/src/dummy_downstairs_tests.rs @@ -307,10 +307,10 @@ impl DownstairsHandle { /// Awaits and acks a `Message::Write { .. }` or `Message::Barrier { .. }` /// - /// Returns the job ID for further checks. + /// Returns `true` if the message was a barrier, `false` otherwise /// /// # Panics - /// If a non-write message arrives + /// If a message other than `Write` or `Barrier` arrives pub async fn ack_write_or_barrier(&mut self) -> bool { let (r, was_barrier) = match self.recv().await.unwrap() { Message::Write { header, .. } => ( diff --git a/upstairs/src/lib.rs b/upstairs/src/lib.rs index 5161e4f91..2d0235e08 100644 --- a/upstairs/src/lib.rs +++ b/upstairs/src/lib.rs @@ -1323,6 +1323,11 @@ impl IOop { // the downstairs to act based on that. true } + IOop::Barrier { .. } => { + // The Barrier IOop doesn't actually touch any extents; it's + // purely for dependency management. + true + } _ => { panic!("Unsupported IO check {:?}", self); }