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

package/dist/containerRuntime.js

@@ -14,20 +14,14 @@ const garbage_collector_1 = require("@fluidframework/garbage-collector");
 const uuid_1 = require("uuid");
 const containerHandleContext_1 = require("./containerHandleContext");
 const dataStoreRegistry_1 = require("./dataStoreRegistry");
-const summarizer_1 = require("./summarizer");
-const summaryManager_1 = require("./summaryManager");
 const connectionTelemetry_1 = require("./connectionTelemetry");
 const pendingStateManager_1 = require("./pendingStateManager");
 const packageVersion_1 = require("./packageVersion");
 const blobManager_1 = require("./blobManager");
 const dataStores_1 = require("./dataStores");
-const summaryFormat_1 = require("./summaryFormat");
-const summaryCollection_1 = require("./summaryCollection");
-const orderedClientElection_1 = require("./orderedClientElection");
-const summarizerClientElection_1 = require("./summarizerClientElection");
+const summary_1 = require("./summary");
 const throttler_1 = require("./throttler");
-const runWhileConnectedCoordinator_1 = require("./runWhileConnectedCoordinator");
-const garbageCollection_1 = require("./garbageCollection");
+const gc_1 = require("./gc");
 const dataStore_1 = require("./dataStore");
 const batchTracker_1 = require("./batchTracker");
 const serializedSnapshotStorage_1 = require("./serializedSnapshotStorage");
@@ -69,11 +63,6 @@ var RuntimeHeaders;
 (function (RuntimeHeaders) {
     /** True to wait for a data store to be created and loaded before returning it. */
     RuntimeHeaders["wait"] = "wait";
-    /**
-     * True if the request is from an external app. Used for GC to handle scenarios where a data store
-     * is deleted and requested via an external app.
-     */
-    RuntimeHeaders["externalRequest"] = "externalRequest";
     /** True if the request is coming from an IFluidHandle. */
     RuntimeHeaders["viaHandle"] = "viaHandle";
 })(RuntimeHeaders = exports.RuntimeHeaders || (exports.RuntimeHeaders = {}));
@@ -84,7 +73,6 @@ exports.TombstoneResponseHeaderKey = "isTombstoned";
 /** Default values for Runtime Headers */
 exports.defaultRuntimeHeaderData = {
     wait: true,
-    externalRequest: false,
     viaHandle: false,
     allowTombstone: false,
 };
@@ -138,8 +126,7 @@ function getDeviceSpec() {
             };
         }
     }
-    catch (_a) {
-    }
+    catch (_a) { }
     return {};
 }
 exports.getDeviceSpec = getDeviceSpec;
@@ -152,7 +139,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
      * @internal
      */
     constructor(context, registry, metadata, electedSummarizerData, chunks, dataStoreAliasMap, runtimeOptions, containerScope, logger, existing, blobManagerSnapshot, _storage, requestHandler, summaryConfiguration) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         if (summaryConfiguration === void 0) { summaryConfiguration = Object.assign(Object.assign({}, exports.DefaultSummaryConfiguration), (_a = runtimeOptions.summaryOptions) === null || _a === void 0 ? void 0 : _a.summaryConfigOverrides); }
         super();
         this.context = context;
@@ -165,7 +152,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         this.summaryConfiguration = summaryConfiguration;
         this.defaultMaxConsecutiveReconnects = 7;
         this._orderSequentiallyCalls = 0;
-        this.flushMicroTaskExists = false;
+        this.flushTaskExists = false;
         this.savedOps = [];
         this.consecutiveReconnects = 0;
         this.ensureNoDataModelChangesCalls = 0;
