Remove refresh from server path and refresh from network call

packages/runtime/container-runtime/src/containerRuntime.ts

@@ -3739,7 +3739,7 @@ export class ContainerRuntime
 		);
 
 		// Notify the garbage collector so it can update its latest summary state.
-		await this.garbageCollector.refreshLatestSummary(proposalHandle, result, readAndParseBlob);
+		await this.garbageCollector.refreshLatestSummary(result);
 	}
 
 	/**
@@ -3774,11 +3774,7 @@ export class ContainerRuntime
 		);
 
 		// Notify the garbage collector so it can update its latest summary state.
-		await this.garbageCollector.refreshLatestSummary(
-			undefined /* proposalHandle */,
-			result,
-			readAndParseBlob,
-		);
+		await this.garbageCollector.refreshLatestSummary(result);
 
 		return { latestSnapshotRefSeq, latestSnapshotVersionId: versionId };
 	}
@@ -3844,24 +3840,22 @@ export class ContainerRuntime
 		// We choose to close the summarizer after the snapshot cache is updated to avoid
 		// situations which the main client (which is likely to be re-elected as the leader again)
 		// loads the summarizer from cache.
-		if (this.summaryStateUpdateMethod !== "refreshFromSnapshot") {
-			this.mc.logger.sendTelemetryEvent(
-				{
-					...event,
-					eventName: "ClosingSummarizerOnSummaryStale",
-					codePath: event.eventName,
-					message: "Stopping fetch from storage",
-					versionId: versionId != null ? versionId : undefined,
-					closeSummarizerDelayMs: this.closeSummarizerDelayMs,
-				},
-				new GenericError("Restarting summarizer instead of refreshing"),
-			);
+		this.mc.logger.sendTelemetryEvent(
+			{
+				...event,
+				eventName: "ClosingSummarizerOnSummaryStale",
+				codePath: event.eventName,
+				message: "Stopping fetch from storage",
+				versionId: versionId != null ? versionId : undefined,
+				closeSummarizerDelayMs: this.closeSummarizerDelayMs,
+			},
+			new GenericError("Restarting summarizer instead of refreshing"),
+		);
 
-			// Delay before restarting summarizer to prevent the summarizer from restarting too frequently.
-			await delay(this.closeSummarizerDelayMs);
-			this._summarizer?.stop("latestSummaryStateStale");
-			this.disposeFn();
-		}
+		// Delay before restarting summarizer to prevent the summarizer from restarting too frequently.
+		await delay(this.closeSummarizerDelayMs);
+		this._summarizer?.stop("latestSummaryStateStale");
+		this.disposeFn();
 
 		return snapshotResults;
 	}

packages/runtime/container-runtime/src/gc/garbageCollection.ts

@@ -13,11 +13,7 @@ import {
 	ISummarizeResult,
 	ITelemetryContext,
 } from "@fluidframework/runtime-definitions";
