@fluidframework/container-runtime 2.0.0-internal.6.2.0 → 2.0.0-internal.6.3.0

package/src/summary/summarizerNode/summarizerNodeWithGc.ts

@@ -9,12 +9,9 @@ import {
 	TelemetryDataTag,
 	tagCodeArtifacts,
 } from "@fluidframework/telemetry-utils";
-import { assert } from "@fluidframework/common-utils";
-import { LazyPromise } from "@fluidframework/core-utils";
-import { ISnapshotTree } from "@fluidframework/protocol-definitions";
+import { assert, LazyPromise } from "@fluidframework/core-utils";
 import {
 	CreateChildSummarizerNodeParam,
-	gcTreeKey,
 	IGarbageCollectionData,
 	IGarbageCollectionDetailsBase,
 	ISummarizeInternalResult,
@@ -25,21 +22,15 @@ import {
 	ITelemetryContext,
 	IExperimentalIncrementalSummaryContext,
 } from "@fluidframework/runtime-definitions";
-import { ReadAndParseBlob, unpackChildNodesUsedRoutes } from "@fluidframework/runtime-utils";
+import { unpackChildNodesUsedRoutes } from "@fluidframework/runtime-utils";
 import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
-import {
-	cloneGCData,
-	getGCDataFromSnapshot,
-	runGarbageCollection,
-	unpackChildNodesGCDetails,
-} from "../../gc";
+import { cloneGCData, unpackChildNodesGCDetails } from "../../gc";
 import { SummarizerNode } from "./summarizerNode";
 import {
 	EscapedPath,
 	ICreateChildDetails,
 	IInitialSummary,
 	ISummarizerNodeRootContract,
-	parseSummaryForSubtrees,
 	SummaryNode,
 	ValidateSummaryResult,
 } from "./summarizerNodeUtils";
@@ -391,117 +382,6 @@ export class SummarizerNodeWithGC extends SummarizerNode implements IRootSummari
 		return super.refreshLatestSummaryFromPending(proposalHandle, referenceSequenceNumber);
 	}
 
-	/**
-	 * Called when we need to upload the reference state from the given summary.
-	 */
-	protected async refreshLatestSummaryFromSnapshot(
-		referenceSequenceNumber: number,
-		snapshotTree: ISnapshotTree,
-		basePath: EscapedPath | undefined,
-		localPath: EscapedPath,
-		correlatedSummaryLogger: ITelemetryLoggerExt,
-		readAndParseBlob: ReadAndParseBlob,
-	): Promise<void> {
-		await this.refreshGCStateFromSnapshot(
-			referenceSequenceNumber,
-			snapshotTree,
-			readAndParseBlob,
-		);
-		return super.refreshLatestSummaryFromSnapshot(
-			referenceSequenceNumber,
-			snapshotTree,
-			basePath,
-			localPath,
-			correlatedSummaryLogger,
-			readAndParseBlob,
-		);
-	}
-
-	/**
-	 * Updates GC state from the given snapshot if GC is enabled and the snapshot is newer than the one this node
-	 * is tracking.
-	 */
-	private async refreshGCStateFromSnapshot(
-		referenceSequenceNumber: number,
-		snapshotTree: ISnapshotTree,
-		readAndParseBlob: ReadAndParseBlob,
-	): Promise<void> {
-		// If GC is disabled or we have seen a newer summary, skip updating GC state.
-		if (this.gcDisabled || this.referenceSequenceNumber >= referenceSequenceNumber) {
-			return;
-		}
-
-		// Load the base GC details before proceeding because if that happens later it can overwrite the GC details
-		// written by the following code.
-		await this.loadBaseGCDetails();
-
-		// Possible re-entrancy. We may already have processed this while loading base GC details.
-		if (this.referenceSequenceNumber >= referenceSequenceNumber) {
-			return;
-		}
-
-		/**
-		 * GC data is written at root of the snapshot tree under "gc" sub-tree. This data needs to be propagated to
-		 * all the nodes in the container.
-		 * The root summarizer node reads the GC data from the "gc" sub-tree, runs GC on it to get used routes in
-		 * the container and updates its GC data and referenced used routes. It then gets the GC data and used
-		 * routes of all its children and adds it to their snapshot tree.
-		 * All the other nodes gets the GC data and used routes from their snapshot tree and updates their state.
-		 * They get the GC data and used routes of their children and add it to their snapshot tree and so on.
-		 *
-		 * Note that if the snapshot does not have GC tree, GC data will be set to undefined and used routes will be
-		 * set to self-route (meaning referenced) for all nodes. This is important because the GC data needs to be
-		 * regenerated in the next summary.
-		 */
-		let gcDetails: IGarbageCollectionDetailsBase | undefined;
-		const gcSnapshotTree = snapshotTree.trees[gcTreeKey];
-		if (gcSnapshotTree !== undefined) {
-			// If there is a GC tree in the snapshot, this is the root summarizer node. Read GC data from the tree
-			// process it as explained above.
-			const gcSnapshotData = await getGCDataFromSnapshot(gcSnapshotTree, readAndParseBlob);
-
-			if (gcSnapshotData.gcState !== undefined) {
-				const gcNodes: { [id: string]: string[] } = {};
-				for (const [nodeId, nodeData] of Object.entries(gcSnapshotData.gcState.gcNodes)) {
-					gcNodes[nodeId] = Array.from(nodeData.outboundRoutes);
-				}
-				// Run GC on the nodes in the snapshot to get the used routes for each node in the container.
-				const usedRoutes = runGarbageCollection(gcNodes, ["/"]).referencedNodeIds;
-				gcDetails = { gcData: { gcNodes }, usedRoutes };
-			}
-		} else {
-			// If there is a GC blob in the snapshot, it's a non-root summarizer nodes - The root summarizer node
-			// writes GC blob in the snapshot of child nodes. Get  GC data and used routes from the blob.
-			const gcDetailsBlob = snapshotTree.blobs[gcTreeKey];
-			if (gcDetailsBlob !== undefined) {
-				gcDetails = JSON.parse(gcDetailsBlob) as IGarbageCollectionDetailsBase;
-			}
-		}
-
-		// Update this node to the same GC state it was when the ack corresponding to this summary was processed.
-		this.gcData = gcDetails?.gcData !== undefined ? cloneGCData(gcDetails.gcData) : undefined;
-		this.referenceUsedRoutes =
-			gcDetails?.usedRoutes !== undefined ? Array.from(gcDetails.usedRoutes) : undefined;
-		// If there are no used routes in the GC details, set it to have self route which will make the node
-		// referenced. This scenario can only happen if the snapshot is from a client where GC was not run or
-		// disabled. In both the cases, the node should be referenced.
-		this.usedRoutes =
-			gcDetails?.usedRoutes !== undefined ? Array.from(gcDetails.usedRoutes) : [""];
-
-		if (gcDetails === undefined) {
-			return;
-		}
-
-		// Generate the GC data and used routes of children GC nodes and add it to their snapshot tree.
-		const gcDetailsMap = unpackChildNodesGCDetails(gcDetails);
-		const { childrenTree } = parseSummaryForSubtrees(snapshotTree);
-		gcDetailsMap.forEach((childGCDetails: IGarbageCollectionDetailsBase, childId: string) => {
-			if (childrenTree.trees[childId] !== undefined) {
-				childrenTree.trees[childId].blobs[gcTreeKey] = JSON.stringify(childGCDetails);
-			}
-		});
-	}
-
 	/**
 	 * Override the createChild method to return an instance of SummarizerNodeWithGC.
 	 */

