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

package/src/{garbageCollection.ts → gc/garbageCollection.ts}

@@ -5,7 +5,6 @@
 
 import { ITelemetryLogger } from "@fluidframework/common-definitions";
 import { assert, LazyPromise, Timer } from "@fluidframework/common-utils";
-import { ICriticalContainerError } from "@fluidframework/container-definitions";
 import {
 	ClientSessionExpiredError,
 	DataProcessingError,
@@ -20,28 +19,20 @@ import {
 	runGarbageCollection,
 	trimLeadingSlashes,
 } from "@fluidframework/garbage-collector";
-import { ISnapshotTree, SummaryType } from "@fluidframework/protocol-definitions";
 import {
 	gcTreeKey,
-	gcBlobPrefix,
-	gcTombstoneBlobKey,
 	IGarbageCollectionData,
 	IGarbageCollectionDetailsBase,
 	IGarbageCollectionSnapshotData,
 	IGarbageCollectionState,
 	ISummarizeResult,
 	ITelemetryContext,
-	IGarbageCollectionNodeData,
 	IGarbageCollectionSummaryDetailsLegacy,
-	ISummaryTreeWithStats,
-	gcDeletedBlobKey,
 } from "@fluidframework/runtime-definitions";
 import {
-	mergeStats,
 	packagePathToTelemetryProperty,
 	ReadAndParseBlob,
 	RefreshSummaryResult,
-	SummaryTreeBuilder,
 } from "@fluidframework/runtime-utils";
 import {
 	ChildLogger,
@@ -52,174 +43,38 @@ import {
 	TelemetryDataTag,
 } from "@fluidframework/telemetry-utils";
 
-import { IGCRuntimeOptions, RuntimeHeaders } from "./containerRuntime";
-import { getSummaryForDatastores } from "./dataStores";
+import { IGCRuntimeOptions, RuntimeHeaders } from "../containerRuntime";
+import { getSummaryForDatastores } from "../dataStores";
+import {
+	ReadFluidDataStoreAttributes,
+	dataStoreAttributesBlobName,
+	ICreateContainerMetadata,
+} from "../summary";
 import {
-	currentGCVersion,
 	defaultInactiveTimeoutMs,
 	defaultSessionExpiryDurationMs,
 	disableSweepLogKey,
 	disableTombstoneKey,
-	gcVersionUpgradeToV2Key,
+	GCNodeType,
 	gcTestModeKey,
+	IGarbageCollector,
+	IGarbageCollectorCreateParams,
+	IGarbageCollectionRuntime,
+	IGCStats,
 	oneDayMs,
 	runGCKey,
 	runSessionExpiryKey,
 	runSweepKey,
-	stableGCVersion,
 	trackGCStateKey,
 	gcTombstoneGenerationOptionName,
-} from "./garbageCollectionConstants";
-import { sendGCUnexpectedUsageEvent } from "./garbageCollectionHelpers";
-import { SweepReadyUsageDetectionHandler } from "./gcSweepReadyUsageDetection";
-import {
-	getGCVersion,
-	GCVersion,
-	IContainerRuntimeMetadata,
-	metadataBlobName,
-	ReadFluidDataStoreAttributes,
-	dataStoreAttributesBlobName,
-	IGCMetadata,
-	ICreateContainerMetadata,
+	UnreferencedState,
 	GCFeatureMatrix,
-} from "./summaryFormat";
-
-/** The statistics of the system state after a garbage collection run. */
-export interface IGCStats {
-	/** The number of nodes in the container. */
-	nodeCount: number;
-	/** The number of data stores in the container. */
-	dataStoreCount: number;
-	/** The number of attachment blobs in the container. */
-	attachmentBlobCount: number;
-	/** The number of unreferenced nodes in the container. */
-	unrefNodeCount: number;
-	/** The number of unreferenced data stores in the container. */
-	unrefDataStoreCount: number;
-	/** The number of unreferenced attachment blobs in the container. */
-	unrefAttachmentBlobCount: number;
-	/** The number of nodes whose reference state updated since last GC run. */
-	updatedNodeCount: number;
-	/** The number of data stores whose reference state updated since last GC run. */
-	updatedDataStoreCount: number;
-	/** The number of attachment blobs whose reference state updated since last GC run. */
-	updatedAttachmentBlobCount: number;
-}
-
-/** 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",
-};
-export type GCNodeType = typeof GCNodeType[keyof typeof GCNodeType];
-
-/** Defines the APIs for the runtime object to be passed to the garbage collector. */
-export interface IGarbageCollectionRuntime {
-	/** Before GC runs, called to notify the runtime to update any pending GC state. */
-	updateStateBeforeGC(): Promise<void>;
-	/** Returns the garbage collection data of the runtime. */
-	getGCData(fullGC?: boolean): Promise<IGarbageCollectionData>;
-	/** After GC has run, called to notify the runtime of routes that are used in it. */
-	updateUsedRoutes(usedRoutes: string[]): void;
-	/** After GC has run, called to notify the runtime of routes that are unused in it. */
-	updateUnusedRoutes(unusedRoutes: string[]): void;
-	/**
-	 * After GC has run, called to notify the runtime of deletable routes. The runtime is responsible
-	 * for telling the garbage collector the routes of the objects it has deleted
-	 */
-	deleteUnusedNodes(unusedNodes: string[]): string[];
-	/** Called to notify the runtime of routes that are tombstones. */
-	updateTombstonedRoutes(tombstoneRoutes: string[]): void;
-	/** Returns a referenced timestamp to be used to track unreferenced nodes. */
-	getCurrentReferenceTimestampMs(): number | undefined;
-	/** Returns the type of the GC node. */
-	getNodeType(nodePath: string): GCNodeType;
-	/** Called when the runtime should close because of an error. */
-	closeFn: (error?: ICriticalContainerError) => void;
-	/** If false, loading or using a Tombstoned object should merely log, not fail */
-	gcTombstoneEnforcementAllowed: boolean;
-}
-
-/** Defines the contract for the garbage collector. */
-export interface IGarbageCollector {
-	/** Tells whether GC should run or not. */
-	readonly shouldRunGC: boolean;
-	/** Tells whether the GC state in summary needs to be reset in the next summary. */
-	readonly summaryStateNeedsReset: boolean;
-	readonly trackGCState: boolean;
-	/** Initialize the state from the base snapshot after its creation. */
-	initializeBaseState(): Promise<void>;
-	/** Run garbage collection and update the reference / used state of the system. */
-	collectGarbage(options: {
-		logger?: ITelemetryLogger;
-		runSweep?: boolean;
-		fullGC?: boolean;
-	}): Promise<IGCStats | undefined>;
-	/** Summarizes the GC data and returns it as a summary tree. */
-	summarize(
-		fullTree: boolean,
-		trackState: boolean,
-		telemetryContext?: ITelemetryContext,
-	): ISummarizeResult | undefined;
-	/** Returns the garbage collector specific metadata to be written into the summary. */
-	getMetadata(): IGCMetadata;
-	/** Returns the GC details generated from the base snapshot. */
-	getBaseGCDetails(): Promise<IGarbageCollectionDetailsBase>;
-	/** Called when the latest summary of the system has been refreshed. */
-	refreshLatestSummary(
-		proposalHandle: string | undefined,
-		result: RefreshSummaryResult,
-		readAndParseBlob: ReadAndParseBlob,
-	): Promise<void>;
-	/** Called when a node is updated. Used to detect and log when an inactive node is changed or loaded. */
-	nodeUpdated(
-		nodePath: string,
-		reason: "Loaded" | "Changed",
-		timestampMs?: number,
-		packagePath?: readonly string[],
-		requestHeaders?: IRequestHeader,
-	): void;
-	/** Called when a reference is added to a node. Used to identify nodes that were referenced between summaries. */
-	addedOutboundReference(fromNodePath: string, toNodePath: string): void;
-	/** Returns true if this node has been deleted by GC during sweep phase. */
-	isNodeDeleted(nodePath: string): boolean;
-	setConnectionState(connected: boolean, clientId?: string): void;
-	dispose(): void;
-}
-
-/** Parameters necessary for creating a GarbageCollector. */
-export interface IGarbageCollectorCreateParams {
-	readonly runtime: IGarbageCollectionRuntime;
-	readonly gcOptions: IGCRuntimeOptions;
-	readonly baseLogger: ITelemetryLogger;
-	readonly existing: boolean;
-	readonly metadata: IContainerRuntimeMetadata | undefined;
-	readonly createContainerMetadata: ICreateContainerMetadata;
-	readonly baseSnapshot: ISnapshotTree | undefined;
-	readonly isSummarizerClient: boolean;
-	readonly getNodePackagePath: (nodePath: string) => Promise<readonly string[] | undefined>;
-	readonly getLastSummaryTimestampMs: () => number | undefined;
-	readonly readAndParseBlob: ReadAndParseBlob;
-	readonly activeConnection: () => boolean;
-	readonly getContainerDiagnosticId: () => string;
-}
-
-/** 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",
-} as const;
-export type UnreferencedState = typeof UnreferencedState[keyof typeof UnreferencedState];
+	IGCMetadata,
+} from "./gcDefinitions";
+import { getGCVersion, sendGCUnexpectedUsageEvent } from "./gcHelpers";
+import { GCSummaryStateTracker } from "./gcSummaryStateTracker";
+import { SweepReadyUsageDetectionHandler } from "./gcSweepReadyUsageDetection";
+import { UnreferencedStateTracker } from "./gcUnreferencedStateTracker";
 
 /** The event that is logged when unreferenced node is used after a certain time. */
 interface IUnreferencedEventProps {
@@ -233,108 +88,9 @@ interface IUnreferencedEventProps {
 	fromId?: string;
 	timeout?: number;
 	lastSummaryTime?: number;
-	externalRequest?: boolean;
 	viaHandle?: boolean;
 }
 
-/**
- * The GC data that is tracked for a summary that is submitted.
- */
-interface IGCSummaryTrackingData {
-	serializedGCState: string | undefined;
-	serializedTombstones: string | undefined;
-	serializedDeletedNodes: string | undefined;
-}
-
-/**
- * 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 {
-	private _state: UnreferencedState = UnreferencedState.Active;
-	public get state(): UnreferencedState {
-		return this._state;
-	}
-
-	/** Timer to indicate when an unreferenced object is considered Inactive */
-	private readonly inactiveTimer: TimerWithNoDefaultTimeout;
-	/** Timer to indicate when an unreferenced object is Sweep-Ready */
-	private readonly sweepTimer: TimerWithNoDefaultTimeout;
-
-	constructor(
-		public readonly unreferencedTimestampMs: number,
-		/** The time after which node transitions to Inactive state. */
-		private readonly inactiveTimeoutMs: number,
-		/** The current reference timestamp used to track how long this node has been unreferenced for. */
-		currentReferenceTimestampMs: number,
-		/** The time after which node transitions to SweepReady state; undefined if session expiry is disabled. */
-		private readonly sweepTimeoutMs: number | undefined,
-	) {
-		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);
-	}
-
-	/* Updates the unreferenced state based on the provided timestamp. */
-	public updateTracking(currentReferenceTimestampMs: number) {
-		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);
-	}
-
-	private clearTimers() {
-		this.inactiveTimer.clear();
-		this.sweepTimer.clear();
-	}
-
-	/** Stop tracking this node. Reset the unreferenced timers and state, if any. */
-	public stopTracking() {
-		this.clearTimers();
-		this._state = UnreferencedState.Active;
-	}
-}
-
 /**
  * The garbage collector for the container runtime. It consolidates the garbage collection functionality and maintains
  * its state across summaries.
@@ -362,28 +118,6 @@ export class GarbageCollector implements IGarbageCollector {
 		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.
-	 */
-	public get summaryStateNeedsReset(): boolean {
-		return (
-			this.gcStateNeedsReset ||
-			(this.shouldRunGC && this.latestSummaryGCVersion !== this.currentGCVersion)
-		);
-	}
-
 	/**
 	 * Tracks if GC is enabled for this document. This is specified during document creation and doesn't change
 	 * throughout its lifetime.
@@ -412,31 +146,6 @@ export class GarbageCollector implements IGarbageCollector {
 	private readonly tombstoneMode: boolean;
 	private readonly mc: MonitoringContext;
 
-	/**
-	 * 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.
-	 */
-	private get gcStateNeedsReset(): boolean {
-		return this.wasGCRunInLatestSummary !== this.shouldRunGC;
-	}
-	// Tracks whether there was GC was run in latest summary being tracked.
-	private wasGCRunInLatestSummary: boolean;
-
-	// The current GC version that this container is running.
-	private readonly currentGCVersion: GCVersion;
-	// This is the version of GC data in the latest summary being tracked.
-	private latestSummaryGCVersion: GCVersion;
-
 	// Feature Support info persisted to this container's summary
 	private readonly persistedGcFeatureMatrix: GCFeatureMatrix | undefined;
 
