@fluidframework/container-runtime 2.0.0-internal.3.4.2 → 2.0.0-internal.3.4.4

package/lib/packageVersion.d.ts

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export declare const pkgName = "@fluidframework/container-runtime";
-export declare const pkgVersion = "2.0.0-internal.3.4.2";
+export declare const pkgVersion = "2.0.0-internal.3.4.4";
 //# sourceMappingURL=packageVersion.d.ts.map

package/lib/packageVersion.js

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export const pkgName = "@fluidframework/container-runtime";
-export const pkgVersion = "2.0.0-internal.3.4.2";
+export const pkgVersion = "2.0.0-internal.3.4.4";
 //# sourceMappingURL=packageVersion.js.map

package/lib/packageVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,mCAAmC,CAAC;AAC3D,MAAM,CAAC,MAAM,UAAU,GAAG,sBAAsB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/container-runtime\";\nexport const pkgVersion = \"2.0.0-internal.3.4.2\";\n"]}
+{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,mCAAmC,CAAC;AAC3D,MAAM,CAAC,MAAM,UAAU,GAAG,sBAAsB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/container-runtime\";\nexport const pkgVersion = \"2.0.0-internal.3.4.4\";\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/container-runtime",
-  "version": "2.0.0-internal.3.4.2",
+  "version": "2.0.0-internal.3.4.4",
   "description": "Fluid container runtime",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -37,19 +37,19 @@
   "dependencies": {
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^1.1.1",
-    "@fluidframework/container-definitions": ">=2.0.0-internal.3.4.2 <2.0.0-internal.4.0.0",
-    "@fluidframework/container-runtime-definitions": ">=2.0.0-internal.3.4.2 <2.0.0-internal.4.0.0",
-    "@fluidframework/container-utils": ">=2.0.0-internal.3.4.2 <2.0.0-internal.4.0.0",
-    "@fluidframework/core-interfaces": ">=2.0.0-internal.3.4.2 <2.0.0-internal.4.0.0",
-    "@fluidframework/datastore": ">=2.0.0-internal.3.4.2 <2.0.0-internal.4.0.0",
-    "@fluidframework/driver-definitions": ">=2.0.0-internal.3.4.2 <2.0.0-internal.4.0.0",
-    "@fluidframework/driver-utils": ">=2.0.0-internal.3.4.2 <2.0.0-internal.4.0.0",
-    "@fluidframework/garbage-collector": ">=2.0.0-internal.3.4.2 <2.0.0-internal.4.0.0",
+    "@fluidframework/container-definitions": ">=2.0.0-internal.3.4.4 <2.0.0-internal.4.0.0",
+    "@fluidframework/container-runtime-definitions": ">=2.0.0-internal.3.4.4 <2.0.0-internal.4.0.0",
+    "@fluidframework/container-utils": ">=2.0.0-internal.3.4.4 <2.0.0-internal.4.0.0",
+    "@fluidframework/core-interfaces": ">=2.0.0-internal.3.4.4 <2.0.0-internal.4.0.0",
+    "@fluidframework/datastore": ">=2.0.0-internal.3.4.4 <2.0.0-internal.4.0.0",
+    "@fluidframework/driver-definitions": ">=2.0.0-internal.3.4.4 <2.0.0-internal.4.0.0",
+    "@fluidframework/driver-utils": ">=2.0.0-internal.3.4.4 <2.0.0-internal.4.0.0",
+    "@fluidframework/garbage-collector": ">=2.0.0-internal.3.4.4 <2.0.0-internal.4.0.0",
     "@fluidframework/protocol-base": "^0.1038.4000",
     "@fluidframework/protocol-definitions": "^1.1.0",
-    "@fluidframework/runtime-definitions": ">=2.0.0-internal.3.4.2 <2.0.0-internal.4.0.0",
-    "@fluidframework/runtime-utils": ">=2.0.0-internal.3.4.2 <2.0.0-internal.4.0.0",
-    "@fluidframework/telemetry-utils": ">=2.0.0-internal.3.4.2 <2.0.0-internal.4.0.0",
+    "@fluidframework/runtime-definitions": ">=2.0.0-internal.3.4.4 <2.0.0-internal.4.0.0",
+    "@fluidframework/runtime-utils": ">=2.0.0-internal.3.4.4 <2.0.0-internal.4.0.0",
+    "@fluidframework/telemetry-utils": ">=2.0.0-internal.3.4.4 <2.0.0-internal.4.0.0",
     "double-ended-queue": "^2.1.0-0",
     "events": "^3.1.0",
     "lz4js": "^0.2.0",
@@ -61,8 +61,8 @@
     "@fluidframework/build-tools": "^0.13.0",
     "@fluidframework/container-runtime-previous": "npm:@fluidframework/container-runtime@2.0.0-internal.3.2.0",
     "@fluidframework/eslint-config-fluid": "^2.0.0",
-    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.3.4.2 <2.0.0-internal.4.0.0",
-    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.3.4.2 <2.0.0-internal.4.0.0",
+    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.3.4.4 <2.0.0-internal.4.0.0",
+    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.3.4.4 <2.0.0-internal.4.0.0",
     "@microsoft/api-extractor": "^7.34.4",
     "@types/double-ended-queue": "^2.1.0",
     "@types/events": "^3.0.0",

package/src/containerRuntime.ts

@@ -1982,12 +1982,13 @@ export class ContainerRuntime
 					clientSignalSequenceNumber: envelope.clientSignalSequenceNumber,
 				});
 			} else if (
-				this.consecutiveReconnects === 0 &&
 				envelope.clientSignalSequenceNumber ===
-					this._perfSignalData.trackingSignalSequenceNumber
+				this._perfSignalData.trackingSignalSequenceNumber
 			) {
 				// only logging for the first connection and the trackingSignalSequenceNUmber.
-				this.sendSignalTelemetryEvent(envelope.clientSignalSequenceNumber);
+				if (this.consecutiveReconnects === 0) {
+					this.sendSignalTelemetryEvent(envelope.clientSignalSequenceNumber);
+				}
 				this._perfSignalData.trackingSignalSequenceNumber = undefined;
 			}
 		}