@@ -186,7 +173,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             trackingSignalSequenceNumber: undefined,
         };
         this.summarizeOnDemand = (...args) => {
-            if (this.clientDetails.type === summarizerClientElection_1.summarizerClientType) {
+            if (this.clientDetails.type === summary_1.summarizerClientType) {
                 return this.summarizer.summarizeOnDemand(...args);
             }
             else if (this.summaryManager !== undefined) {
@@ -200,7 +187,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             }
         };
         this.enqueueSummarize = (...args) => {
-            if (this.clientDetails.type === summarizerClientElection_1.summarizerClientType) {
+            if (this.clientDetails.type === summary_1.summarizerClientType) {
                 return this.summarizer.enqueueSummarize(...args);
             }
             else if (this.summaryManager !== undefined) {
@@ -235,34 +222,54 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         this.nextSummaryNumber = loadSummaryNumber + 1;
         this.messageAtLastSummary = metadata === null || metadata === void 0 ? void 0 : metadata.message;
         this._connected = this.context.connected;
+        this.gcTombstoneEnforcementAllowed = (0, gc_1.shouldAllowGcTombstoneEnforcement)((_c = metadata === null || metadata === void 0 ? void 0 : metadata.gcFeatureMatrix) === null || _c === void 0 ? void 0 : _c.tombstoneGeneration /* persisted */, this.runtimeOptions.gcOptions[gc_1.gcTombstoneGenerationOptionName] /* current */);
         this.mc = (0, telemetry_utils_1.loggerToMonitoringContext)(telemetry_utils_1.ChildLogger.create(this.logger, "ContainerRuntime"));
-        const opSplitter = new opLifecycle_1.OpSplitter(chunks, this.context.submitBatchFn, this.mc.config.getBoolean("Fluid.ContainerRuntime.DisableCompressionChunking") === true ?
-            Number.POSITIVE_INFINITY : runtimeOptions.chunkSizeInBytes, runtimeOptions.maxBatchSizeInBytes, this.mc.logger);
+        this.mc.logger.sendTelemetryEvent({
+            eventName: "GCFeatureMatrix",
+            metadataValue: JSON.stringify(metadata === null || metadata === void 0 ? void 0 : metadata.gcFeatureMatrix),
+            inputs: JSON.stringify({
+                gcOptions_gcTombstoneGeneration: this.runtimeOptions.gcOptions[gc_1.gcTombstoneGenerationOptionName],
+            }),
+        });
+        this.disableAttachReorder = this.mc.config.getBoolean("Fluid.ContainerRuntime.disableAttachOpReorder");
+        const disableChunking = this.mc.config.getBoolean("Fluid.ContainerRuntime.DisableCompressionChunking");
+        const opSplitter = new opLifecycle_1.OpSplitter(chunks, this.context.submitBatchFn, disableChunking === true ? Number.POSITIVE_INFINITY : runtimeOptions.chunkSizeInBytes, runtimeOptions.maxBatchSizeInBytes, this.mc.logger);
         this.remoteMessageProcessor = new opLifecycle_1.RemoteMessageProcessor(opSplitter, new opLifecycle_1.OpDecompressor());
         this.handleContext = new containerHandleContext_1.ContainerFluidHandleContext("", this);
         if (this.summaryConfiguration.state === "enabled") {
             this.validateSummaryHeuristicConfiguration(this.summaryConfiguration);
         }
-        this.enableOpReentryCheck = runtimeOptions.enableOpReentryCheck === true
-            // Allow for a break-glass config to override the options
-            && this.mc.config.getBoolean("Fluid.ContainerRuntime.DisableOpReentryCheck") !== true;
+        const disableOpReentryCheck = this.mc.config.getBoolean("Fluid.ContainerRuntime.DisableOpReentryCheck");
+        this.enableOpReentryCheck =
+            runtimeOptions.enableOpReentryCheck === true &&
+                // Allow for a break-glass config to override the options
+                disableOpReentryCheck !== true;
         this.summariesDisabled = this.isSummariesDisabled();
         this.heuristicsDisabled = this.isHeuristicsDisabled();
         this.maxOpsSinceLastSummary = this.getMaxOpsSinceLastSummary();
         this.initialSummarizerDelayMs = this.getInitialSummarizerDelayMs();
         this.maxConsecutiveReconnects =
-            (_c = this.mc.config.getNumber(maxConsecutiveReconnectsKey)) !== null && _c !== void 0 ? _c : this.defaultMaxConsecutiveReconnects;
-        this._flushMode = runtimeOptions.flushMode;
+            (_d = this.mc.config.getNumber(maxConsecutiveReconnectsKey)) !== null && _d !== void 0 ? _d : this.defaultMaxConsecutiveReconnects;
+        if (runtimeOptions.flushMode === runtime_definitions_1.FlushModeExperimental.Async &&
+            ((_e = context.supportedFeatures) === null || _e === void 0 ? void 0 : _e.get("referenceSequenceNumbers")) !== true) {
+            // The loader does not support reference sequence numbers, falling back on FlushMode.TurnBased
+            this.mc.logger.sendErrorEvent({ eventName: "FlushModeFallback" });
+            this._flushMode = runtime_definitions_1.FlushMode.TurnBased;
+        }
+        else {
+            this._flushMode = runtimeOptions.flushMode;
+        }
         const pendingRuntimeState = context.pendingLocalState;
-        const baseSnapshot = (_d = pendingRuntimeState === null || pendingRuntimeState === void 0 ? void 0 : pendingRuntimeState.baseSnapshot) !== null && _d !== void 0 ? _d : context.baseSnapshot;
-        const maxSnapshotCacheDurationMs = (_f = (_e = this._storage) === null || _e === void 0 ? void 0 : _e.policies) === null || _f === void 0 ? void 0 : _f.maximumCacheDurationMs;
-        if (maxSnapshotCacheDurationMs !== undefined && maxSnapshotCacheDurationMs > 5 * 24 * 60 * 60 * 1000) {
+        const baseSnapshot = (_f = pendingRuntimeState === null || pendingRuntimeState === void 0 ? void 0 : pendingRuntimeState.baseSnapshot) !== null && _f !== void 0 ? _f : context.baseSnapshot;
+        const maxSnapshotCacheDurationMs = (_h = (_g = this._storage) === null || _g === void 0 ? void 0 : _g.policies) === null || _h === void 0 ? void 0 : _h.maximumCacheDurationMs;
+        if (maxSnapshotCacheDurationMs !== undefined &&
+            maxSnapshotCacheDurationMs > 5 * 24 * 60 * 60 * 1000) {
             // This is a runtime enforcement of what's already explicit in the policy's type itself,
             // which dictates the value is either undefined or exactly 5 days in ms.
             // As long as the actual value is less than 5 days, the assumptions GC makes here are valid.
             throw new container_utils_1.UsageError("Driver's maximumCacheDurationMs policy cannot exceed 5 days");
         }
-        this.garbageCollector = garbageCollection_1.GarbageCollector.create({
+        this.garbageCollector = gc_1.GarbageCollector.create({
             runtime: this,
             gcOptions: this.runtimeOptions.gcOptions,
             baseSnapshot,
@@ -270,7 +277,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             existing,
             metadata,
             createContainerMetadata: this.createContainerMetadata,
-            isSummarizerClient: this.context.clientDetails.type === summarizerClientElection_1.summarizerClientType,
+            isSummarizerClient: this.context.clientDetails.type === summary_1.summarizerClientType,
             getNodePackagePath: async (nodePath) => this.getGCNodePackagePath(nodePath),
             getLastSummaryTimestampMs: () => { var _a; return (_a = this.messageAtLastSummary) === null || _a === void 0 ? void 0 : _a.timestamp; },
             readAndParseBlob: async (id) => (0, driver_utils_1.readAndParse)(this.storage, id),
@@ -301,12 +308,15 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         if (baseSnapshot) {
             this.summarizerNode.updateBaseSummaryState(baseSnapshot);
         }
-        this.dataStores = new dataStores_1.DataStores((0, dataStores_1.getSummaryForDatastores)(baseSnapshot, metadata), this, (attachMsg) => this.submit(ContainerMessageType.Attach, attachMsg), (id, createParam) => (summarizeInternal, getGCDataFn, getBaseGCDetailsFn) => this.summarizerNode.createChild(summarizeInternal, id, createParam, undefined, getGCDataFn, getBaseGCDetailsFn), (id) => this.summarizerNode.deleteChild(id), this.mc.logger, async () => this.garbageCollector.getBaseGCDetails(), (path, timestampMs, packagePath) => this.garbageCollector.nodeUpdated(path, "Changed", timestampMs, packagePath), new Map(dataStoreAliasMap));
+        this.dataStores = new dataStores_1.DataStores((0, dataStores_1.getSummaryForDatastores)(baseSnapshot, metadata), this, (attachMsg) => this.submit(ContainerMessageType.Attach, attachMsg), (id, createParam) => (summarizeInternal, getGCDataFn) => this.summarizerNode.createChild(summarizeInternal, id, createParam, undefined, getGCDataFn), (id) => this.summarizerNode.deleteChild(id), this.mc.logger, (path, timestampMs, packagePath) => this.garbageCollector.nodeUpdated(path, "Changed", timestampMs, packagePath), (path) => this.garbageCollector.isNodeDeleted(path), new Map(dataStoreAliasMap));
         this.blobManager = new blobManager_1.BlobManager(this.handleContext, blobManagerSnapshot, () => this.storage, (localId, blobId) => {
             if (!this.disposed) {
-                this.submit(ContainerMessageType.BlobAttach, undefined, undefined, { localId, blobId });
+                this.submit(ContainerMessageType.BlobAttach, undefined, undefined, {
+                    localId,
+                    blobId,
+                });
             }
-        }, (blobPath) => this.garbageCollector.nodeUpdated(blobPath, "Loaded"), (fromPath, toPath) => this.garbageCollector.addedOutboundReference(fromPath, toPath), this, pendingRuntimeState === null || pendingRuntimeState === void 0 ? void 0 : pendingRuntimeState.pendingAttachmentBlobs, () => this.getCurrentReferenceTimestampMs());
+        }, (blobPath) => this.garbageCollector.nodeUpdated(blobPath, "Loaded"), (fromPath, toPath) => this.garbageCollector.addedOutboundReference(fromPath, toPath), (blobPath) => this.garbageCollector.isNodeDeleted(blobPath), this, pendingRuntimeState === null || pendingRuntimeState === void 0 ? void 0 : pendingRuntimeState.pendingAttachmentBlobs, () => this.getCurrentReferenceTimestampMs());
         this.scheduleManager = new scheduleManager_1.ScheduleManager(context.deltaManager, this, () => this.clientId, telemetry_utils_1.ChildLogger.create(this.logger, "ScheduleManager"));
         this.pendingStateManager = new pendingStateManager_1.PendingStateManager({
             applyStashedOp: this.applyStashedOp.bind(this),
@@ -317,11 +327,14 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             rollback: this.rollback.bind(this),
             orderSequentially: this.orderSequentially.bind(this),
         }, pendingRuntimeState === null || pendingRuntimeState === void 0 ? void 0 : pendingRuntimeState.pending);
-        const compressionOptions = this.mc.config.getBoolean("Fluid.ContainerRuntime.DisableCompression") === true ?
-            {
+        const disableCompression = this.mc.config.getBoolean("Fluid.ContainerRuntime.DisableCompression");
+        const compressionOptions = disableCompression === true
+            ? {
                 minimumBatchSizeInBytes: Number.POSITIVE_INFINITY,
-                compressionAlgorithm: CompressionAlgorithms.lz4
-            } : runtimeOptions.compressionOptions;
+                compressionAlgorithm: CompressionAlgorithms.lz4,
+            }
+            : runtimeOptions.compressionOptions;
+        const disablePartialFlush = this.mc.config.getBoolean("Fluid.ContainerRuntime.DisablePartialFlush");
         this.outbox = new opLifecycle_1.Outbox({
             shouldSend: () => this.canSendOps(),
             pendingStateManager: this.pendingStateManager,
@@ -331,29 +344,30 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             config: {
                 compressionOptions,
                 maxBatchSizeInBytes: runtimeOptions.maxBatchSizeInBytes,
-                enableOpReentryCheck: this.enableOpReentryCheck,
+                disablePartialFlush: disablePartialFlush === true,
             },
             logger: this.mc.logger,
         });
         this.context.quorum.on("removeMember", (clientId) => {
             this.remoteMessageProcessor.clearPartialMessagesFor(clientId);
         });
-        this.summaryCollection = new summaryCollection_1.SummaryCollection(this.deltaManager, this.logger);
-        this.dirtyContainer = this.context.attachState !== container_definitions_1.AttachState.Attached
-            || this.pendingStateManager.hasPendingMessages();
+        this.summaryCollection = new summary_1.SummaryCollection(this.deltaManager, this.logger);
+        this.dirtyContainer =
+            this.context.attachState !== container_definitions_1.AttachState.Attached ||
+                this.pendingStateManager.hasPendingMessages();
         this.context.updateDirtyContainerState(this.dirtyContainer);
         if (this.summariesDisabled) {
             this.mc.logger.sendTelemetryEvent({ eventName: "SummariesDisabled" });
         }
         else {
             const orderedClientLogger = telemetry_utils_1.ChildLogger.create(this.logger, "OrderedClientElection");
-            const orderedClientCollection = new orderedClientElection_1.OrderedClientCollection(orderedClientLogger, this.context.deltaManager, this.context.quorum);
-            const orderedClientElectionForSummarizer = new orderedClientElection_1.OrderedClientElection(orderedClientLogger, orderedClientCollection, electedSummarizerData !== null && electedSummarizerData !== void 0 ? electedSummarizerData : this.context.deltaManager.lastSequenceNumber, summarizerClientElection_1.SummarizerClientElection.isClientEligible);
-            this.summarizerClientElection = new summarizerClientElection_1.SummarizerClientElection(orderedClientLogger, this.summaryCollection, orderedClientElectionForSummarizer, this.maxOpsSinceLastSummary);
-            if (this.context.clientDetails.type === summarizerClientElection_1.summarizerClientType) {
-                this._summarizer = new summarizer_1.Summarizer("/_summarizer", this /* ISummarizerRuntime */, () => this.summaryConfiguration, this /* ISummarizerInternalsProvider */, this.handleContext, this.summaryCollection, async (runtime) => runWhileConnectedCoordinator_1.RunWhileConnectedCoordinator.create(runtime));
+            const orderedClientCollection = new summary_1.OrderedClientCollection(orderedClientLogger, this.context.deltaManager, this.context.quorum);
+            const orderedClientElectionForSummarizer = new summary_1.OrderedClientElection(orderedClientLogger, orderedClientCollection, electedSummarizerData !== null && electedSummarizerData !== void 0 ? electedSummarizerData : this.context.deltaManager.lastSequenceNumber, summary_1.SummarizerClientElection.isClientEligible);
+            this.summarizerClientElection = new summary_1.SummarizerClientElection(orderedClientLogger, this.summaryCollection, orderedClientElectionForSummarizer, this.maxOpsSinceLastSummary);
+            if (this.context.clientDetails.type === summary_1.summarizerClientType) {
+                this._summarizer = new summary_1.Summarizer("/_summarizer", this /* ISummarizerRuntime */, () => this.summaryConfiguration, this /* ISummarizerInternalsProvider */, this.handleContext, this.summaryCollection, async (runtime) => summary_1.RunWhileConnectedCoordinator.create(runtime));
             }
-            else if (summarizerClientElection_1.SummarizerClientElection.clientDetailsPermitElection(this.context.clientDetails)) {
+            else if (summary_1.SummarizerClientElection.clientDetailsPermitElection(this.context.clientDetails)) {
                 // Only create a SummaryManager and SummarizerClientElection
                 // if summaries are enabled and we are not the summarizer client.
                 const defaultAction = () => {
@@ -373,7 +387,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 };
                 this.summaryCollection.on("default", defaultAction);
                 // Create the SummaryManager and mark the initial state
-                this.summaryManager = new summaryManager_1.SummaryManager(this.summarizerClientElection, this, // IConnectedState
+                this.summaryManager = new summary_1.SummaryManager(this.summarizerClientElection, this, // IConnectedState
                 this.summaryCollection, this.logger, this.formRequestSummarizerFn(this.context.loader), new throttler_1.Throttler(60 * 1000, // 60 sec delay window
                 30 * 1000, // 30 sec max delay
                 // throttling function increases exponentially (0ms, 40ms, 80ms, 160ms, etc)
@@ -404,12 +418,22 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         });
         // logging hardware telemetry
         logger.sendTelemetryEvent(Object.assign({ eventName: "DeviceSpec" }, getDeviceSpec()));
-        this.logger.sendTelemetryEvent(Object.assign(Object.assign(Object.assign({ eventName: "ContainerLoadStats" }, this.createContainerMetadata), this.dataStores.containerLoadStats), { summaryNumber: loadSummaryNumber, summaryFormatVersion: metadata === null || metadata === void 0 ? void 0 : metadata.summaryFormatVersion, disableIsolatedChannels: metadata === null || metadata === void 0 ? void 0 : metadata.disableIsolatedChannels, gcVersion: metadata === null || metadata === void 0 ? void 0 : metadata.gcFeature }));
+        this.logger.sendTelemetryEvent(Object.assign(Object.assign(Object.assign({ eventName: "ContainerLoadStats" }, this.createContainerMetadata), this.dataStores.containerLoadStats), { summaryNumber: loadSummaryNumber, summaryFormatVersion: metadata === null || metadata === void 0 ? void 0 : metadata.summaryFormatVersion, disableIsolatedChannels: metadata === null || metadata === void 0 ? void 0 : metadata.disableIsolatedChannels, gcVersion: metadata === null || metadata === void 0 ? void 0 : metadata.gcFeature, options: JSON.stringify(runtimeOptions), featureGates: JSON.stringify({
+                disableCompression,
+                disableOpReentryCheck,
+                disableChunking,
+                disableAttachReorder: this.disableAttachReorder,
+                disablePartialFlush,
+            }) }));
         (0, connectionTelemetry_1.ReportOpPerfTelemetry)(this.context.clientId, this.deltaManager, this.logger);
         (0, batchTracker_1.BindBatchTracker)(this, this.logger);
     }
-    get IContainerRuntime() { return this; }
-    get IFluidRouter() { return this; }
+    get IContainerRuntime() {
+        return this;
+    }
+    get IFluidRouter() {
+        return this;
+    }
     /**
      * @deprecated - use loadRuntime instead.
      * Load the stores from a snapshot and returns the runtime.
@@ -450,7 +474,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
      */
     static async loadRuntime(params) {
         var _a, _b, _c, _d;
-        const { context, registryEntries, existing, requestHandler, runtimeOptions = {}, containerScope = {}, containerRuntimeCtor = ContainerRuntime } = params;
+        const { context, registryEntries, existing, requestHandler, runtimeOptions = {}, containerScope = {}, containerRuntimeCtor = ContainerRuntime, } = params;
         // If taggedLogger exists, use it. Otherwise, wrap the vanilla logger:
         // back-compat: Remove the TaggedLoggerAdapter fallback once all the host are using loader > 0.45
         const backCompatContext = context;
@@ -462,13 +486,15 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         });
         const { summaryOptions = {}, gcOptions = {}, loadSequenceNumberVerification = "close", flushMode = defaultFlushMode, enableOfflineLoad = false, compressionOptions = {
             minimumBatchSizeInBytes: Number.POSITIVE_INFINITY,
-            compressionAlgorithm: CompressionAlgorithms.lz4
+            compressionAlgorithm: CompressionAlgorithms.lz4,
         }, maxBatchSizeInBytes = defaultMaxBatchSizeInBytes, chunkSizeInBytes = Number.POSITIVE_INFINITY, enableOpReentryCheck = false, } = runtimeOptions;
         const pendingRuntimeState = context.pendingLocalState;
         const baseSnapshot = (_b = pendingRuntimeState === null || pendingRuntimeState === void 0 ? void 0 : pendingRuntimeState.baseSnapshot) !== null && _b !== void 0 ? _b : context.baseSnapshot;
-        const storage = !pendingRuntimeState ?
-            context.storage :
-            new serializedSnapshotStorage_1.SerializedSnapshotStorage(() => { return context.storage; }, pendingRuntimeState.snapshotBlobs);
+        const storage = !pendingRuntimeState
+            ? context.storage
+            : new serializedSnapshotStorage_1.SerializedSnapshotStorage(() => {
+                return context.storage;
+            }, pendingRuntimeState.snapshotBlobs);
         const registry = new dataStoreRegistry_1.FluidDataStoreRegistry(registryEntries);
         const tryFetchBlob = async (blobName) => {
             const blobId = baseSnapshot === null || baseSnapshot === void 0 ? void 0 : baseSnapshot.blobs[blobName];
@@ -480,14 +506,14 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             }
         };
         const [chunks, metadata, electedSummarizerData, aliases] = await Promise.all([
-            tryFetchBlob(summaryFormat_1.chunksBlobName),
-            tryFetchBlob(summaryFormat_1.metadataBlobName),
-            tryFetchBlob(summaryFormat_1.electedSummarizerBlobName),
-            tryFetchBlob(summaryFormat_1.aliasBlobName),
+            tryFetchBlob(summary_1.chunksBlobName),
+            tryFetchBlob(summary_1.metadataBlobName),
+            tryFetchBlob(summary_1.electedSummarizerBlobName),
+            tryFetchBlob(summary_1.aliasBlobName),
         ]);
         const loadExisting = existing === true || context.existing === true;
         // read snapshot blobs needed for BlobManager to load
-        const blobManagerSnapshot = await blobManager_1.BlobManager.load(baseSnapshot === null || baseSnapshot === void 0 ? void 0 : baseSnapshot.trees[summaryFormat_1.blobsTreeName], async (id) => {
+        const blobManagerSnapshot = await blobManager_1.BlobManager.load(baseSnapshot === null || baseSnapshot === void 0 ? void 0 : baseSnapshot.trees[summary_1.blobsTreeName], async (id) => {
             // IContainerContext storage api return type still has undefined in 0.39 package version.
             // So once we release 0.40 container-defn package we can remove this check.
             (0, common_utils_1.assert)(storage !== undefined, 0x256 /* "storage undefined in attached container" */);
@@ -499,7 +525,8 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         if (!pendingRuntimeState && runtimeSequenceNumber !== undefined) {
             const protocolSequenceNumber = context.deltaManager.initialSequenceNumber;
             // Unless bypass is explicitly set, then take action when sequence numbers mismatch.
-            if (loadSequenceNumberVerification !== "bypass" && runtimeSequenceNumber !== protocolSequenceNumber) {
+            if (loadSequenceNumberVerification !== "bypass" &&
+                runtimeSequenceNumber !== protocolSequenceNumber) {
                 // "Load from summary, runtime metadata sequenceNumber !== initialSequenceNumber"
                 const error = new container_utils_1.DataCorruptionError(
                 // pre-0.58 error message: SummaryMetadataMismatch
@@ -606,7 +633,9 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         var _a;
         return (_a = this.summarizerClientElection) === null || _a === void 0 ? void 0 : _a.electedClientId;
     }
-    get disposed() { return this._disposed; }
+    get disposed() {
+        return this._disposed;
+    }
     get summarizer() {
         (0, common_utils_1.assert)(this._summarizer !== undefined, 0x257 /* "This is not summarizing container" */);
         return this._summarizer;
@@ -661,6 +690,9 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         this.emit("dispose");
         this.removeAllListeners();
     }
+    /**
+     * @deprecated 2.0.0-internal.3.2.0 ContainerRuntime is not an IFluidTokenProvider.  Token providers should be accessed using normal provider patterns.
+     */
     get IFluidTokenProvider() {
         var _a;
         if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.intelligence) {
@@ -716,7 +748,8 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                         status: 200,
                         mimeType: "fluid/object",
                         value: blob,
-                    } : (0, runtime_utils_1.create404Response)(request);
+                    }
+                    : (0, runtime_utils_1.create404Response)(request);
             }
             else if (requestParser.pathParts.length > 0) {
                 const dataStore = await this.getDataStoreFromRequest(id, request);
@@ -737,7 +770,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         return (_a = this.dataStores.aliases.get(maybeAlias)) !== null && _a !== void 0 ? _a : maybeAlias;
     }
     async getDataStoreFromRequest(id, request) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const headerData = {};
         if (typeof ((_a = request.headers) === null || _a === void 0 ? void 0 : _a[RuntimeHeaders.wait]) === "boolean") {
             headerData.wait = request.headers[RuntimeHeaders.wait];
@@ -751,22 +784,6 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         await this.dataStores.waitIfPendingAlias(id);
         const internalId = this.internalId(id);
         const dataStoreContext = await this.dataStores.getDataStore(internalId, headerData);
-        /**
-         * If GC should run and this an external app request with "externalRequest" header, we need to return
-         * an error if the data store being requested is marked as unreferenced as per the data store's base
-         * GC data.
-         *
-         * This is a workaround to handle scenarios where a data store shared with an external app is deleted
-         * and marked as unreferenced by GC. Returning an error will fail to load the data store for the app.
-         */
-        if (((_d = request.headers) === null || _d === void 0 ? void 0 : _d[RuntimeHeaders.externalRequest]) && this.garbageCollector.shouldRunGC) {
-            // The data store is referenced if used routes in the base summary has a route to self.
-            // Older documents may not have used routes in the summary. They are considered referenced.
-            const usedRoutes = (await dataStoreContext.getBaseGCDetails()).usedRoutes;
-            if (!(usedRoutes === undefined || usedRoutes.includes("") || usedRoutes.includes("/"))) {
-                throw (0, runtime_utils_1.responseToException)((0, runtime_utils_1.create404Response)(request), request);
-            }
-        }
         const dataStoreChannel = await dataStoreContext.realize();
         // Remove query params, leading and trailing slashes from the url. This is done to make sure the format is
         // the same as GC nodes id.
@@ -782,29 +799,29 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             summaryNumber: this.nextSummaryNumber++, summaryFormatVersion: 1 }), this.garbageCollector.getMetadata()), { 
             // The last message processed at the time of summary. If there are no new messages, use the message from the
             // last summary.
-            message: (_a = (0, summaryFormat_1.extractSummaryMetadataMessage)(this.deltaManager.lastMessage)) !== null && _a !== void 0 ? _a : this.messageAtLastSummary });
-        (0, runtime_utils_1.addBlobToSummary)(summaryTree, summaryFormat_1.metadataBlobName, JSON.stringify(metadata));
+            message: (_a = (0, summary_1.extractSummaryMetadataMessage)(this.deltaManager.lastMessage)) !== null && _a !== void 0 ? _a : this.messageAtLastSummary });
+        (0, runtime_utils_1.addBlobToSummary)(summaryTree, summary_1.metadataBlobName, JSON.stringify(metadata));
     }
     addContainerStateToSummary(summaryTree, fullTree, trackState, telemetryContext) {
         var _a;
         this.addMetadataToSummary(summaryTree);
         if (this.remoteMessageProcessor.partialMessages.size > 0) {
             const content = JSON.stringify([...this.remoteMessageProcessor.partialMessages]);
-            (0, runtime_utils_1.addBlobToSummary)(summaryTree, summaryFormat_1.chunksBlobName, content);
+            (0, runtime_utils_1.addBlobToSummary)(summaryTree, summary_1.chunksBlobName, content);
         }
         const dataStoreAliases = this.dataStores.aliases;
         if (dataStoreAliases.size > 0) {
-            (0, runtime_utils_1.addBlobToSummary)(summaryTree, summaryFormat_1.aliasBlobName, JSON.stringify([...dataStoreAliases]));
+            (0, runtime_utils_1.addBlobToSummary)(summaryTree, summary_1.aliasBlobName, JSON.stringify([...dataStoreAliases]));
         }
         if (this.summarizerClientElection) {
             const electedSummarizerContent = JSON.stringify((_a = this.summarizerClientElection) === null || _a === void 0 ? void 0 : _a.serialize());
-            (0, runtime_utils_1.addBlobToSummary)(summaryTree, summaryFormat_1.electedSummarizerBlobName, electedSummarizerContent);
+            (0, runtime_utils_1.addBlobToSummary)(summaryTree, summary_1.electedSummarizerBlobName, electedSummarizerContent);
         }
         const blobManagerSummary = this.blobManager.summarize();
         // Some storage (like git) doesn't allow empty tree, so we can omit it.
         // and the blob manager can handle the tree not existing when loading
         if (Object.keys(blobManagerSummary.summary.tree).length > 0) {
-            (0, runtime_utils_1.addTreeToSummary)(summaryTree, summaryFormat_1.blobsTreeName, blobManagerSummary);
+            (0, runtime_utils_1.addTreeToSummary)(summaryTree, summary_1.blobsTreeName, blobManagerSummary);
         }
         const gcSummary = this.garbageCollector.summarize(fullTree, trackState, telemetryContext);
         if (gcSummary !== undefined) {
@@ -933,7 +950,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         if (reconnection) {
             this.consecutiveReconnects++;
             if (!this.shouldContinueReconnecting()) {
-                this.closeFn(container_utils_1.DataProcessingError.create("Runtime detected too many reconnects with no progress syncing local ops. Batch of ops is likely too large (over 1Mb)", "setConnectionState", undefined, {
+                this.closeFn(container_utils_1.DataProcessingError.create("Runtime detected too many reconnects with no progress syncing local ops.", "setConnectionState", undefined, {
                     dataLoss: 1,
                     attempts: this.consecutiveReconnects,
                     pendingMessages: this.pendingStateManager.pendingMessagesCount,
@@ -1040,7 +1057,8 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         if (message.clientId === this.clientId && this.connected) {
             // Check to see if the signal was lost.
             if (this._perfSignalData.trackingSignalSequenceNumber !== undefined &&
-                envelope.clientSignalSequenceNumber > this._perfSignalData.trackingSignalSequenceNumber) {
+                envelope.clientSignalSequenceNumber >
+                    this._perfSignalData.trackingSignalSequenceNumber) {
                 this._perfSignalData.signalsLost++;
                 this._perfSignalData.trackingSignalSequenceNumber = undefined;
                 this.logger.sendErrorEvent({
@@ -1051,7 +1069,10 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                     clientSignalSequenceNumber: envelope.clientSignalSequenceNumber,
                 });
             }
-            else if (envelope.clientSignalSequenceNumber === this._perfSignalData.trackingSignalSequenceNumber) {
+            else if (this.consecutiveReconnects === 0 &&
+                envelope.clientSignalSequenceNumber ===
+                    this._perfSignalData.trackingSignalSequenceNumber) {
+                // only logging for the first connection and the trackingSignalSequenceNUmber.
                 this.sendSignalTelemetryEvent(envelope.clientSignalSequenceNumber);
                 this._perfSignalData.trackingSignalSequenceNumber = undefined;
             }
@@ -1138,7 +1159,9 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         return this.dataStores.createDetachedDataStoreCore(pkg, false);
     }
     async _createDataStoreWithProps(pkg, props, id = (0, uuid_1.v4)()) {
-        const fluidDataStore = await this.dataStores._createFluidDataStoreContext(Array.isArray(pkg) ? pkg : [pkg], id, props).realize();
+        const fluidDataStore = await this.dataStores
+            ._createFluidDataStoreContext(Array.isArray(pkg) ? pkg : [pkg], id, props)
+            .realize();
         return (0, dataStore_1.channelToDataStore)(fluidDataStore, id, this, this.dataStores, this.mc.logger);
     }
     async _createDataStore(pkg, id = (0, uuid_1.v4)(), props) {
@@ -1153,7 +1176,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
      * Are we in the middle of batching ops together?
      */
     currentlyBatching() {
-        return this.flushMode === runtime_definitions_1.FlushMode.TurnBased || this._orderSequentiallyCalls !== 0;
+        return this.flushMode !== runtime_definitions_1.FlushMode.Immediate || this._orderSequentiallyCalls !== 0;
     }
     getQuorum() {
         return this.context.quorum;
@@ -1242,7 +1265,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         }
         const summarizeResult = this.dataStores.createSummary(telemetryContext);
         // Wrap data store summaries in .channels subtree.
-        (0, summaryFormat_1.wrapSummaryInChannelsTree)(summarizeResult);
+        (0, summary_1.wrapSummaryInChannelsTree)(summarizeResult);
         this.addContainerStateToSummary(summarizeResult, true /* fullTree */, false /* trackState */, telemetryContext);
         return summarizeResult.summary;
     }
@@ -1258,7 +1281,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     async summarizeInternal(fullTree, trackState, telemetryContext) {
         const summarizeResult = await this.dataStores.summarize(fullTree, trackState, telemetryContext);
         // Wrap data store summaries in .channels subtree.
-        (0, summaryFormat_1.wrapSummaryInChannelsTree)(summarizeResult);
+        (0, summary_1.wrapSummaryInChannelsTree)(summarizeResult);
         const pathPartsForChildren = [runtime_definitions_1.channelsTreeName];
         this.addContainerStateToSummary(summarizeResult, fullTree, trackState, telemetryContext);
         return Object.assign(Object.assign({}, summarizeResult), { id: "", pathPartsForChildren });
@@ -1271,7 +1294,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         const { fullTree = false, trackState = true, summaryLogger = this.mc.logger, runGC = this.garbageCollector.shouldRunGC, runSweep, fullGC, } = options;
         const telemetryContext = new runtime_utils_1.TelemetryContext();
         // Add the options that are used to generate this summary to the telemetry context.
-        telemetryContext.setAll("fluid_Summarize", "Options", {
+        telemetryContext.setMultiple("fluid_Summarize", "Options", {
             fullTree,
             trackState,
             runGC,
@@ -1283,7 +1306,10 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             gcStats = await this.collectGarbage({ logger: summaryLogger, runSweep, fullGC }, telemetryContext);
         }
         const { stats, summary } = await this.summarizerNode.summarize(fullTree, trackState, telemetryContext);
-        this.logger.sendTelemetryEvent({ eventName: "SummarizeTelemetry", details: telemetryContext.serialize() });
+        this.logger.sendTelemetryEvent({
+            eventName: "SummarizeTelemetry",
+            details: telemetryContext.serialize(),
+        });
         (0, common_utils_1.assert)(summary.type === protocol_definitions_1.SummaryType.Tree, 0x12f /* "Container Runtime's summarize should always return a tree" */);
         return { stats, summary, gcStats };
     }
@@ -1334,6 +1360,22 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         this.blobManager.updateUnusedRoutes(blobManagerRoutes);
         this.dataStores.updateUnusedRoutes(dataStoreRoutes);
     }
+    /**
+     * @deprecated - Replaced by deleteSweepReadyNodes.
+     */
+    deleteUnusedNodes(unusedRoutes) {
+        throw new Error("deleteUnusedRoutes should not be called");
+    }
+    /**
+     * After GC has run and identified nodes that are sweep ready, this is called to delete the sweep ready nodes.
+     * @param sweepReadyRoutes - The routes of nodes that are sweep ready and should be deleted.
+     * @returns - The routes of nodes that were deleted.
+     */
+    deleteSweepReadyNodes(sweepReadyRoutes) {
+        const { dataStoreRoutes, blobManagerRoutes } = this.getDataStoreAndBlobManagerRoutes(sweepReadyRoutes);
+        const deletedRoutes = this.dataStores.deleteSweepReadyNodes(dataStoreRoutes);
+        return deletedRoutes.concat(this.blobManager.deleteSweepReadyNodes(blobManagerRoutes));
+    }
     /**
      * This is called to update objects that are tombstones.
      * @param tombstonedRoutes - Data store and attachment blob routes that are tombstones in this Container.
@@ -1359,9 +1401,9 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     getNodeType(nodePath) {
         var _a;
         if (this.isBlobPath(nodePath)) {
-            return garbageCollection_1.GCNodeType.Blob;
+            return gc_1.GCNodeType.Blob;
         }
-        return (_a = this.dataStores.getGCNodeType(nodePath)) !== null && _a !== void 0 ? _a : garbageCollection_1.GCNodeType.Other;
+        return (_a = this.dataStores.getGCNodeType(nodePath)) !== null && _a !== void 0 ? _a : gc_1.GCNodeType.Other;
     }
     /**
      * Called by GC to retrieve the package path of the node with the given path. The node should belong to a
@@ -1369,10 +1411,10 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
      */
     async getGCNodePackagePath(nodePath) {
         switch (this.getNodeType(nodePath)) {
-            case garbageCollection_1.GCNodeType.Blob:
+            case gc_1.GCNodeType.Blob:
                 return [blobManager_1.BlobManager.basePath];
-            case garbageCollection_1.GCNodeType.DataStore:
-            case garbageCollection_1.GCNodeType.SubDataStore:
+            case gc_1.GCNodeType.DataStore:
+            case gc_1.GCNodeType.SubDataStore:
                 return this.dataStores.getDataStorePackagePath(nodePath);
             default:
                 (0, common_utils_1.assert)(false, 0x2de /* "Package path requested for unsupported node type." */);
@@ -1449,8 +1491,12 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             // We might need to catch up to the latest summary's reference sequence number before pausing.
             await this.waitForDeltaManagerToCatchup(latestSnapshotRefSeq, summaryNumberLogger);
         }
+        const shouldPauseInboundSignal = this.mc.config.getBoolean("Fluid.ContainerRuntime.SubmitSummary.disableInboundSignalPause") !== true;
         try {
             await this.deltaManager.inbound.pause();
+            if (shouldPauseInboundSignal) {
+                await this.deltaManager.inboundSignal.pause();
+            }
             const summaryRefSeqNum = this.deltaManager.lastSequenceNumber;
             const minimumSequenceNumber = this.deltaManager.minimumSequenceNumber;
             const message = `Summary @${summaryRefSeqNum}:${this.deltaManager.minimumSequenceNumber}`;
@@ -1551,8 +1597,8 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             // latestSnapshotVersionId from storage and it does not match with the lastAck ackHandle, then use
             // the one fetched from storage as parent as that is the latest.
             let summaryContext;
-            if ((lastAck === null || lastAck === void 0 ? void 0 : lastAck.summaryAck.contents.handle) !== latestSnapshotVersionId
-                && latestSnapshotVersionId !== undefined) {
+            if ((lastAck === null || lastAck === void 0 ? void 0 : lastAck.summaryAck.contents.handle) !== latestSnapshotVersionId &&
+                latestSnapshotVersionId !== undefined) {
                 summaryContext = {
                     proposalHandle: undefined,
                     ackHandle: latestSnapshotVersionId,
@@ -1595,7 +1641,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             }
             let clientSequenceNumber;
             try {
-                clientSequenceNumber = this.submitSummaryMessage(summaryMessage);
+                clientSequenceNumber = this.submitSummaryMessage(summaryMessage, summaryRefSeqNum);
             }
             catch (error) {
                 return Object.assign(Object.assign({ stage: "upload" }, uploadData), { error });
@@ -1609,6 +1655,9 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             this.summarizerNode.clearSummary();
             // Restart the delta manager
             this.deltaManager.inbound.resume();
+            if (shouldPauseInboundSignal) {
+                this.deltaManager.inboundSignal.resume();
+            }
         }
     }
     hasPendingMessages() {
@@ -1654,14 +1703,16 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         this.verifyCanSubmitOps();
         // There should be no ops in detached container state!
         (0, common_utils_1.assert)(this.attachState !== container_definitions_1.AttachState.Detached, 0x132 /* "sending ops in detached container" */);
-        const deserializedContent = { type, contents };
-        const serializedContent = JSON.stringify(deserializedContent);
+        const serializedContent = JSON.stringify({ type, contents });
         if (this.deltaManager.readOnlyInfo.readonly) {
-            this.logger.sendTelemetryEvent({ eventName: "SubmitOpInReadonly", connected: this.connected });
+            this.logger.sendTelemetryEvent({
+                eventName: "SubmitOpInReadonly",
+                connected: this.connected,
+            });
         }
         const message = {
             contents: serializedContent,
-            deserializedContent,
+            deserializedContent: JSON.parse(serializedContent),
             metadata,
             localOpMetadata,
             referenceSequenceNumber: this.deltaManager.lastSequenceNumber,
@@ -1687,8 +1738,9 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             //    issue than sending.
             // Please note that this does not change file format, so it can be disabled in the future if this
             // optimization no longer makes sense (for example, batch compression may make it less appealing).
-            if (this.currentlyBatching() && type === ContainerMessageType.Attach &&
-                this.mc.config.getBoolean("Fluid.ContainerRuntime.disableAttachOpReorder") !== true) {
+            if (this.currentlyBatching() &&
+                type === ContainerMessageType.Attach &&
+                this.disableAttachReorder !== true) {
                 this.outbox.submitAttach(message);
             }
             else {
@@ -1697,13 +1749,8 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             if (!this.currentlyBatching()) {
                 this.flush();
             }
-            else if (!this.flushMicroTaskExists) {
-                this.flushMicroTaskExists = true;
-                // Queue a microtask to detect the end of the turn and force a flush.
-                Promise.resolve().then(() => {
-                    this.flushMicroTaskExists = false;
-                    this.flush();
-                }).catch((error) => { this.closeFn(error); });
+            else {
+                this.scheduleFlush();
             }
         }
         catch (error) {
@@ -1714,14 +1761,47 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             this.updateDocumentDirtyState(true);
         }
     }
-    submitSummaryMessage(contents) {
+    scheduleFlush() {
+        if (this.flushTaskExists) {
+            return;
+        }
+        this.flushTaskExists = true;
+        const flush = () => {
+            this.flushTaskExists = false;
+            try {
+                this.flush();
+            }
+            catch (error) {
+                this.closeFn(error);
+            }
+        };
+        switch (this.flushMode) {
+            case runtime_definitions_1.FlushMode.TurnBased:
+                // When in TurnBased flush mode the runtime will buffer operations in the current turn and send them as a single
+                // batch at the end of the turn
+                // eslint-disable-next-line @typescript-eslint/no-floating-promises
+                Promise.resolve().then(flush);
+                break;
+            // FlushModeExperimental is experimental and not exposed directly in the runtime APIs
+            case runtime_definitions_1.FlushModeExperimental.Async:
+                // When in Async flush mode, the runtime will accumulate all operations across JS turns and send them as a single
+                // batch when all micro-tasks are complete.
+                // Compared to TurnBased, this flush mode will capture more ops into the same batch.
+                setTimeout(flush, 0);
+                break;
+            default:
+                (0, common_utils_1.assert)(this._orderSequentiallyCalls > 0, 0x587 /* Unreachable unless running under orderSequentially */);
+                break;
+        }
+    }
+    submitSummaryMessage(contents, referenceSequenceNumber) {
         this.verifyNotClosed();
         (0, common_utils_1.assert)(this.connected, 0x133 /* "Container disconnected when trying to submit system message" */);
         // System message should not be sent in the middle of the batch.
         (0, common_utils_1.assert)(this.outbox.isEmpty, 0x3d4 /* System op in the middle of a batch */);
         // back-compat: ADO #1385: Make this call unconditional in the future
         return this.context.submitSummaryFn !== undefined
-            ? this.context.submitSummaryFn(contents)
+            ? this.context.submitSummaryFn(contents, referenceSequenceNumber)
             : this.context.submitFn(protocol_definitions_1.MessageType.Summarize, contents, false);
     }
     /**
@@ -1818,7 +1898,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         // It should only be done by the summarizerNode, if required.
         // When fetching from storage we will always get the latest version and do not use the ackHandle.
         const fetchLatestSnapshot = async () => {
-            const fetchResult = await this.fetchLatestSnapshotFromStorage(summaryLogger, {
+            let fetchResult = await this.fetchLatestSnapshotFromStorage(summaryLogger, {
                 eventName: "RefreshLatestSummaryAckFetch",
                 ackHandle,
                 targetSequenceNumber: summaryRefSeq,
@@ -1834,13 +1914,21 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
              * state.
              */
             if (fetchResult.latestSnapshotRefSeq < summaryRefSeq) {
-                const error = container_utils_1.DataProcessingError.create("Fetched snapshot is older than the received ack", "RefreshLatestSummaryAck", undefined /* sequencedMessage */, {
+                /* before failing, let's try to retrieve the latest snapshot for that specific ackHandle */
+                fetchResult = await this.fetchSnapshotFromStorage(summaryLogger, {
+                    eventName: "RefreshLatestSummaryAckFetch",
                     ackHandle,
-                    summaryRefSeq,
-                    latestSnapshotRefSeq: fetchResult.latestSnapshotRefSeq,
-                });
-                this.closeFn(error);
-                throw error;
+                    targetSequenceNumber: summaryRefSeq,
+                }, readAndParseBlob, ackHandle);
+                if (fetchResult.latestSnapshotRefSeq < summaryRefSeq) {
+                    const error = container_utils_1.DataProcessingError.create("Fetched snapshot is older than the received ack", "RefreshLatestSummaryAck", undefined /* sequencedMessage */, {
+                        ackHandle,
+                        summaryRefSeq,
+                        fetchedSnapshotRefSeq: fetchResult.latestSnapshotRefSeq,
+                    });
+                    this.closeFn(error);
+                    throw error;
+                }
             }
             // In case we had to retrieve the latest snapshot and it is different than summaryRefSeq,
             // wait for the delta manager to catch up before refreshing the latest Summary.
@@ -1875,10 +1963,13 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         return { latestSnapshotRefSeq, latestSnapshotVersionId: versionId };
     }
     async fetchLatestSnapshotFromStorage(logger, event, readAndParseBlob) {
+        return this.fetchSnapshotFromStorage(logger, event, readAndParseBlob, null /* latest */);
+    }
+    async fetchSnapshotFromStorage(logger, event, readAndParseBlob, versionId) {
         return telemetry_utils_1.PerformanceEvent.timedExecAsync(logger, event, async (perfEvent) => {
             const stats = {};
             const trace = common_utils_1.Trace.start();
-            const versions = await this.storage.getVersions(null, 1, "refreshLatestSummaryAckFromServer", driver_definitions_1.FetchSource.noCache);
+            const versions = await this.storage.getVersions(versionId, 1, "refreshLatestSummaryAckFromServer", versionId === null ? driver_definitions_1.FetchSource.noCache : undefined);
             (0, common_utils_1.assert)(!!versions && !!versions[0], 0x137 /* "Failed to get version from storage" */);
             stats.getVersionDuration = trace.trace().duration;
             const maybeSnapshot = await this.storage.getSnapshotTree(versions[0]);
@@ -1898,13 +1989,15 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     notifyAttaching(snapshot) {
         var _a;
         if ((_a = this.mc.config.getBoolean("enableOfflineLoad")) !== null && _a !== void 0 ? _a : this.runtimeOptions.enableOfflineLoad) {
-            this.baseSnapshotBlobs = serializedSnapshotStorage_1.SerializedSnapshotStorage.serializeTreeWithBlobContents(snapshot);
+            this.baseSnapshotBlobs =
+                serializedSnapshotStorage_1.SerializedSnapshotStorage.serializeTreeWithBlobContents(snapshot);
         }
     }
     async initializeBaseSnapshotBlobs() {
         var _a;
         if (!((_a = this.mc.config.getBoolean("enableOfflineLoad")) !== null && _a !== void 0 ? _a : this.runtimeOptions.enableOfflineLoad) ||
-            this.attachState !== container_definitions_1.AttachState.Attached || this.context.pendingLocalState) {
+            this.attachState !== container_definitions_1.AttachState.Attached ||
+            this.context.pendingLocalState) {
             return;
         }
         (0, common_utils_1.assert)(!!this.context.baseSnapshot, 0x2e5 /* "Must have a base snapshot" */);
@@ -1953,7 +2046,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                     [container_definitions_1.LoaderHeader.cache]: false,
                     [container_definitions_1.LoaderHeader.clientDetails]: {
                         capabilities: { interactive: false },
-                        type: summarizerClientElection_1.summarizerClientType,
+                        type: summary_1.summarizerClientType,
                     },
                     [driver_definitions_1.DriverHeader.summarizingClient]: true,
                     [container_definitions_1.LoaderHeader.reconnect]: false,