@@ -450,15 +159,6 @@ export class GarbageCollector implements IGarbageCollector {
 	// A list of nodes that have been deleted during sweep phase.
 	private deletedNodes: Set<string> = new Set();
 
-	/**
-	 * Keeps track of the GC data from the latest summary successfully submitted to and acked from the server.
-	 */
-	private latestSummaryData: IGCSummaryTrackingData | undefined;
-	/**
-	 * Keeps track of the GC data from the last summary submitted to the server but not yet acked.
-	 */
-	private pendingSummaryData: IGCSummaryTrackingData | undefined;
-
 	// Promise when resolved returns the GC data data in the base snapshot.
 	private readonly baseSnapshotDataP: Promise<IGarbageCollectionSnapshotData | undefined>;
 	// Promise when resolved initializes the GC state from the data in the base snapshot.
@@ -491,6 +191,8 @@ export class GarbageCollector implements IGarbageCollector {
 	/** The time after which an unreferenced node is ready to be swept. */
 	private readonly sweepTimeoutMs: number | undefined;
 
+	private readonly summaryStateTracker: GCSummaryStateTracker;
+
 	/** For a given node path, returns the node's package path. */
 	private readonly getNodePackagePath: (
 		nodePath: string,
@@ -517,6 +219,10 @@ export class GarbageCollector implements IGarbageCollector {
 		};
 	}
 
+	public get summaryStateNeedsReset(): boolean {
+		return this.summaryStateTracker.doesSummaryStateNeedReset();
+	}
+
 	/** Handler to respond to when a SweepReady object is used */
 	private readonly sweepReadyUsageHandler: SweepReadyUsageDetectionHandler;
 
@@ -539,19 +245,13 @@ export class GarbageCollector implements IGarbageCollector {
 			}),
 		);
 
