@fluidframework/container-runtime 2.0.0-internal.3.1.0 → 2.0.0-internal.3.2.0

package/lib/{garbageCollection.js → gc/garbageCollection.js}

@@ -16,103 +16,17 @@ var __rest = (this && this.__rest) || function (s, e) {
 import { assert, LazyPromise, Timer } from "@fluidframework/common-utils";
 import { ClientSessionExpiredError, DataProcessingError, UsageError, } from "@fluidframework/container-utils";
 import { cloneGCData, concatGarbageCollectionData, getGCDataFromSnapshot, runGarbageCollection, trimLeadingSlashes, } from "@fluidframework/garbage-collector";
-import { SummaryType } from "@fluidframework/protocol-definitions";
-import { gcTreeKey, gcBlobPrefix, gcTombstoneBlobKey, gcDeletedBlobKey, } from "@fluidframework/runtime-definitions";
-import { mergeStats, packagePathToTelemetryProperty, SummaryTreeBuilder, } from "@fluidframework/runtime-utils";
+import { gcTreeKey, } from "@fluidframework/runtime-definitions";
+import { packagePathToTelemetryProperty, } from "@fluidframework/runtime-utils";
 import { ChildLogger, generateStack, loggerToMonitoringContext, PerformanceEvent, TelemetryDataTag, } from "@fluidframework/telemetry-utils";
-import { RuntimeHeaders } from "./containerRuntime";
-import { getSummaryForDatastores } from "./dataStores";
-import { currentGCVersion, defaultInactiveTimeoutMs, defaultSessionExpiryDurationMs, disableSweepLogKey, disableTombstoneKey, gcVersionUpgradeToV2Key, gcTestModeKey, oneDayMs, runGCKey, runSessionExpiryKey, runSweepKey, stableGCVersion, trackGCStateKey, gcTombstoneGenerationOptionName, } from "./garbageCollectionConstants";
-import { sendGCUnexpectedUsageEvent } from "./garbageCollectionHelpers";
+import { RuntimeHeaders } from "../containerRuntime";
+import { getSummaryForDatastores } from "../dataStores";
+import { dataStoreAttributesBlobName, } from "../summary";
+import { defaultInactiveTimeoutMs, defaultSessionExpiryDurationMs, disableSweepLogKey, disableTombstoneKey, GCNodeType, gcTestModeKey, oneDayMs, runGCKey, runSessionExpiryKey, runSweepKey, trackGCStateKey, gcTombstoneGenerationOptionName, UnreferencedState, } from "./gcDefinitions";
+import { getGCVersion, sendGCUnexpectedUsageEvent } from "./gcHelpers";
+import { GCSummaryStateTracker } from "./gcSummaryStateTracker";
 import { SweepReadyUsageDetectionHandler } from "./gcSweepReadyUsageDetection";
-import { getGCVersion, metadataBlobName, dataStoreAttributesBlobName, } from "./summaryFormat";
-/** The types of GC nodes in the GC reference graph. */
-export const GCNodeType = {
-    // Nodes that are for data stores.
-    DataStore: "DataStore",
-    // Nodes that are within a data store. For example, DDS nodes.
-    SubDataStore: "SubDataStore",
-    // Nodes that are for attachment blobs, i.e., blobs uploaded via BlobManager.
-    Blob: "Blob",
-    // Nodes that are neither of the above. For example, root node.
-    Other: "Other",
-};
-/** The state of node that is unreferenced. */
-export const UnreferencedState = {
-    /** The node is active, i.e., it can become referenced again. */
-    Active: "Active",
-    /** The node is inactive, i.e., it should not become referenced. */
-    Inactive: "Inactive",
-    /** The node is ready to be deleted by the sweep phase. */
-    SweepReady: "SweepReady",
-};
-/**
- * Helper class that tracks the state of an unreferenced node such as the time it was unreferenced and if it can
- * be deleted by the sweep phase.
- */
-export class UnreferencedStateTracker {
-    constructor(unreferencedTimestampMs, 
-    /** The time after which node transitions to Inactive state. */
-    inactiveTimeoutMs, 
-    /** The current reference timestamp used to track how long this node has been unreferenced for. */
-    currentReferenceTimestampMs, 
-    /** The time after which node transitions to SweepReady state; undefined if session expiry is disabled. */
-    sweepTimeoutMs) {
-        this.unreferencedTimestampMs = unreferencedTimestampMs;
-        this.inactiveTimeoutMs = inactiveTimeoutMs;
-        this.sweepTimeoutMs = sweepTimeoutMs;
-        this._state = UnreferencedState.Active;
-        if (this.sweepTimeoutMs !== undefined) {
-            assert(this.inactiveTimeoutMs <= this.sweepTimeoutMs, 0x3b0 /* inactive timeout must not be greater than the sweep timeout */);
-        }
-        this.sweepTimer = new TimerWithNoDefaultTimeout(() => {
-            this._state = UnreferencedState.SweepReady;
-            assert(!this.inactiveTimer.hasTimer, 0x3b1 /* inactiveTimer still running after sweepTimer fired! */);
-        });
-        this.inactiveTimer = new TimerWithNoDefaultTimeout(() => {
-            this._state = UnreferencedState.Inactive;
-            // After the node becomes inactive, start the sweep timer after which the node will be ready for sweep.
-            if (this.sweepTimeoutMs !== undefined) {
-                this.sweepTimer.restart(this.sweepTimeoutMs - this.inactiveTimeoutMs);
-            }
-        });
-        this.updateTracking(currentReferenceTimestampMs);
-    }
-    get state() {
-        return this._state;
-    }
-    /* Updates the unreferenced state based on the provided timestamp. */
-    updateTracking(currentReferenceTimestampMs) {
-        const unreferencedDurationMs = currentReferenceTimestampMs - this.unreferencedTimestampMs;
-        // If the node has been unreferenced for sweep timeout amount of time, update the state to SweepReady.
-        if (this.sweepTimeoutMs !== undefined && unreferencedDurationMs >= this.sweepTimeoutMs) {
-            this._state = UnreferencedState.SweepReady;
-            this.clearTimers();
-            return;
-        }
-        // If the node has been unreferenced for inactive timeoutMs amount of time, update the state to inactive.
-        // Also, start a timer for the sweep timeout.
-        if (unreferencedDurationMs >= this.inactiveTimeoutMs) {
-            this._state = UnreferencedState.Inactive;
-            this.inactiveTimer.clear();
-            if (this.sweepTimeoutMs !== undefined) {
-                this.sweepTimer.restart(this.sweepTimeoutMs - unreferencedDurationMs);
-            }
-            return;
-        }
-        // The node is still active. Ensure the inactive timer is running with the proper remaining duration.
-        this.inactiveTimer.restart(this.inactiveTimeoutMs - unreferencedDurationMs);
-    }
-    clearTimers() {
-        this.inactiveTimer.clear();
-        this.sweepTimer.clear();
-    }
-    /** Stop tracking this node. Reset the unreferenced timers and state, if any. */
-    stopTracking() {
-        this.clearTimers();
-        this._state = UnreferencedState.Active;
-    }
-}
+import { UnreferencedStateTracker } from "./gcUnreferencedStateTracker";
 /**
  * The garbage collector for the container runtime. It consolidates the garbage collection functionality and maintains
  * its state across summaries.
@@ -167,13 +81,8 @@ export class GarbageCollector {
         this.mc = loggerToMonitoringContext(ChildLogger.create(createParams.baseLogger, "GarbageCollector", {
             all: { completedGCRuns: () => this.completedRuns },
         }));
-        // If version upgrade is not enabled, fall back to the stable GC version.
-        this.currentGCVersion =
-            this.mc.config.getBoolean(gcVersionUpgradeToV2Key) === true
-                ? currentGCVersion
-                : stableGCVersion;
         this.sweepReadyUsageHandler = new SweepReadyUsageDetectionHandler(createParams.getContainerDiagnosticId(), this.mc, this.runtime.closeFn);
-        let prevSummaryGCVersion;
+        let gcVersionInBaseSnapshot;
         /**
          * Sweep timeout is the time after which unreferenced content can be swept.
          * Sweep timeout = session expiry timeout + snapshot cache expiry timeout + one day buffer.
@@ -196,10 +105,10 @@ export class GarbageCollector {
          * For existing containers, we get this information from the metadata blob of its summary.
          */
         if (createParams.existing) {
-            prevSummaryGCVersion = getGCVersion(metadata);
+            gcVersionInBaseSnapshot = getGCVersion(metadata);
             // Existing documents which did not have metadata blob or had GC disabled have version as 0. For all
             // other existing documents, GC is enabled.
-            this.gcEnabled = prevSummaryGCVersion > 0;
+            this.gcEnabled = gcVersionInBaseSnapshot > 0;
             this.sweepEnabled = (_a = metadata === null || metadata === void 0 ? void 0 : metadata.sweepEnabled) !== null && _a !== void 0 ? _a : false;
             this.sessionExpiryTimeoutMs = metadata === null || metadata === void 0 ? void 0 : metadata.sessionExpiryTimeoutMs;
             this.sweepTimeoutMs =
@@ -242,9 +151,6 @@ export class GarbageCollector {
             });
             this.sessionExpiryTimer.start();
         }