package/src/summary/summaryCollection.ts

@@ -5,7 +5,8 @@
 
 import { IDisposable, IEvent } from "@fluidframework/core-interfaces";
 import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
-import { Deferred, assert, TypedEventEmitter } from "@fluidframework/common-utils";
+import { Deferred, assert } from "@fluidframework/core-utils";
+import { TypedEventEmitter } from "@fluid-internal/client-utils";
 import { IDeltaManager } from "@fluidframework/container-definitions";
 import {
 	IDocumentMessage,

package/src/summary/summaryFormat.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/common-utils";
+import { assert } from "@fluidframework/core-utils";
 import { IDocumentStorageService } from "@fluidframework/driver-definitions";
 import {
 	readAndParse,

package/src/summary/summaryGenerator.ts

@@ -16,10 +16,10 @@ import {
 	IPromiseTimer,
 	IPromiseTimerResult,
 	Timer,
-} from "@fluidframework/common-utils";
+} from "@fluidframework/core-utils";
 import { MessageType } from "@fluidframework/protocol-definitions";
 import { getRetryDelaySecondsFromError } from "@fluidframework/driver-utils";
-import { DriverErrorType } from "@fluidframework/driver-definitions";
+import { DriverErrorTypes } from "@fluidframework/driver-definitions";
 import {
 	IAckSummaryResult,
 	INackSummaryResult,
@@ -277,7 +277,7 @@ export class SummaryGenerator {
 			// If failure happened on upload, we may not yet realized that socket disconnected, so check
 			// offlineError too.
 			const category =
-				cancellationToken.cancelled || error?.errorType === DriverErrorType.offlineError
+				cancellationToken.cancelled || error?.errorType === DriverErrorTypes.offlineError
 					? "generic"
 					: "error";
 

package/src/summary/summaryManager.ts

@@ -9,13 +9,14 @@ import {
 	IEventProvider,
 	ITelemetryBaseLogger,
 } from "@fluidframework/core-interfaces";
-import { TypedEventEmitter, assert } from "@fluidframework/common-utils";
+import { assert } from "@fluidframework/core-utils";
+import { TypedEventEmitter } from "@fluid-internal/client-utils";
 import {
 	createChildLogger,
 	ITelemetryLoggerExt,
 	PerformanceEvent,
 } from "@fluidframework/telemetry-utils";
-import { DriverErrorType } from "@fluidframework/driver-definitions";
+import { DriverErrorTypes } from "@fluidframework/driver-definitions";
 import { IThrottler } from "../throttler";
 import { ISummarizerClientElection } from "./summarizerClientElection";
 import {
@@ -328,7 +329,7 @@ export class SummaryManager extends TypedEventEmitter<ISummarizerEvents> impleme
 					// If failure happened on container load, we may not yet realized that socket disconnected, so check
 					// offlineError.
 					const category =
-						error?.errorType === DriverErrorType.offlineError ? "generic" : "error";
+						error?.errorType === DriverErrorTypes.offlineError ? "generic" : "error";
 					this.logger.sendTelemetryEvent(
 						{
 							eventName: "SummarizerException",