package/src/gc/garbageCollection.ts

@@ -52,7 +52,7 @@ import {
 	IGCMetadata,
 	IGarbageCollectorConfigs,
 } from "./gcDefinitions";
-import { getSnapshotDataFromOldSnapshotFormat, sendGCUnexpectedUsageEvent } from "./gcHelpers";
+import { sendGCUnexpectedUsageEvent } from "./gcHelpers";
 import { GCSummaryStateTracker } from "./gcSummaryStateTracker";
 import { UnreferencedStateTracker } from "./gcUnreferencedStateTracker";
 
@@ -210,12 +210,9 @@ export class GarbageCollector implements IGarbageCollector {
 						return getGCDataFromSnapshot(gcSnapshotTree, readAndParseBlob);
 					}
 
-					// back-compat - Older documents will have the GC blobs in each data store's snapshot tree.
-					return getSnapshotDataFromOldSnapshotFormat(
-						baseSnapshot,
-						createParams.metadata,
-						readAndParseBlob,
-					);
+					// back-compat - Older documents get their gc data reset for simplicity as there are few of them
+					// incremental gc summary will not work with older gc data as well
+					return undefined;
 				} catch (error) {
 					const dpe = DataProcessingError.wrapIfUnrecognized(
 						error,

package/src/gc/gcHelpers.ts

@@ -4,23 +4,12 @@
  */
 
 import { ITelemetryGenericEvent } from "@fluidframework/common-definitions";
-import { assert } from "@fluidframework/common-utils";
-import { ISnapshotTree } from "@fluidframework/protocol-definitions";
 import {
-	gcTreeKey,
 	IGarbageCollectionNodeData,
-	IGarbageCollectionSnapshotData,
 	IGarbageCollectionState,
-	IGarbageCollectionSummaryDetailsLegacy,
 } from "@fluidframework/runtime-definitions";
-import { packagePathToTelemetryProperty, ReadAndParseBlob } from "@fluidframework/runtime-utils";
+import { packagePathToTelemetryProperty } from "@fluidframework/runtime-utils";
 import { MonitoringContext } from "@fluidframework/telemetry-utils";
-import { getSummaryForDatastores } from "../dataStores";
-import {
-	dataStoreAttributesBlobName,
-	IContainerRuntimeMetadata,
-	ReadFluidDataStoreAttributes,
-} from "../summary";
 import {
 	disableTombstoneKey,
 	GCFeatureMatrix,
@@ -139,66 +128,3 @@ export function generateSortedGCState(gcState: IGarbageCollectionState): IGarbag
 	}
 	return sortedGCState;
 }
-
-/**
- * This is for back-compat only - Before GC data was written at the root of the summary tree, individual GC blobs were
- * written at data store's snapshot tree. This function consolidates them into the new IGarbageCollectionState format.
- */
-export async function getSnapshotDataFromOldSnapshotFormat(
-	oldSnapshot: ISnapshotTree,
-	metadata: IContainerRuntimeMetadata | undefined,
-	readAndParseBlob: ReadAndParseBlob,
-): Promise<IGarbageCollectionSnapshotData | undefined> {
-	// Add a node for the root node that is not present in older snapshot format.
-	const gcState: IGarbageCollectionState = {
-		gcNodes: { "/": { outboundRoutes: [] } },
-	};
-	const dataStoreSnapshotTree = getSummaryForDatastores(oldSnapshot, metadata);
-	assert(
-		dataStoreSnapshotTree !== undefined,
-		0x2a8 /* "Expected data store snapshot tree in base snapshot" */,
-	);
-	for (const [dsId, dsSnapshotTree] of Object.entries(dataStoreSnapshotTree.trees)) {
-		const blobId = dsSnapshotTree.blobs[gcTreeKey];
-		if (blobId === undefined) {
-			continue;
-		}
-
-		const gcSummaryDetails = await readAndParseBlob<IGarbageCollectionSummaryDetailsLegacy>(
-			blobId,
-		);
-		// If there are no nodes for this data store, skip it.
-		if (gcSummaryDetails.gcData?.gcNodes === undefined) {
-			continue;
-		}
-
-		const dsRootId = `/${dsId}`;
-		// Since we used to write GC data at data store level, we won't have an entry for the root ("/").
-		// Construct that entry by adding root data store ids to its outbound routes.
-		const initialSnapshotDetails = await readAndParseBlob<ReadFluidDataStoreAttributes>(
-			dsSnapshotTree.blobs[dataStoreAttributesBlobName],
-		);
-		if (initialSnapshotDetails.isRootDataStore) {
-			gcState.gcNodes["/"].outboundRoutes.push(dsRootId);
-		}
-
-		for (const [id, outboundRoutes] of Object.entries(gcSummaryDetails.gcData.gcNodes)) {
-			// Prefix the data store id to the GC node ids to make them relative to the root from being
-			// relative to the data store. Similar to how its done in DataStore::getGCData.
-			const rootId = id === "/" ? dsRootId : `${dsRootId}${id}`;
-			gcState.gcNodes[rootId] = {
-				outboundRoutes: Array.from(outboundRoutes),
-			};
-		}
-		assert(
-			gcState.gcNodes[dsRootId] !== undefined,
-			0x2a9 /* GC nodes for data store not in GC blob */,
-		);
-		gcState.gcNodes[dsRootId].unreferencedTimestampMs = gcSummaryDetails.unrefTimestamp;
-	}
-	// If there is only one node (root node just added above), either GC is disabled or we are loading from
-	// the first summary generated by detached container. In both cases, GC was not run - return undefined.
-	return Object.keys(gcState.gcNodes).length === 1
-		? undefined
-		: { gcState, tombstones: undefined, deletedNodes: undefined };
-}

package/src/gc/index.ts

@@ -35,7 +35,6 @@ export {
 	UnreferencedState,
 } from "./gcDefinitions";
 export {
-	getSnapshotDataFromOldSnapshotFormat,
 	sendGCUnexpectedUsageEvent,
 	shouldAllowGcTombstoneEnforcement,
 	shouldAllowGcSweep,

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-runtime";
-export const pkgVersion = "2.0.0-internal.3.4.2";
+export const pkgVersion = "2.0.0-internal.3.4.4";