-        // For existing document, the latest summary is the one that we loaded from. So, use its GC version as the
-        // latest tracked GC version. For new documents, we will be writing the first summary with the current version.
-        this.latestSummaryGCVersion = prevSummaryGCVersion !== null && prevSummaryGCVersion !== void 0 ? prevSummaryGCVersion : this.currentGCVersion;
         /**
          * Whether GC should run or not. The following conditions have to be met to run sweep:
          *
@@ -289,8 +195,7 @@ export class GarbageCollector {
         // via feature flags.
         this.tombstoneMode =
             !this.shouldRunSweep && this.mc.config.getBoolean(disableTombstoneKey) !== true;
-        // If GC ran in the container that generated the base snapshot, it will have a GC tree.
-        this.wasGCRunInLatestSummary = (baseSnapshot === null || baseSnapshot === void 0 ? void 0 : baseSnapshot.trees[gcTreeKey]) !== undefined;
+        this.summaryStateTracker = new GCSummaryStateTracker(this.shouldRunGC, this.trackGCState, this.tombstoneMode, this.mc, (baseSnapshot === null || baseSnapshot === void 0 ? void 0 : baseSnapshot.trees[gcTreeKey]) !== undefined /* wasGCRunInBaseSnapshot */, gcVersionInBaseSnapshot);
         // Get the GC data from the base snapshot. Use LazyPromise because we only want to do this once since it
         // it involves fetching blobs from storage which is expensive.
         this.baseSnapshotDataP = new LazyPromise(async () => {
@@ -417,46 +322,13 @@ export class GarbageCollector {
     static create(createParams) {
         return new GarbageCollector(createParams);
     }
-    /**
-     * Tells whether the GC state needs to be reset in the next summary. We need to do this if:
-     *
-     * 1. GC was enabled and is now disabled. The GC state needs to be removed and everything becomes referenced.
-     *
-     * 2. GC was disabled and is now enabled. The GC state needs to be regenerated and added to summary.
-     *
-     * 3. GC is enabled and the latest summary state is refreshed from a snapshot that had GC disabled and vice-versa.
-     *
-     * 4. The GC version in the latest summary is different from the current GC version. This can happen if:
-     *
-     * 4.1. The summary this client loaded with has data from a different GC version.
-     *
-     * 4.2. This client's latest summary was updated from a snapshot that has a different GC version.
-     */
-    get summaryStateNeedsReset() {
-        return (this.gcStateNeedsReset ||
-            (this.shouldRunGC && this.latestSummaryGCVersion !== this.currentGCVersion));
-    }
-    /**
-     * Tells whether the GC state needs to be reset. This can happen under 3 conditions:
-     *
-     * 1. The base snapshot contains GC state but GC is disabled. This will happen the first time GC is disabled after
-     * it was enabled before. GC state needs to be removed from summary and all nodes should be marked referenced.
-     *
-     * 2. The base snapshot does not have GC state but GC is enabled. This will happen the very first time GC runs on
-     * a document and the first time GC is enabled after is was disabled before.
-     *
-     * 3. GC is enabled and the latest summary state is refreshed from a snapshot that had GC disabled and vice-versa.
-     *
-     * Note that the state will be reset only once for the first summary generated after this returns true. After that,
-     * this will return false.
-     */
-    get gcStateNeedsReset() {
-        return this.wasGCRunInLatestSummary !== this.shouldRunGC;
-    }
     /** Returns a list of all the configurations for garbage collection. */
     get configs() {
         return Object.assign({ gcEnabled: this.gcEnabled, sweepEnabled: this.sweepEnabled, runGC: this.shouldRunGC, runSweep: this.shouldRunSweep, testMode: this.testMode, tombstoneMode: this.tombstoneMode, sessionExpiry: this.sessionExpiryTimeoutMs, sweepTimeout: this.sweepTimeoutMs, inactiveTimeout: this.inactiveTimeoutMs, trackGCState: this.trackGCState }, this.gcOptions);
     }
+    get summaryStateNeedsReset() {
+        return this.summaryStateTracker.doesSummaryStateNeedReset();
+    }
     /**
      * Called during container initialization. Initialize from the tombstone state in the base snapshot. This is done
      * during initialization so that deleted or tombstoned objects are marked as such before they are loaded or used.
@@ -538,10 +410,11 @@ export class GarbageCollector {
             this.tombstones = (snapshotData === null || snapshotData === void 0 ? void 0 : snapshotData.tombstones) ? Array.from(snapshotData.tombstones) : [];
             this.runtime.updateTombstonedRoutes(this.tombstones);
         }
+        // Update the summary state tracker's state from this snapshot.
+        this.summaryStateTracker.updateStateFromSnapshotData(snapshotData);
         // If there is no snapshot data, it means this snapshot was generated with GC disabled. Unset all GC state.
         if (snapshotData === undefined) {
             this.gcDataFromLastRun = undefined;
-            this.latestSummaryData = undefined;
             return;
         }
         // Update unreferenced state tracking as per the GC state in the snapshot data and update gcDataFromLastRun
@@ -554,14 +427,6 @@ export class GarbageCollector {
             gcNodes[nodeId] = Array.from(nodeData.outboundRoutes);
         }
         this.gcDataFromLastRun = { gcNodes };
-        // If tracking state across summaries, update latest summary data from the snapshot's GC data.
-        if (this.trackGCState) {
-            this.latestSummaryData = {
-                serializedGCState: JSON.stringify(generateSortedGCState(snapshotData.gcState)),
-                serializedTombstones: JSON.stringify(snapshotData.tombstones),
-                serializedDeletedNodes: JSON.stringify(snapshotData.deletedNodes),
-            };
-        }
     }
     /**
      * Called when the connection state of the runtime changes, i.e., it connects or disconnects. GC subscribes to this
@@ -591,9 +456,10 @@ export class GarbageCollector {
      * Runs garbage collection and updates the reference / used state of the nodes in the container.
      * @returns stats of the GC run or undefined if GC did not run.
      */
-    async collectGarbage(options) {
+    async collectGarbage(options, telemetryContext) {
         var _a;
-        const fullGC = (_a = options.fullGC) !== null && _a !== void 0 ? _a : (this.gcOptions.runFullGC === true || this.summaryStateNeedsReset);
+        const fullGC = (_a = options.fullGC) !== null && _a !== void 0 ? _a : (this.gcOptions.runFullGC === true ||
+            this.summaryStateTracker.doesSummaryStateNeedReset());
         const logger = options.logger
             ? ChildLogger.create(options.logger, undefined, {
                 all: { completedGCRuns: () => this.completedRuns },
@@ -616,6 +482,11 @@ export class GarbageCollector {
             });
             return undefined;
         }
+        // Add the options that are used to run GC to the telemetry context.
+        telemetryContext === null || telemetryContext === void 0 ? void 0 : telemetryContext.setMultiple("fluid_GC", "Options", {
+            fullGC,
+            runSweep: options.runSweep,
+        });
         return PerformanceEvent.timedExecAsync(logger, { eventName: "GarbageCollection" }, async (event) => {
             await this.runPreGCSteps();
             // Get the runtime's GC data and run GC on the reference graph in it.
@@ -683,97 +554,7 @@ export class GarbageCollector {
                 unreferencedTimestampMs: (_a = this.unreferencedNodesState.get(nodeId)) === null || _a === void 0 ? void 0 : _a.unreferencedTimestampMs,
             };
         }
-        const serializedGCState = JSON.stringify(generateSortedGCState(gcState));
-        // Serialize and write deleted nodes, if any. This is done irrespective of whether sweep is enabled or not so
-        // to identify deleted nodes' usage.
-        const serializedDeletedNodes = this.deletedNodes.size > 0
-            ? JSON.stringify(Array.from(this.deletedNodes).sort())
-            : undefined;
-        // If running in tombstone mode, serialize and write tombstones, if any.
-        const serializedTombstones = this.tombstoneMode
-            ? this.tombstones.length > 0
-                ? JSON.stringify(this.tombstones.sort())
-                : undefined
-            : undefined;
-        /**
-         * Incremental summary of GC data - If none of GC state, deleted nodes or tombstones changed since last summary,
-         * write summary handle instead of summary tree for GC.
-         * Otherwise, write the GC summary tree. In the tree, for each of these that changed, write a summary blob and
-         * for each of these that did not change, write a summary handle.
-         */
-        if (this.trackGCState) {
-            this.pendingSummaryData = {
-                serializedGCState,
-                serializedTombstones,
-                serializedDeletedNodes,
-            };
-            if (trackState && !fullTree && this.latestSummaryData !== undefined) {
-                // If nothing changed since last summary, send a summary handle for the entire GC data.
-                if (this.latestSummaryData.serializedGCState === serializedGCState &&
-                    this.latestSummaryData.serializedTombstones === serializedTombstones) {
-                    const stats = mergeStats();
-                    stats.handleNodeCount++;
-                    return {
-                        summary: {
-                            type: SummaryType.Handle,
-                            handle: `/${gcTreeKey}`,
-                            handleType: SummaryType.Tree,
-                        },
-                        stats,
-                    };
-                }
-                // If some state changed, build a GC summary tree.
-                return this.buildGCSummaryTree(serializedGCState, serializedTombstones, serializedDeletedNodes, true /* trackState */);
-            }
-        }
-        // If not tracking GC state, build a GC summary tree without any summary handles.
-        return this.buildGCSummaryTree(serializedGCState, serializedTombstones, serializedDeletedNodes, false /* trackState */);
-    }
-    /**
-     * Builds the GC summary tree which contains GC state, deleted nodes and tombstones.
-     * If trackState is false, all of GC state, deleted nodes and tombstones are written as summary blobs.
-     * If trackState is true, only states that changed are written. Rest are written as handles.
-     * @param serializedGCState - The GC state serialized as string.
-     * @param serializedTombstones - The tombstone state serialized as string.
-     * @param serializedDeletedNodes - Deleted nodes serialized as string.
-     * @param trackState - Whether we are tracking GC state across summaries.
-     * @returns the GC summary tree.
-     */
-    buildGCSummaryTree(serializedGCState, serializedTombstones, serializedDeletedNodes, trackState) {
-        var _a, _b, _c;
-        const gcStateBlobKey = `${gcBlobPrefix}_root`;
-        const builder = new SummaryTreeBuilder();
-        // If the GC state hasn't changed, write a summary handle, else write a summary blob for it.
-        if (((_a = this.latestSummaryData) === null || _a === void 0 ? void 0 : _a.serializedGCState) === serializedGCState && trackState) {
-            builder.addHandle(gcStateBlobKey, SummaryType.Blob, `/${gcTreeKey}/${gcStateBlobKey}`);
-        }
-        else {
-            builder.addBlob(gcStateBlobKey, serializedGCState);
-        }
-        // If tombstones exist, write a summary handle if it hasn't changed. If it has changed, write a
-        // summary blob.
-        if (serializedTombstones !== undefined) {
-            if (((_b = this.latestSummaryData) === null || _b === void 0 ? void 0 : _b.serializedTombstones) === serializedTombstones &&
-                trackState) {
-                builder.addHandle(gcTombstoneBlobKey, SummaryType.Blob, `/${gcTreeKey}/${gcTombstoneBlobKey}`);
-            }
-            else {
-                builder.addBlob(gcTombstoneBlobKey, serializedTombstones);
-            }
-        }
-        // If there are no deleted nodes, return the summary tree.
-        if (serializedDeletedNodes === undefined) {
-            return builder.getSummaryTree();
-        }
-        // If the deleted nodes hasn't changed, write a summary handle, else write a summary blob for it.
-        if (((_c = this.latestSummaryData) === null || _c === void 0 ? void 0 : _c.serializedDeletedNodes) === serializedDeletedNodes &&
-            trackState) {
-            builder.addHandle(gcDeletedBlobKey, SummaryType.Blob, `/${gcTreeKey}/${gcDeletedBlobKey}`);
-        }
-        else {
-            builder.addBlob(gcDeletedBlobKey, serializedDeletedNodes);
-        }
-        return builder.getSummaryTree();
+        return this.summaryStateTracker.summarize(fullTree, trackState, gcState, this.deletedNodes, this.tombstones);
     }
     getMetadata() {
         return {
@@ -781,7 +562,7 @@ export class GarbageCollector {
              * If GC is enabled, the GC data is written using the current GC version and that is the gcFeature that goes
              * into the metadata blob. If GC is disabled, the gcFeature is 0.
              */
-            gcFeature: this.gcEnabled ? this.currentGCVersion : 0,
+            gcFeature: this.gcEnabled ? this.summaryStateTracker.currentGCVersion : 0,
             gcFeatureMatrix: this.persistedGcFeatureMatrix,
             sessionExpiryTimeoutMs: this.sessionExpiryTimeoutMs,
             sweepEnabled: this.sweepEnabled,
@@ -800,52 +581,22 @@ export class GarbageCollector {
      * is downloaded and should be used to update the state.
      */
     async refreshLatestSummary(proposalHandle, result, readAndParseBlob) {
-        // If the latest summary was updated and the summary was tracked, this client is the one that generated this
-        // summary. So, update wasGCRunInLatestSummary.
-        // Note that this has to be updated if GC did not run too. Otherwise, `gcStateNeedsReset` will always return
-        // true in scenarios where GC is disabled but enabled in the snapshot we loaded from.
-        if (result.latestSummaryUpdated && result.wasSummaryTracked) {
-            this.wasGCRunInLatestSummary = this.shouldRunGC;
-        }
-        if (!result.latestSummaryUpdated || !this.shouldRunGC) {
-            return;
-        }
-        // If the summary was tracked by this client, it was the one that generated the summary in the first place.
-        // Update latest state from pending.
-        if (result.wasSummaryTracked) {
-            this.latestSummaryGCVersion = this.currentGCVersion;
-            if (this.trackGCState) {
-                this.latestSummaryData = this.pendingSummaryData;
-                this.pendingSummaryData = undefined;
+        const latestSnapshotData = await this.summaryStateTracker.refreshLatestSummary(proposalHandle, result, readAndParseBlob);
+        // If the latest summary was updated but it was not tracked by this client, our state needs to be updated from
+        // this snapshot data.
+        if (this.shouldRunGC && result.latestSummaryUpdated && !result.wasSummaryTracked) {
+            // The current reference timestamp should be available if we are refreshing state from a snapshot. There has
+            // to be at least one op (summary op / ack, if nothing else) if a snapshot was taken.
+            const currentReferenceTimestampMs = this.runtime.getCurrentReferenceTimestampMs();
+            if (currentReferenceTimestampMs === undefined) {
+                throw DataProcessingError.create("No reference timestamp when updating GC state from snapshot", "refreshLatestSummary", undefined, {
+                    proposalHandle,
+                    summaryRefSeq: result.summaryRefSeq,
+                    details: JSON.stringify(this.configs),
+                });
             }
-            return;
-        }
-        // If the summary was not tracked by this client, the state should be updated from the downloaded snapshot.
-        const snapshotTree = result.snapshotTree;
-        const metadataBlobId = snapshotTree.blobs[metadataBlobName];
-        if (metadataBlobId) {
-            const metadata = await readAndParseBlob(metadataBlobId);
-            this.latestSummaryGCVersion = getGCVersion(metadata);
-        }
-        // The current reference timestamp should be available if we are refreshing state from a snapshot. There has
-        // to be at least one op (summary op / ack, if nothing else) if a snapshot was taken.
-        const currentReferenceTimestampMs = this.runtime.getCurrentReferenceTimestampMs();
-        if (currentReferenceTimestampMs === undefined) {
-            throw DataProcessingError.create("No reference timestamp when updating GC state from snapshot", "refreshLatestSummary", undefined, {
-                proposalHandle,
-                summaryRefSeq: result.summaryRefSeq,
-                details: JSON.stringify(this.configs),
-            });
-        }
-        const gcSnapshotTree = snapshotTree.trees[gcTreeKey];
-        // If GC ran in the container that generated this snapshot, it will have a GC tree.
-        this.wasGCRunInLatestSummary = gcSnapshotTree !== undefined;
-        let latestGCData;
-        if (gcSnapshotTree !== undefined) {
-            latestGCData = await getGCDataFromSnapshot(gcSnapshotTree, readAndParseBlob);
+            this.updateStateFromSnapshotData(latestSnapshotData, currentReferenceTimestampMs);
         }
-        this.updateStateFromSnapshotData(latestGCData, currentReferenceTimestampMs);
-        this.pendingSummaryData = undefined;
     }
     /**
      * Called when a node with the given id is updated. If the node is inactive, log an error.
@@ -968,7 +719,7 @@ export class GarbageCollector {
     runSweepPhase(sweepReadyNodes, gcData) {
         // TODO: GC:Validation - validate that removed routes are not double deleted
         // TODO: GC:Validation - validate that the child routes of removed routes are deleted as well
-        const sweptRoutes = this.runtime.deleteUnusedNodes(sweepReadyNodes);
+        const sweptRoutes = this.runtime.deleteSweepReadyNodes(sweepReadyNodes);
         const updatedGCData = this.deleteSweptRoutes(sweptRoutes, gcData);
         for (const nodeId of sweptRoutes) {
             const nodeStateTracker = this.unreferencedNodesState.get(nodeId);
@@ -1238,7 +989,7 @@ export class GarbageCollector {
         this.loggedUnreferencedEvents.add(uniqueEventId);
         const propsToLog = Object.assign(Object.assign({ id: nodeId, type: nodeType, unrefTime: nodeStateTracker.unreferencedTimestampMs, age: currentReferenceTimestampMs - nodeStateTracker.unreferencedTimestampMs, timeout: nodeStateTracker.state === UnreferencedState.Inactive
                 ? this.inactiveTimeoutMs
-                : this.sweepTimeoutMs, completedGCRuns: this.completedRuns, lastSummaryTime: this.getLastSummaryTimestampMs() }, this.createContainerMetadata), { externalRequest: requestHeaders === null || requestHeaders === void 0 ? void 0 : requestHeaders[RuntimeHeaders.externalRequest], viaHandle: requestHeaders === null || requestHeaders === void 0 ? void 0 : requestHeaders[RuntimeHeaders.viaHandle], fromId: fromNodeId });
+                : this.sweepTimeoutMs, completedGCRuns: this.completedRuns, lastSummaryTime: this.getLastSummaryTimestampMs() }, this.createContainerMetadata), { viaHandle: requestHeaders === null || requestHeaders === void 0 ? void 0 : requestHeaders[RuntimeHeaders.viaHandle], fromId: fromNodeId });
         // For summarizer client, queue the event so it is logged the next time GC runs if the event is still valid.
         // For non-summarizer client, log the event now since GC won't run on it. This may result in false positives
         // but it's a good signal nonetheless and we can consume it with a grain of salt.
@@ -1309,30 +1060,4 @@ export class GarbageCollector {
         this.pendingEventsQueue = [];
     }
 }
-function generateSortedGCState(gcState) {
-    const sortableArray = Object.entries(gcState.gcNodes);
-    sortableArray.sort(([a], [b]) => a.localeCompare(b));
-    const sortedGCState = { gcNodes: {} };
-    for (const [nodeId, nodeData] of sortableArray) {
-        nodeData.outboundRoutes.sort();
-        sortedGCState.gcNodes[nodeId] = nodeData;
-    }
-    return sortedGCState;
-}
-/** A wrapper around common-utils Timer that requires the timeout when calling start/restart */
-class TimerWithNoDefaultTimeout extends Timer {
-    constructor(callback) {
-        // The default timeout/handlers will never be used since start/restart pass overrides below
-        super(0, () => {
-            throw new Error("DefaultHandler should not be used");
-        });
-        this.callback = callback;
-    }
-    start(timeoutMs) {
-        super.start(timeoutMs, this.callback);
-    }
-    restart(timeoutMs) {
-        super.restart(timeoutMs, this.callback);
-    }
-}
 //# sourceMappingURL=garbageCollection.js.map