fix(swing-store): Delete transcript spans in stopUsingTranscript as i…

…n rollover Fixes #10054
Agoric · Sep 11, 2024 · 2d1e478 · 2d1e478
1 parent 5eb08e2
commit 2d1e478
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/packages/swing-store/src/transcriptStore.js b/packages/swing-store/src/transcriptStore.js
@@ -277,12 +277,22 @@ export function makeTranscriptStore(
 
     // and change its DB row to isCurrent=null
     sqlEndCurrentSpan.run(vatID);
+
+    if (!keepTranscripts) {
+      // Delete items of the previously-current span.
+      // There may still be items associated with even older spans, but we leave
+      // those, to avoid excessive DB churn (for details, see #9387 and #9174).
+      // Recovery of space claimed by such ancient items is expected to use an
+      // external mechanism such as restoration from an operational snapshot
+      // that doesn't include them.
+      sqlDeleteOldItems.run(vatID, startPos, endPos);
+    }
   }
 
   function doSpanRollover(vatID, isNewIncarnation) {
     ensureTxn();
     const bounds = getCurrentSpanBounds(vatID);
-    const { startPos, endPos, incarnation } = bounds;
+    const { endPos, incarnation } = bounds;
 
     // deal with the now-old span
     closeSpan(vatID, bounds);
@@ -302,15 +312,6 @@ export function makeTranscriptStore(
     );
     noteExport(spanMetadataKey(rec), JSON.stringify(rec));
 
-    if (!keepTranscripts) {
-      // Delete items of the previously-current span.
-      // There may still be items associated with even older spans, but we leave
-      // those, to avoid excessive DB churn (for details, see #9387 and #9174).
-      // Recovery of space claimed by such ancient items is expected to use an
-      // external mechanism such as restoration from an operational snapshot
-      // that doesn't include them.
-      sqlDeleteOldItems.run(vatID, startPos, endPos);
-    }
     return newSpanIncarnation;
   }
 

diff --git a/packages/swing-store/test/deletion.test.js b/packages/swing-store/test/deletion.test.js
@@ -433,7 +433,7 @@ const testSlowTranscriptDeletion = test.macro({
   exec: execSlowTranscriptDeletion,
 });
 test(testSlowTranscriptDeletion, { keepTranscripts: true });
-test.failing(testSlowTranscriptDeletion, { keepTranscripts: false });
+test(testSlowTranscriptDeletion, { keepTranscripts: false });
 
 test('slow deletion without stopUsingTranscript', async t => {
   // slow deletion should work even without stopUsingTranscript