-import {
-	ReadAndParseBlob,
-	createResponseError,
-	responseToException,
-} from "@fluidframework/runtime-utils";
+import { createResponseError, responseToException } from "@fluidframework/runtime-utils";
 import {
 	createChildLogger,
 	createChildMonitoringContext,
@@ -850,37 +846,8 @@ export class GarbageCollector implements IGarbageCollector {
 	 * Called to refresh the latest summary state. This happens when either a pending summary is acked or a snapshot
 	 * is downloaded and should be used to update the state.
 	 */
-	public async refreshLatestSummary(
-		proposalHandle: string | undefined,
-		result: RefreshSummaryResult,
-		readAndParseBlob: ReadAndParseBlob,
-	): Promise<void> {
-		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,
-						gcConfigs: JSON.stringify(this.configs),
-					},
-				);
-			}
-			this.updateStateFromSnapshotData(latestSnapshotData, currentReferenceTimestampMs);
-		}
+	public async refreshLatestSummary(result: RefreshSummaryResult): Promise<void> {
+		await this.summaryStateTracker.refreshLatestSummary(result);
 	}
 
 	/**

packages/runtime/container-runtime/src/gc/gcDefinitions.ts

@@ -228,11 +228,7 @@ export interface IGarbageCollector {
 	/** 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>;
+	refreshLatestSummary(result: RefreshSummaryResult): Promise<void>;
 	/** Called when a node is updated. Used to detect and log when an inactive node is changed or loaded. */
 	nodeUpdated(
 		nodePath: string,

packages/runtime/container-runtime/src/gc/gcSummaryStateTracker.ts

@@ -12,10 +12,10 @@ import {
 	ISummarizeResult,
 	ISummaryTreeWithStats,
 } from "@fluidframework/runtime-definitions";
-import { mergeStats, ReadAndParseBlob, SummaryTreeBuilder } from "@fluidframework/runtime-utils";
-import { IContainerRuntimeMetadata, metadataBlobName, RefreshSummaryResult } from "../summary";
+import { mergeStats, SummaryTreeBuilder } from "@fluidframework/runtime-utils";
+import { RefreshSummaryResult } from "../summary";
 import { GCVersion, IGCStats } from "./gcDefinitions";
-import { getGCDataFromSnapshot, generateSortedGCState, getGCVersion } from "./gcHelpers";
+import { generateSortedGCState } from "./gcHelpers";
 import { IGarbageCollectionSnapshotData, IGarbageCollectionState } from "./gcSummaryDefinitions";
 import { IGarbageCollectorConfigs } from ".";
 
@@ -267,11 +267,7 @@ export class GCSummaryStateTracker {
 	 * Called to refresh the latest summary state. This happens when either a pending summary is acked or a snapshot
 	 * is downloaded and should be used to update the state.
 	 */
-	public async refreshLatestSummary(
-		proposalHandle: string | undefined,
-		result: RefreshSummaryResult,
-		readAndParseBlob: ReadAndParseBlob,
-	): Promise<IGarbageCollectionSnapshotData | undefined> {
+	public async refreshLatestSummary(result: RefreshSummaryResult): 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
@@ -281,7 +277,7 @@ export class GCSummaryStateTracker {
 		}
 
 		if (!result.latestSummaryUpdated || !this.configs.shouldRunGC) {
-			return undefined;
+			return;
 		}
 
 		// If the summary was tracked by this client, it was the one that generated the summary in the first place.
@@ -291,45 +287,8 @@ export class GCSummaryStateTracker {
 			this.latestSummaryData = this.pendingSummaryData;
 			this.pendingSummaryData = undefined;
 			this.updatedDSCountSinceLastSummary = 0;
-			return undefined;
-		}
-
-		// 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];
-		const metadata = metadataBlobId
-			? await readAndParseBlob<IContainerRuntimeMetadata>(metadataBlobId)
-			: undefined;
-		this.latestSummaryGCVersion = getGCVersion(metadata);
-
-		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;
-
-		if (gcSnapshotTree === undefined) {
-			return undefined;
-		}
-
-		let snapshotData = await getGCDataFromSnapshot(gcSnapshotTree, readAndParseBlob);
-
-		// If the GC version in the snapshot does not match the GC version currently in effect, the GC data
-		// in the snapshot cannot be interpreted correctly. Set everything to undefined except for deletedNodes
-		// because irrespective of GC versions, these nodes have been deleted and cannot be brought back. The
-		// deletedNodes info is needed to identify when these nodes are used.
-		if (getGCVersion(metadata) !== this.configs.gcVersionInEffect) {
-			snapshotData = {
-				gcState: undefined,
-				tombstones: undefined,
-				deletedNodes: snapshotData.deletedNodes,
-			};
+			return;
 		}
-
-		this.latestSummaryData = {
-			serializedGCState: JSON.stringify(snapshotData.gcState),
-			serializedTombstones: JSON.stringify(snapshotData.tombstones),
-			serializedDeletedNodes: JSON.stringify(snapshotData.deletedNodes),
-		};
-		return snapshotData;
 	}
 
 	/**

packages/runtime/container-runtime/src/summary/summarizerNode/summarizerNode.ts

@@ -387,8 +387,6 @@ export class SummarizerNode implements IRootSummarizerNode {
 		proposalHandle: string | undefined,
 		summaryRefSeq: number,
 		fetchLatestSnapshot: () => Promise<IFetchSnapshotResult>,
-		readAndParseBlob: ReadAndParseBlob,
-		correlatedSummaryLogger: ITelemetryLoggerExt,
 	): Promise<RefreshSummaryResult> {
 		const eventProps: {
 			proposalHandle: string | undefined;
@@ -450,41 +448,18 @@ export class SummarizerNode implements IRootSummarizerNode {
 				if (this.referenceSequenceNumber >= summaryRefSeq) {
 					eventProps.latestSummaryUpdated = false;
 					event.end(eventProps);
-					return { latestSummaryUpdated: false };
+					return { latestSummaryUpdated: false, networkFetchMade: false };
 				}
 
 				// Fetch the latest snapshot and refresh state from it. Note that we need to use the reference sequence number
 				// of the fetched snapshot and not the "summaryRefSeq" that was passed in.
-				const { snapshotTree, snapshotRefSeq: fetchedSnapshotRefSeq } =
-					await fetchLatestSnapshot();
+				await fetchLatestSnapshot();
 
 				// Possible re-entrancy. We may have updated latest summary state while fetching the snapshot. If the fetched
 				// snapshot is older than the latest tracked summary, ignore it.
-				if (this.referenceSequenceNumber >= fetchedSnapshotRefSeq) {
-					eventProps.latestSummaryUpdated = false;
-					event.end(eventProps);
-					return { latestSummaryUpdated: false };
-				}
-
-				await this.refreshLatestSummaryFromSnapshot(
-					fetchedSnapshotRefSeq,
-					snapshotTree,
-					undefined,
-					EscapedPath.create(""),
-					correlatedSummaryLogger,
-					readAndParseBlob,
-				);
-
-				eventProps.latestSummaryUpdated = true;
-				eventProps.wasSummaryTracked = false;
-				eventProps.summaryRefSeq = fetchedSnapshotRefSeq;
+				eventProps.latestSummaryUpdated = false;
 				event.end(eventProps);
-				return {
-					latestSummaryUpdated: true,
-					wasSummaryTracked: false,
-					snapshotTree,
-					summaryRefSeq: fetchedSnapshotRefSeq,
-				};
+				return { latestSummaryUpdated: false, networkFetchMade: false };
 			},
 			{ start: true, end: true, cancel: "error" },
 		);

packages/runtime/container-runtime/src/summary/summarizerNode/summarizerNodeUtils.ts

@@ -21,17 +21,16 @@ import { ReadAndParseBlob } from "@fluidframework/runtime-utils";
 export type RefreshSummaryResult =
 	| {
 			latestSummaryUpdated: false;
+			networkFetchMade: false;
 	  }
 	| {
 			latestSummaryUpdated: true;
 			wasSummaryTracked: true;
 			summaryRefSeq: number;
 	  }
 	| {
-			latestSummaryUpdated: true;
-			wasSummaryTracked: false;
-			snapshotTree: ISnapshotTree;
-			summaryRefSeq: number;
+			latestSummaryUpdated: false;
+			networkFetchMade: true;
 	  };
 
 /**