fix: Add consensus-independent vat snapshot/transcript archiving configuration

golang/cosmos/x/swingset/config.go

@@ -15,8 +15,10 @@ import (
 )
 
 const (
-	ConfigPrefix = "swingset"
-	FlagSlogfile = ConfigPrefix + ".slogfile"
+	ConfigPrefix                = "swingset"
+	FlagSlogfile                = ConfigPrefix + ".slogfile"
+	FlagVatSnapshotArchiveDir   = ConfigPrefix + ".vat-snapshot-archive-dir"
+	FlagVatTranscriptArchiveDir = ConfigPrefix + ".vat-transcript-archive-dir"
 
 	SnapshotRetentionOptionDebug       = "debug"
 	SnapshotRetentionOptionOperational = "operational"
@@ -73,6 +75,12 @@ vat-snapshot-retention = "{{ .Swingset.VatSnapshotRetention }}"
 # * "default": determined by 'pruning' ("archival" if 'pruning' is "nothing",
 #   otherwise "operational")
 vat-transcript-retention = "{{ .Swingset.VatTranscriptRetention }}"
+
+# Archival of gzipped vat snapshots.
+vat-snapshot-archive-dir = "{{ .Swingset.VatSnapshotArchiveDir }}"
+
+# Archival of historical (i.e., closed) vat transcript spans to gzipped files.
+vat-transcript-archive-dir = "{{ .Swingset.VatTranscriptArchiveDir }}"
 `
 
 // SwingsetConfig defines configuration for the SwingSet VM.
@@ -106,6 +114,13 @@ type SwingsetConfig struct {
 	// * "default": determined by `pruning` ("archival" if `pruning` is
 	//   "nothing", otherwise "operational")
 	VatTranscriptRetention string `mapstructure:"vat-transcript-retention" json:"vatTranscriptRetention,omitempty"`
+
+	// VatSnapshotArchiveDir controls archival of gzipped vat snapshots.
+	VatSnapshotArchiveDir string `mapstructure:"vat-snapshot-archive-dir" json:"vatSnapshotArchiveDir,omitempty"`
+
+	// VatTranscriptArchiveDir controls archival of historical (i.e., closed) vat
+	// transcript spans to gzipped files.
+	VatTranscriptArchiveDir string `mapstructure:"vat-transcript-archive-dir" json:"vatTranscriptArchiveDir,omitempty"`
 }
 
 var DefaultSwingsetConfig = SwingsetConfig{
@@ -202,5 +217,17 @@ func SwingsetConfigFromViper(resolvedConfig servertypes.AppOptions) (*SwingsetCo
 	}
 	ssConfig.SlogFile = resolvedSlogFile
 
+	resolvedSnapshotDir, err := resolvePath(ssConfig.VatSnapshotArchiveDir, FlagVatSnapshotArchiveDir)
+	if err != nil {
+		return nil, err
+	}
+	ssConfig.VatSnapshotArchiveDir = resolvedSnapshotDir
+
+	resolvedTranscriptDir, err := resolvePath(ssConfig.VatTranscriptArchiveDir, FlagVatTranscriptArchiveDir)
+	if err != nil {
+		return nil, err
+	}
+	ssConfig.VatTranscriptArchiveDir = resolvedTranscriptDir
+
 	return ssConfig, nil
 }

packages/SwingSet/src/kernel/kernel.js

@@ -4,7 +4,7 @@ import { assert, Fail } from '@endo/errors';
 import { isNat } from '@endo/nat';
 import { mustMatch, M } from '@endo/patterns';
 import { importBundle } from '@endo/import-bundle';
-import { objectMetaMap } from '@agoric/internal';
+import { objectMetaMap, PromiseAllOrErrors } from '@agoric/internal';
 import { makeUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
 import { kser, kslot, makeError } from '@agoric/kmarshal';
 import { assertKnownOptions } from '../lib/assertOptions.js';
@@ -261,8 +261,12 @@ export default function buildKernel(
    */
   async function terminateVat(vatID, shouldReject, info) {
     console.log(`kernel terminating vat ${vatID} (failure=${shouldReject})`);
-    let critical = false;
     insistCapData(info);
+    // Note that it's important for much of this work to happen within the
+    // synchronous prelude. For details, see
+    // https://github.com/Agoric/agoric-sdk/pull/10055#discussion_r1754918394
+    let critical = false;
+    const deferred = [];
     // ISSUE: terminate stuff in its own crank like creation?
     // TODO: if a static vat terminates, panic the kernel?
     // TODO: guard against somebody telling vatAdmin to kill a vat twice
@@ -287,7 +291,7 @@ export default function buildKernel(
       // remove vatID from the list of live vats, and mark for deletion
       kernelKeeper.deleteVatID(vatID);
       kernelKeeper.markVatAsTerminated(vatID);
-      kernelKeeper.removeVatFromSwingStoreExports(vatID);
+      deferred.push(kernelKeeper.removeVatFromSwingStoreExports(vatID));
       for (const kpid of deadPromises) {
         resolveToError(kpid, makeError('vat terminated'), vatID);
       }
@@ -302,9 +306,7 @@ export default function buildKernel(
       // it's going to be a small cost compared to the trouble you're probably
       // already in anyway if this happens.
       panic(`critical vat ${vatID} failed`, Error(info.body));
-      return;
-    }
-    if (vatAdminRootKref) {
+    } else if (vatAdminRootKref) {
       // static vat termination can happen before vat admin vat exists
       notifyTermination(
         vatID,
@@ -319,8 +321,11 @@ export default function buildKernel(
       );
     }
 
-    // worker needs to be stopped, if any
-    await vatWarehouse.stopWorker(vatID);
+    // worker, if present, needs to be stopped
+    // (note that this only applies to ephemeral vats)
+    deferred.push(vatWarehouse.stopWorker(vatID));
+
+    await PromiseAllOrErrors(deferred);
   }
 
   function notifyMeterThreshold(meterID) {

packages/SwingSet/src/kernel/state/kernelKeeper.js

@@ -930,13 +930,13 @@ export default function makeKernelKeeper(
     kvStore.set(`${kernelSlot}.data.slots`, capdata.slots.join(','));
   }
 
-  function removeVatFromSwingStoreExports(vatID) {
+  async function removeVatFromSwingStoreExports(vatID) {
     // Delete primary swingstore records for this vat, in preparation
     // for (slow) deletion. After this, swingstore exports will omit
     // this vat. This is called from the kernel's terminateVat, which
     // initiates (but does not complete) deletion.
     snapStore.stopUsingLastSnapshot(vatID);
-    transcriptStore.stopUsingTranscript(vatID);
+    await transcriptStore.stopUsingTranscript(vatID);
   }
 
   /**

packages/SwingSet/src/kernel/state/vatKeeper.js

@@ -655,7 +655,7 @@ export function makeVatKeeper(
     addToTranscript(makeSaveSnapshotItem(snapshotID));
 
     // then start a new transcript span
-    transcriptStore.rolloverSpan(vatID);
+    await transcriptStore.rolloverSpan(vatID);
 
     // then push a load-snapshot entry, so that the current span
     // always starts with an initialize-worker or load-snapshot
@@ -715,7 +715,7 @@ export function makeVatKeeper(
     return transcriptStore.deleteVatTranscripts(vatID, budget);
   }
 
-  function beginNewIncarnation() {
+  async function beginNewIncarnation() {
     if (snapStore) {
       snapStore.stopUsingLastSnapshot(vatID);
     }

packages/SwingSet/src/kernel/vat-admin-hooks.js

@@ -94,6 +94,9 @@ export function makeVatAdminHooks(tools) {
       // we don't need to incrementRefCount because if terminateVat sends
       // 'reason' to vat-admin, it uses notifyTermination / queueToKref /
       // doSend, and doSend() does its own incref
+      // FIXME: This assumes that most work of terminateVat happens in the
+      // synchronous prelude, which should be made more obvious. For details,
+      // see https://github.com/Agoric/agoric-sdk/pull/10055#discussion_r1754918394
       void terminateVat(vatID, true, marshalledReason);
       // TODO: terminateVat is async, result doesn't fire until worker
       // is dead. To fix this we'll probably need to move termination

packages/SwingSet/test/snapshots/xsnap-store.test.js.md

@@ -9,6 +9,7 @@ Generated by [AVA](https://avajs.dev).
 > initial snapshot
 
     {
+      archiveWriteSeconds: undefined,
       compressSeconds: 0,
       dbSaveSeconds: 0,
       hash: 'bee3b82eebdde4c5c3774fb95b7efe88382f7dc4afab90b4e0e58add54d6b81c',
@@ -18,6 +19,7 @@ Generated by [AVA](https://avajs.dev).
 > after SES boot - sensitive to SES-shim, XS, and supervisor
 
     {
+      archiveWriteSeconds: undefined,
       compressSeconds: 0,
       dbSaveSeconds: 0,
       hash: '5433501987ce52b3bd9ab47956195669c5adea89b050e8c787eb9da431ce1a6e',
@@ -27,6 +29,7 @@ Generated by [AVA](https://avajs.dev).
 > after use of harden() - sensitive to SES-shim, XS, and supervisor
 
     {
+      archiveWriteSeconds: undefined,
       compressSeconds: 0,
       dbSaveSeconds: 0,
       hash: '4cdc352b710f0719bc6f541631315652b5da19093e18ce844ec274340a37efd5',

packages/cosmic-swingset/src/chain-main.js

@@ -1,14 +1,14 @@
 // @ts-check
 
-import { resolve as pathResolve } from 'path';
+import path from 'node:path';
 import v8 from 'node:v8';
 import process from 'node:process';
 import fs from 'node:fs';
 import fsPromises from 'node:fs/promises';
-import { performance } from 'perf_hooks';
-import { resolve as importMetaResolve } from 'import-meta-resolve';
-import tmpfs from 'tmp';
+import { performance } from 'node:perf_hooks';
 import { fork } from 'node:child_process';
+import { resolve as importMetaResolve } from 'import-meta-resolve';
+import tmp from 'tmp';
 
 import { Fail, q } from '@endo/errors';
 import { E } from '@endo/far';
@@ -33,6 +33,10 @@ import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
 import * as STORAGE_PATH from '@agoric/internal/src/chain-storage-paths.js';
 import * as ActionType from '@agoric/internal/src/action-types.js';
 import { BridgeId, CosmosInitKeyToBridgeId } from '@agoric/internal';
+import {
+  makeArchiveSnapshot,
+  makeArchiveTranscript,
+} from '@agoric/swing-store';
 import {
   makeBufferedStorage,
   makeReadCachingStorage,
@@ -76,6 +80,8 @@ const toNumber = specimen => {
  * @property {number} [maxVatsOnline]
  * @property {'debug' | 'operational'} [vatSnapshotRetention]
  * @property {'archival' | 'operational'} [vatTranscriptRetention]
+ * @property {string} [vatSnapshotArchiveDir]
+ * @property {string} [vatTranscriptArchiveDir]
  */
 const SwingsetConfigShape = M.splitRecord(
   // All known properties are optional, but unknown properties are not allowed.
@@ -85,6 +91,8 @@ const SwingsetConfigShape = M.splitRecord(
     maxVatsOnline: M.number(),
     vatSnapshotRetention: M.or('debug', 'operational'),
     vatTranscriptRetention: M.or('archival', 'operational'),
+    vatSnapshotArchiveDir: M.string(),
+    vatTranscriptArchiveDir: M.string(),
   },
   {},
 );
@@ -159,8 +167,8 @@ const makePrefixedBridgeStorage = (
       return fromBridgeStringValue(ret);
     },
     set: (key, value) => {
-      const path = `${prefix}${key}`;
-      const entry = [path, toBridgeStringValue(value)];
+      const fullPath = `${prefix}${key}`;
+      const entry = [fullPath, toBridgeStringValue(value)];
       call(
         stringify({
           method: setterMethod,
@@ -169,8 +177,8 @@ const makePrefixedBridgeStorage = (
       );
     },
     delete: key => {
-      const path = `${prefix}${key}`;
-      const entry = [path];
+      const fullPath = `${prefix}${key}`;
+      const entry = [fullPath];
       call(
         stringify({
           method: setterMethod,
@@ -315,8 +323,13 @@ export default async function main(progname, args, { env, homedir, agcc }) {
     /** @type {CosmosSwingsetConfig} */
     const swingsetConfig = harden(initAction.resolvedConfig || {});
     validateSwingsetConfig(swingsetConfig);
-    const { slogfile, vatSnapshotRetention, vatTranscriptRetention } =
-      swingsetConfig;
+    const {
+      slogfile,
+      vatSnapshotRetention,
+      vatTranscriptRetention,
+      vatSnapshotArchiveDir,
+      vatTranscriptArchiveDir,
+    } = swingsetConfig;
     const keepSnapshots = vatSnapshotRetention
       ? vatSnapshotRetention !== 'operational'
       : ['1', 'true'].includes(XSNAP_KEEP_SNAPSHOTS);
@@ -471,14 +484,14 @@ export default async function main(progname, args, { env, homedir, agcc }) {
     const swingStoreTraceFile = processValue.getPath({
       envName: 'SWING_STORE_TRACE',
       flagName: 'trace-store',
-      trueValue: pathResolve(stateDBDir, 'store-trace.log'),
+      trueValue: path.resolve(stateDBDir, 'store-trace.log'),
     });
 
     const nodeHeapSnapshots = Number.parseInt(NODE_HEAP_SNAPSHOTS, 10);
 
     let lastCommitTime = 0;
     let commitCallsSinceLastSnapshot = NaN;
-    const snapshotBaseDir = pathResolve(stateDBDir, 'node-heap-snapshots');
+    const snapshotBaseDir = path.resolve(stateDBDir, 'node-heap-snapshots');
 
     if (nodeHeapSnapshots >= 0) {
       fs.mkdirSync(snapshotBaseDir, { recursive: true });
@@ -514,7 +527,7 @@ export default async function main(progname, args, { env, homedir, agcc }) {
         ) {
           commitCallsSinceLastSnapshot = 0;
           heapSnapshot = `Heap-${process.pid}-${Date.now()}.heapsnapshot`;
-          const snapshotPath = pathResolve(snapshotBaseDir, heapSnapshot);
+          const snapshotPath = path.resolve(snapshotBaseDir, heapSnapshot);
           v8.writeHeapSnapshot(snapshotPath);
           heapSnapshotTime = performance.now() - t3;
         }
@@ -537,6 +550,14 @@ export default async function main(progname, args, { env, homedir, agcc }) {
       }
     };
 
+    const fsPowers = { fs, path, tmp };
+    const archiveSnapshot = vatSnapshotArchiveDir
+      ? makeArchiveSnapshot(vatSnapshotArchiveDir, fsPowers)
+      : undefined;
+    const archiveTranscript = vatTranscriptArchiveDir
+      ? makeArchiveTranscript(vatTranscriptArchiveDir, fsPowers)
+      : undefined;
+
     const s = await launch({
       actionQueueStorage,
       highPriorityQueueStorage,
@@ -556,6 +577,8 @@ export default async function main(progname, args, { env, homedir, agcc }) {
       swingStoreTraceFile,
       keepSnapshots,
       keepTranscripts,
+      archiveSnapshot,
+      archiveTranscript,
       afterCommitCallback,
       swingsetConfig,
     });
@@ -608,7 +631,7 @@ export default async function main(progname, args, { env, homedir, agcc }) {
         );
         return performStateSyncImport(options, {
           fs: { ...fs, ...fsPromises },
-          pathResolve,
+          pathResolve: path.resolve,
           log: null,
         });
       }
@@ -632,7 +655,7 @@ export default async function main(progname, args, { env, homedir, agcc }) {
         stateSyncExport = exportData;
 
         await new Promise((resolve, reject) => {
-          tmpfs.dir(
+          tmp.dir(
             {
               prefix: `agd-state-sync-${blockHeight}-`,
               unsafeCleanup: true,

packages/cosmic-swingset/src/launch-chain.js

@@ -332,6 +332,8 @@ export async function launch({
   swingStoreExportCallback,
   keepSnapshots,
   keepTranscripts,
+  archiveSnapshot,
+  archiveTranscript,
   afterCommitCallback = async () => ({}),
   swingsetConfig,
 }) {
@@ -375,6 +377,8 @@ export async function launch({
     exportCallback: swingStoreExportSyncCallback,
     keepSnapshots,
     keepTranscripts,
+    archiveSnapshot,
+    archiveTranscript,
   });
   const { kvStore, commit } = hostStorage;