-		// 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: number | undefined;
+		let gcVersionInBaseSnapshot: number | undefined;
 
 		/**
 		 * Sweep timeout is the time after which unreferenced content can be swept.
@@ -578,10 +278,10 @@ export class GarbageCollector implements IGarbageCollector {
 		 * 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 = metadata?.sweepEnabled ?? false;
 			this.sessionExpiryTimeoutMs = metadata?.sessionExpiryTimeoutMs;
 			this.sweepTimeoutMs =
@@ -637,10 +337,6 @@ export class GarbageCollector implements IGarbageCollector {
 			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 ?? this.currentGCVersion;
-
 		/**
 		 * Whether GC should run or not. The following conditions have to be met to run sweep:
 		 *
@@ -693,8 +389,14 @@ export class GarbageCollector implements IGarbageCollector {
 		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?.trees[gcTreeKey] !== undefined;
+		this.summaryStateTracker = new GCSummaryStateTracker(
+			this.shouldRunGC,
+			this.trackGCState,
+			this.tombstoneMode,
+			this.mc,
+			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.
@@ -936,10 +638,12 @@ export class GarbageCollector implements IGarbageCollector {
 			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;
 		}
 
@@ -961,15 +665,6 @@ export class GarbageCollector implements IGarbageCollector {
 			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),
-			};
-		}
 	}
 
 	/**
@@ -1001,16 +696,21 @@ export class GarbageCollector implements IGarbageCollector {
 	 * 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.
 	 */
