ActorSqlite: Reintroduce a check for pending delete at start of handler

cloudflare · Sep 23, 2024 · cb67b25 · cb67b25
1 parent 780a156
commit cb67b25
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/workerd/io/actor-sqlite.c++ b/src/workerd/io/actor-sqlite.c++
@@ -345,6 +345,7 @@ void ActorSqlite::maybeDeleteDeferredAlarm() {
 
   if (haveDeferredDelete) {
     metadata.setAlarm(kj::none);
+    haveDeferredDelete = false;
   }
 }
 
@@ -586,6 +587,12 @@ kj::OneOf<ActorSqlite::CancelAlarmHandler, ActorSqlite::RunAlarmHandler> ActorSq
     armAlarmHandler(kj::Date scheduledTime, bool noCache) {
   KJ_ASSERT(!inAlarmHandler);
 
+  if (haveDeferredDelete) {
+    // Unlikely to happen, unless caller is starting new alarm handler before previous alarm
+    // handler cleanup has completed.
+    LOG_WARNING_ONCE("expected previous alarm handler to be cleaned up");
+  }
+
   auto localAlarmState = metadata.getAlarm();
   if (localAlarmState != scheduledTime) {
     if (localAlarmState == lastConfirmedAlarmDbState) {