fix(spooler): Make the backpressure management cancellation safe

getsentry · Sep 9, 2024 · 4e57b23 · 4e57b23
1 parent d9c39f5
commit 4e57b23
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/relay-server/src/services/buffer/mod.rs b/relay-server/src/services/buffer/mod.rs
@@ -129,9 +129,11 @@ impl EnvelopeBufferService {
     /// Wait for the configured amount of time and make sure the project cache is ready to receive.
     async fn ready_to_pop(&mut self) -> Result<(), SendError> {
         tokio::time::sleep(self.sleep).await;
-        if let Some(project_cache_ready) = self.project_cache_ready.take() {
+        if let Some(project_cache_ready) = self.project_cache_ready.as_mut() {
             project_cache_ready.await?;
+            self.project_cache_ready = None;
         }
+
         Ok(())
     }
 

diff --git a/relay-server/src/services/processor/event.rs b/relay-server/src/services/processor/event.rs
@@ -872,8 +872,7 @@ mod tests {
 
         let event = Annotated::new(Event {
             release: Annotated::new(
-                String::from("���7��#1G����7��#1G����7��#1G����7��#1G����7��#")
-                    .into(),
+                String::from("���7��#1G����7��#1G����7��#1G����7��#1G����7��#").into(),
             ),
             ..Default::default()
         });