Merge pull request #8 from cloudflare/lvalenta/batcher-alarm

lukevalenta · web-flow · commit 5ce2a27e22db · 2025-04-03T11:26:43.000-04:00
Do not reschedule Batcher alarm when there are no pending entries
diff --git a/crates/ct_worker/src/batcher_do.rs b/crates/ct_worker/src/batcher_do.rs
@@ -145,12 +145,10 @@ impl DurableObject for Batcher {
     }
 
     async fn alarm(&mut self) -> Result<Response> {
-        if !self.initialized {
+        if !self.initialized || self.batch.pending_leaves.is_empty() {
             return Response::empty();
         }
-        if !self.batch.pending_leaves.is_empty()
-            && self.last_batch_millis + MAX_BATCH_TIMEOUT_MILLIS < util::now_millis()
-        {
+        if self.last_batch_millis + MAX_BATCH_TIMEOUT_MILLIS < util::now_millis() {
             if let Err(e) = self.submit_batch().await {
                 log::warn!("failed to submit batch: {e}");
             }

Original file line number	Diff line number	Diff line change
`@@ -145,12 +145,10 @@ impl DurableObject for Batcher {`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`async fn alarm(&mut self) -> Result<Response> {`
`148`		`- if !self.initialized {`
	`148`	`+ if !self.initialized \|\| self.batch.pending_leaves.is_empty() {`
`149`	`149`	`return Response::empty();`
`150`	`150`	`}`
`151`		`- if !self.batch.pending_leaves.is_empty()`
`152`		`- && self.last_batch_millis + MAX_BATCH_TIMEOUT_MILLIS < util::now_millis()`
`153`		`- {`
	`151`	`+ if self.last_batch_millis + MAX_BATCH_TIMEOUT_MILLIS < util::now_millis() {`
`154`	`152`	`if let Err(e) = self.submit_batch().await {`
`155`	`153`	`log::warn!("failed to submit batch: {e}");`
`156`	`154`	`}`