-	public async collectGarbage(options: {
-		/** Logger to use for logging GC events */
-		logger?: ITelemetryLogger;
-		/** True to run GC sweep phase after the mark phase */
-		runSweep?: boolean;
-		/** True to generate full GC data */
-		fullGC?: boolean;
-	}): Promise<IGCStats | undefined> {
+	public async collectGarbage(
+		options: {
+			/** Logger to use for logging GC events */
+			logger?: ITelemetryLogger;
+			/** True to run GC sweep phase after the mark phase */
+			runSweep?: boolean;
+			/** True to generate full GC data */
+			fullGC?: boolean;
+		},
+		telemetryContext?: ITelemetryContext,
+	): Promise<IGCStats | undefined> {
 		const fullGC =
-			options.fullGC ?? (this.gcOptions.runFullGC === true || this.summaryStateNeedsReset);
+			options.fullGC ??
+			(this.gcOptions.runFullGC === true ||
+				this.summaryStateTracker.doesSummaryStateNeedReset());
 		const logger = options.logger
 			? ChildLogger.create(options.logger, undefined, {
 					all: { completedGCRuns: () => this.completedRuns },
@@ -1035,6 +735,12 @@ export class GarbageCollector implements IGarbageCollector {
 			return undefined;
 		}
 
+		// Add the options that are used to run GC to the telemetry context.
+		telemetryContext?.setMultiple("fluid_GC", "Options", {
+			fullGC,
+			runSweep: options.runSweep,
+		});
+
 		return PerformanceEvent.timedExecAsync(
 			logger,
 			{ eventName: "GarbageCollection" },
@@ -1138,139 +844,22 @@ export class GarbageCollector implements IGarbageCollector {
 			};
 		}
 
-		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 */,
+		return this.summaryStateTracker.summarize(
+			fullTree,
+			trackState,
+			gcState,
+			this.deletedNodes,
+			this.tombstones,
 		);
 	}
 
-	/**
-	 * 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.
-	 */
-	private buildGCSummaryTree(
-		serializedGCState: string,
-		serializedTombstones: string | undefined,
-		serializedDeletedNodes: string | undefined,
-		trackState: boolean,
-	): ISummaryTreeWithStats {
-		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 (this.latestSummaryData?.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 (
-				this.latestSummaryData?.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 (
-			this.latestSummaryData?.serializedDeletedNodes === serializedDeletedNodes &&
-			trackState
-		) {
-			builder.addHandle(
-				gcDeletedBlobKey,
-				SummaryType.Blob,
-				`/${gcTreeKey}/${gcDeletedBlobKey}`,
-			);
-		} else {
-			builder.addBlob(gcDeletedBlobKey, serializedDeletedNodes);
-		}
-		return builder.getSummaryTree();
-	}
-
 	public getMetadata(): IGCMetadata {
 		return {
 			/**
 			 * 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,
@@ -1295,61 +884,32 @@ export class GarbageCollector implements IGarbageCollector {
 		result: RefreshSummaryResult,
 		readAndParseBlob: ReadAndParseBlob,
 	): Promise<void> {
-		// 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;
-		}
+		const latestSnapshotData = await this.summaryStateTracker.refreshLatestSummary(
+			proposalHandle,
+			result,
+			readAndParseBlob,
+		);
 
-		// 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;
+		// 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<IContainerRuntimeMetadata>(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: IGarbageCollectionSnapshotData | undefined;
-		if (gcSnapshotTree !== undefined) {
-			latestGCData = await getGCDataFromSnapshot(gcSnapshotTree, readAndParseBlob);
+			this.updateStateFromSnapshotData(latestSnapshotData, currentReferenceTimestampMs);
 		}
-		this.updateStateFromSnapshotData(latestGCData, currentReferenceTimestampMs);
-		this.pendingSummaryData = undefined;
 	}
 
 	/**
@@ -1515,7 +1075,7 @@ export class GarbageCollector implements IGarbageCollector {
 	private runSweepPhase(sweepReadyNodes: string[], gcData: IGarbageCollectionData) {
 		// 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) {
@@ -1855,7 +1415,6 @@ export class GarbageCollector implements IGarbageCollector {
 			completedGCRuns: this.completedRuns,
 			lastSummaryTime: this.getLastSummaryTimestampMs(),
 			...this.createContainerMetadata,
-			externalRequest: requestHeaders?.[RuntimeHeaders.externalRequest],
 			viaHandle: requestHeaders?.[RuntimeHeaders.viaHandle],
 			fromId: fromNodeId,
 		};
@@ -1945,32 +1504,3 @@ export class GarbageCollector implements IGarbageCollector {
 		this.pendingEventsQueue = [];
 	}
 }
-
-function generateSortedGCState(gcState: IGarbageCollectionState): IGarbageCollectionState {
-	const sortableArray: [string, IGarbageCollectionNodeData][] = Object.entries(gcState.gcNodes);
-	sortableArray.sort(([a], [b]) => a.localeCompare(b));
-	const sortedGCState: IGarbageCollectionState = { 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(private readonly callback: () => void) {
-		// The default timeout/handlers will never be used since start/restart pass overrides below
-		super(0, () => {
-			throw new Error("DefaultHandler should not be used");
-		});
-	}
-
-	start(timeoutMs: number) {
-		super.start(timeoutMs, this.callback);
-	}
-
-	restart(timeoutMs: number): void {
-		super.restart(timeoutMs, this.callback);
-	}
-}