@fluidframework/container-runtime 0.51.3 → 0.53.0-46105

package/dist/containerRuntime.js

@@ -4,13 +4,12 @@
  * Licensed under the MIT License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ContainerRuntime = exports.agentSchedulerId = exports.ScheduleManager = exports.unpackRuntimeMessage = exports.isRuntimeMessage = exports.ContainerMessageType = void 0;
+exports.ContainerRuntime = exports.getDeviceSpec = exports.agentSchedulerId = exports.ScheduleManager = exports.unpackRuntimeMessage = exports.isRuntimeMessage = exports.ContainerMessageType = void 0;
 const container_definitions_1 = require("@fluidframework/container-definitions");
 const common_utils_1 = require("@fluidframework/common-utils");
 const telemetry_utils_1 = require("@fluidframework/telemetry-utils");
 const driver_utils_1 = require("@fluidframework/driver-utils");
 const container_utils_1 = require("@fluidframework/container-utils");
-const protocol_base_1 = require("@fluidframework/protocol-base");
 const protocol_definitions_1 = require("@fluidframework/protocol-definitions");
 const runtime_definitions_1 = require("@fluidframework/runtime-definitions");
 const runtime_utils_1 = require("@fluidframework/runtime-utils");
@@ -97,13 +96,16 @@ function unpackRuntimeMessage(message) {
     return message;
 }
 exports.unpackRuntimeMessage = unpackRuntimeMessage;
-class ScheduleManager {
-    constructor(deltaManager, emitter, logger) {
+/**
+ * This class controls pausing and resuming of inbound queue to ensure that we never
+ * start processing ops in a batch IF we do not have all ops in the batch.
+ */
+class ScheduleManagerCore {
+    constructor(deltaManager, logger) {
         this.deltaManager = deltaManager;
-        this.emitter = emitter;
         this.logger = logger;
         this.localPaused = false;
-        this.deltaScheduler = new deltaScheduler_1.DeltaScheduler(this.deltaManager, telemetry_utils_1.ChildLogger.create(this.logger, "DeltaScheduler"));
+        this.timePaused = 0;
         // Listen for delta manager sends and add batch metadata to messages
         this.deltaManager.on("prepareSend", (messages) => {
             if (messages.length === 0) {
@@ -111,7 +113,7 @@ class ScheduleManager {
             }
             // First message will have the batch flag set to true if doing a batched send
             const firstMessageMetadata = messages[0].metadata;
-            if (!firstMessageMetadata || !firstMessageMetadata.batch) {
+            if (!(firstMessageMetadata === null || firstMessageMetadata === void 0 ? void 0 : firstMessageMetadata.batch)) {
                 return;
             }
             // If the batch contains only a single op, clear the batch flag.
@@ -126,29 +128,143 @@ class ScheduleManager {
         // Listen for updates and peek at the inbound
         this.deltaManager.inbound.on("push", (message) => {
             this.trackPending(message);
-            this.updatePauseState(message.sequenceNumber);
         });
+        // Start with baseline - empty inbound queue.
+        common_utils_1.assert(!this.localPaused, 0x293 /* "initial state" */);
         const allPending = this.deltaManager.inbound.toArray();
         for (const pending of allPending) {
             this.trackPending(pending);
         }
-        // Based on track pending update the pause state
-        this.updatePauseState(this.deltaManager.lastSequenceNumber);
     }
-    beginOperation(message) {
+    /**
+     * The only public function in this class - called when we processed an op,
+     * to make decision if op processing should be paused or not afer that.
+     */
+    afterOpProcessing(sequenceNumber) {
+        common_utils_1.assert(!this.localPaused, 0x294 /* "can't have op processing paused if we are processing an op" */);
+        // If the inbound queue is ever empty, nothing to do!
+        if (this.deltaManager.inbound.length === 0) {
+            common_utils_1.assert(this.pauseSequenceNumber === undefined, 0x295 /* "there should be no pending batch if we have no ops" */);
+            return;
+        }
+        // The queue is
+        // 1. paused only when the next message to be processed is the beginning of a batch. Done in two places:
+        //    - here (processing ops until reaching start of incomplete batch)
+        //    - in trackPending(), when queue was empty and start of batch showed up.
+        // 2. resumed when batch end comes in (in trackPending())
+        // do we have incomplete batch to worry about?
+        if (this.pauseSequenceNumber !== undefined) {
+            common_utils_1.assert(sequenceNumber < this.pauseSequenceNumber, 0x296 /* "we should never start processing incomplete batch!" */);
+            // If the next op is the start of incomplete batch, then we can't process it until it's fully in - pause!
+            if (sequenceNumber + 1 === this.pauseSequenceNumber) {
+                this.pauseQueue();
+            }
+        }
+    }
+    pauseQueue() {
+        common_utils_1.assert(!this.localPaused, 0x297 /* "always called from resumed state" */);
+        this.localPaused = true;
+        this.timePaused = common_utils_1.performance.now();
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        this.deltaManager.inbound.pause();
+    }
+    resumeQueue(startBatch, endBatch) {
+        // Return early if no change in value
+        if (!this.localPaused) {
+            return;
+        }
+        this.localPaused = false;
+        const duration = common_utils_1.performance.now() - this.timePaused;
+        // Random round number - we want to know when batch waiting paused op processing.
+        if (duration > connectionTelemetry_1.latencyThreshold) {
+            this.logger.sendErrorEvent({
+                eventName: "MaxBatchWaitTimeExceeded",
+                duration,
+                sequenceNumber: endBatch,
+                length: endBatch - startBatch,
+            });
+        }
+        this.deltaManager.inbound.resume();
+    }
+    /**
+     * Called for each incoming op (i.e. inbound "push" notification)
+     */
+    trackPending(message) {
+        common_utils_1.assert(this.deltaManager.inbound.length !== 0, 0x298 /* "we have something in the queue that generates this event" */);
+        common_utils_1.assert((this.currentBatchClientId === undefined) === (this.pauseSequenceNumber === undefined), 0x299 /* "non-synchronized state" */);
+        const metadata = message.metadata;
+        const batchMetadata = metadata === null || metadata === void 0 ? void 0 : metadata.batch;
+        // Protocol messages are never part of a runtime batch of messages
+        if (!isRuntimeMessage(message)) {
+            // Protocol messages should never show up in the middle of the batch!
+            common_utils_1.assert(this.currentBatchClientId === undefined, 0x29a /* "System message in the middle of batch!" */);
+            common_utils_1.assert(batchMetadata === undefined, 0x29b /* "system op in a batch?" */);
+            common_utils_1.assert(!this.localPaused, 0x29c /* "we should be processing ops when there is no active batch" */);
+            return;
+        }
+        if (this.currentBatchClientId === undefined && batchMetadata === undefined) {
+            common_utils_1.assert(!this.localPaused, 0x29d /* "we should be processing ops when there is no active batch" */);
+            return;
+        }
+        // If the client ID changes then we can move the pause point. If it stayed the same then we need to check.
+        // If batchMetadata is not undefined then if it's true we've begun a new batch - if false we've ended
+        // the previous one
+        if (this.currentBatchClientId !== undefined || batchMetadata === false) {
+            if (this.currentBatchClientId !== message.clientId) {
+                // "Batch not closed, yet message from another client!"
+                throw new container_utils_1.DataCorruptionError("OpBatchIncomplete", Object.assign({ batchClientId: this.currentBatchClientId }, container_utils_1.extractSafePropertiesFromMessage(message)));
+            }
+        }
+        // The queue is
+        // 1. paused only when the next message to be processed is the beginning of a batch. Done in two places:
+        //    - in afterOpProcessing() - processing ops until reaching start of incomplete batch
+        //    - here (batchMetadata == false below), when queue was empty and start of batch showed up.
+        // 2. resumed when batch end comes in (batchMetadata === true case below)
+        if (batchMetadata) {
+            common_utils_1.assert(this.currentBatchClientId === undefined, 0x29e /* "there can't be active batch" */);
+            common_utils_1.assert(!this.localPaused, 0x29f /* "we should be processing ops when there is no active batch" */);
+            this.pauseSequenceNumber = message.sequenceNumber;
+            this.currentBatchClientId = message.clientId;
+            // Start of the batch
+            // Only pause processing if queue has no other ops!
+            // If there are any other ops in the queue, processing will be stopped when they are processed!
+            if (this.deltaManager.inbound.length === 1) {
+                this.pauseQueue();
+            }
+        }
+        else if (batchMetadata === false) {
+            common_utils_1.assert(this.pauseSequenceNumber !== undefined, 0x2a0 /* "batch presence was validated above" */);
+            // Batch is complete, we can process it!
+            this.resumeQueue(this.pauseSequenceNumber, message.sequenceNumber);
+            this.pauseSequenceNumber = undefined;
+            this.currentBatchClientId = undefined;
+        }
+        else {
+            // Continuation of current batch. Do nothing
+            common_utils_1.assert(this.currentBatchClientId !== undefined, 0x2a1 /* "logic error" */);
+        }
+    }
+}
+/**
+ * This class has the following responsibilities:
+ * 1. It tracks batches as we process ops and raises "batchBegin" and "batchEnd" events.
+ *    As part of it, it validates batch correctness (i.e. no system ops in the middle of batch)
+ * 2. It creates instance of ScheduleManagerCore that ensures we never start processing ops from batch
+ *    unless all ops of the batch are in.
+ */
+class ScheduleManager {
+    constructor(deltaManager, emitter, logger) {
+        this.deltaManager = deltaManager;
+        this.emitter = emitter;
+        this.logger = logger;
+        this.hitError = false;
+        this.deltaScheduler = new deltaScheduler_1.DeltaScheduler(this.deltaManager, telemetry_utils_1.ChildLogger.create(this.logger, "DeltaScheduler"));
+        this.scheduler = new ScheduleManagerCore(deltaManager, logger);
+    }
+    beforeOpProcessing(message) {
         var _a;
         if (this.batchClientId !== message.clientId) {
-            // As a back stop for any bugs marking the end of a batch - if the client ID flipped, we
-            // consider the previous batch over.
-            if (this.batchClientId) {
-                this.emitter.emit("batchEnd", "Did not receive real batchEnd message", undefined);
-                this.deltaScheduler.batchEnd();
-                this.logger.sendTelemetryEvent({
-                    eventName: "BatchEndNotReceived",
-                    clientId: this.batchClientId,
-                    sequenceNumber: message.sequenceNumber,
-                });
-            }
+            common_utils_1.assert(this.batchClientId === undefined, 0x2a2 /* "Batch is interrupted by other client op. Should be caught by trackPending()" */);
             // This could be the beginning of a new batch or an individual message.
             this.emitter.emit("batchBegin", message);
             this.deltaScheduler.batchBegin();
@@ -161,79 +277,32 @@ class ScheduleManager {
             }
         }
     }
-    endOperation(error, message) {
+    afterOpProcessing(error, message) {
         var _a;
+        // If this is no longer true, we need to revisit what we do where we set this.hitError.
+        common_utils_1.assert(!this.hitError, 0x2a3 /* "container should be closed on any error" */);
+        // Let the scheduler know how far we progressed, to decide if op processing
+        // should be paused or not.
+        this.scheduler.afterOpProcessing(message.sequenceNumber);
         if (error) {
+            // We assume here that loader will close container and stop processing all future ops.
+            // This is implicit dependency. If this flow changes, this code might no longer be correct.
+            this.hitError = true;
             this.batchClientId = undefined;
             this.emitter.emit("batchEnd", error, message);
             this.deltaScheduler.batchEnd();
             return;
         }
-        this.updatePauseState(message.sequenceNumber);
         const batch = (_a = message === null || message === void 0 ? void 0 : message.metadata) === null || _a === void 0 ? void 0 : _a.batch;
         // If no batchClientId has been set then we're in an individual batch. Else, if we get
         // batch end metadata, this is end of the current batch.
-        if (!this.batchClientId || batch === false) {
+        if (this.batchClientId === undefined || batch === false) {
             this.batchClientId = undefined;
             this.emitter.emit("batchEnd", undefined, message);
             this.deltaScheduler.batchEnd();
             return;
         }
     }
-    setPaused(localPaused) {
-        // Return early if no change in value
-        if (this.localPaused === localPaused) {
-            return;
-        }
-        this.localPaused = localPaused;
-        if (localPaused) {
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
-            this.deltaManager.inbound.pause();
-        }
-        else {
-            this.deltaManager.inbound.resume();
-        }
-    }
-    updatePauseState(sequenceNumber) {
-        // If the inbound queue is ever empty we pause it and wait for new events
-        if (this.deltaManager.inbound.length === 0) {
-            this.setPaused(true);
-            return;
-        }
-        // If no message has caused the pause flag to be set, or the next message up is not the one we need to pause at
-        // then we simply continue processing
-        if (!this.pauseSequenceNumber || sequenceNumber + 1 < this.pauseSequenceNumber) {
-            this.setPaused(false);
-        }
-        else {
-            // Otherwise the next message requires us to pause
-            this.setPaused(true);
-        }
-    }
-    trackPending(message) {
-        const metadata = message.metadata;
-        // Protocol messages are never part of a runtime batch of messages
-        if (!isRuntimeMessage(message)) {
-            this.pauseSequenceNumber = undefined;
-            this.pauseClientId = undefined;
-            return;
-        }
-        const batchMetadata = metadata ? metadata.batch : undefined;
-        // If the client ID changes then we can move the pause point. If it stayed the same then we need to check.
-        if (this.pauseClientId === message.clientId) {
-            if (batchMetadata !== undefined) {
-                // If batchMetadata is not undefined then if it's true we've begun a new batch - if false we've ended
-                // the previous one
-                this.pauseSequenceNumber = batchMetadata ? message.sequenceNumber : undefined;
-                this.pauseClientId = batchMetadata ? this.pauseClientId : undefined;
-            }
-        }
-        else {
-            // We check the batch flag for the new clientID - if true we pause otherwise we reset the tracking data
-            this.pauseSequenceNumber = batchMetadata ? message.sequenceNumber : undefined;
-            this.pauseClientId = batchMetadata ? message.clientId : undefined;
-        }
-    }
 }
 exports.ScheduleManager = ScheduleManager;
 /**
@@ -242,6 +311,21 @@ exports.ScheduleManager = ScheduleManager;
  * ContainerRuntime's perspective.
  */
 exports.agentSchedulerId = "_scheduler";
+// safely check navigator and get the hardware spec value
+function getDeviceSpec() {
+    try {
+        if (typeof navigator === "object" && navigator !== null) {
+            return {
+                deviceMemory: navigator.deviceMemory,
+                hardwareConcurrency: navigator.hardwareConcurrency,
+            };
+        }
+    }
+    catch (_a) {
+    }
+    return {};
+}
+exports.getDeviceSpec = getDeviceSpec;
 /**
  * Represents the runtime of the container. Contains helper functions/state of the container.
  * It will define the store level mappings.
@@ -305,9 +389,9 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             }
             else {
                 // If we're not the summarizer, and we don't have a summaryManager, we expect that
-                // generateSummaries is turned off. We are throwing instead of returning a failure here,
+                // disableSummaries is turned on. We are throwing instead of returning a failure here,
                 // because it is a misuse of the API rather than an expected failure.
-                throw new Error(`Can't summarize, generateSummaries: ${this.runtimeOptions.summaryOptions.generateSummaries}`);
+                throw new Error(`Can't summarize, disableSummaries: ${this.summariesDisabled()}`);
             }
         };
         this.enqueueSummarize = (...args) => {
@@ -321,18 +405,43 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 // If we're not the summarizer, and we don't have a summaryManager, we expect that
                 // generateSummaries is turned off. We are throwing instead of returning a failure here,
                 // because it is a misuse of the API rather than an expected failure.
-                throw new Error(`Can't summarize, generateSummaries: ${this.runtimeOptions.summaryOptions.generateSummaries}`);
+                throw new Error(`Can't summarize, disableSummaries: ${this.summariesDisabled()}`);
             }
         };
         this.baseSummaryMessage = metadata === null || metadata === void 0 ? void 0 : metadata.message;
+        // If this is an existing container, we get values from metadata.
+        // otherwise, we initialize them.
+        if (existing) {
+            this.createContainerMetadata = {
+                createContainerRuntimeVersion: metadata === null || metadata === void 0 ? void 0 : metadata.createContainerRuntimeVersion,
+                createContainerTimestamp: metadata === null || metadata === void 0 ? void 0 : metadata.createContainerTimestamp,
+            };
+            this.summaryCount = metadata === null || metadata === void 0 ? void 0 : metadata.summaryCount;
+        }
+        else {
+            this.createContainerMetadata = {
+                createContainerRuntimeVersion: packageVersion_1.pkgVersion,
+                createContainerTimestamp: Date.now(),
+            };
+        }
         // Default to false (enabled).
         this.disableIsolatedChannels = (_a = this.runtimeOptions.summaryOptions.disableIsolatedChannels) !== null && _a !== void 0 ? _a : false;
         this._connected = this.context.connected;
         this.chunkMap = new Map(chunks);
         this.IFluidHandleContext = new containerHandleContext_1.ContainerFluidHandleContext("", this);
-        this.IFluidSerializer = new runtime_utils_1.FluidSerializer(this.IFluidHandleContext);
         this._logger = telemetry_utils_1.ChildLogger.create(this.logger, "ContainerRuntime");
-        this.garbageCollector = garbageCollection_1.GarbageCollector.create(this, this.runtimeOptions.gcOptions, (unusedRoutes) => this.dataStores.deleteUnusedRoutes(unusedRoutes), this._logger, existing, metadata);
+        /**
+         * Function that return the current server timestamp. This is used by the garbage collector to set the
+         * time when a node becomes unreferenced.
+         * For now, we use the timestamp of the last op for gcTimestamp. However, there can be cases where
+         * we don't have an op (on demand summaries for instance). In those cases, we will use the timestamp
+         * of this client's connection - https://github.com/microsoft/FluidFramework/issues/8375.
+         */
+        const getCurrentTimestamp = () => {
+            var _a, _b;
+            return (_b = (_a = this.deltaManager.lastMessage) === null || _a === void 0 ? void 0 : _a.timestamp) !== null && _b !== void 0 ? _b : Date.now();
+        };
+        this.garbageCollector = garbageCollection_1.GarbageCollector.create(this, this.runtimeOptions.gcOptions, (unusedRoutes) => this.dataStores.deleteUnusedRoutes(unusedRoutes), getCurrentTimestamp, context.baseSnapshot, async (id) => driver_utils_1.readAndParse(this.storage, id), this._logger, existing, metadata);
         const loadedFromSequenceNumber = this.deltaManager.initialSequenceNumber;
         this.summarizerNode = runtime_utils_1.createRootSummarizerNodeWithGC(telemetry_utils_1.ChildLogger.create(this.logger, "SummarizerNode"), 
         // Summarize function to call when summarize is called. Summarizer node always tracks summary state.
@@ -349,13 +458,11 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             throwOnFailure: true,
             // If GC should not run, let the summarizer node know so that it does not track GC state.
             gcDisabled: !this.garbageCollector.shouldRunGC,
-            // The max duration for which objects can be unreferenced before they are eligible for deletion.
-            maxUnreferencedDurationMs: this.runtimeOptions.gcOptions.maxUnreferencedDurationMs,
         });
         if (this.context.baseSnapshot) {
             this.summarizerNode.loadBaseSummaryWithoutDifferential(this.context.baseSnapshot);
         }
-        this.dataStores = new dataStores_1.DataStores(dataStores_1.getSummaryForDatastores(context.baseSnapshot, metadata), this, (attachMsg) => this.submit(ContainerMessageType.Attach, attachMsg), (id, createParam) => (summarizeInternal, getGCDataFn, getInitialGCSummaryDetailsFn) => this.summarizerNode.createChild(summarizeInternal, id, createParam, undefined, getGCDataFn, getInitialGCSummaryDetailsFn), (id) => this.summarizerNode.deleteChild(id), this._logger);
+        this.dataStores = new dataStores_1.DataStores(dataStores_1.getSummaryForDatastores(context.baseSnapshot, metadata), this, (attachMsg) => this.submit(ContainerMessageType.Attach, attachMsg), (id, createParam) => (summarizeInternal, getGCDataFn, getInitialGCSummaryDetailsFn) => this.summarizerNode.createChild(summarizeInternal, id, createParam, undefined, getGCDataFn, getInitialGCSummaryDetailsFn), (id) => this.summarizerNode.deleteChild(id), this._logger, async () => this.garbageCollector.getDataStoreBaseGCDetails(), (id) => this.garbageCollector.nodeChanged(id));
         this.blobManager = new blobManager_1.BlobManager(this.IFluidHandleContext, blobManagerSnapshot, () => this.storage, (blobId) => this.submit(ContainerMessageType.BlobAttach, undefined, undefined, { blobId }), this, this.logger);
         this.scheduleManager = new ScheduleManager(context.deltaManager, this, telemetry_utils_1.ChildLogger.create(this.logger, "ScheduleManager"));
         this.deltaSender = this.deltaManager;
@@ -363,14 +470,13 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         this.context.quorum.on("removeMember", (clientId) => {
             this.clearPartialChunks(clientId);
         });
-        this.context.quorum.on("addProposal", (proposal) => {
-            if (proposal.key === "code" || proposal.key === "code2") {
-                this.emit("codeDetailsProposed", proposal.value, proposal);
-            }
-        });
         this.summaryCollection = new summaryCollection_1.SummaryCollection(this.deltaManager, this.logger);
         // Only create a SummaryManager if summaries are enabled and we are not the summarizer client
+        // Map the deprecated generateSummaries flag to disableSummaries.
         if (this.runtimeOptions.summaryOptions.generateSummaries === false) {
+            this.runtimeOptions.summaryOptions.disableSummaries = true;
+        }
+        if (this.summariesDisabled()) {
             this._logger.sendTelemetryEvent({ eventName: "SummariesDisabled" });
         }
         else {
@@ -420,7 +526,8 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         this.deltaManager.on("readonly", (readonly) => {
             // we accumulate ops while being in read-only state.
             // once user gets write permissions and we have active connection, flush all pending ops.
-            common_utils_1.assert(readonly === this.deltaManager.readonly, 0x124 /* "inconsistent readonly property/event state" */);
+            // eslint-disable-next-line max-len
+            common_utils_1.assert(readonly === this.deltaManager.readOnlyInfo.readonly, 0x124 /* "inconsistent readonly property/event state" */);
             // We need to be very careful with when we (re)send pending ops, to ensure that we only send ops
             // when we either never send an op, or attempted to send it but we know for sure it was not
             // sequenced by server and will never be sequenced (i.e. was lost)
@@ -439,6 +546,10 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         if (context.pendingLocalState !== undefined) {
             this.deltaManager.on("op", this.onOp);
         }
+        // logging hardware telemetry
+        logger.sendTelemetryEvent(Object.assign({ eventName: "DeviceSpec" }, getDeviceSpec()));
+        // logging container load stats
+        this.logger.sendTelemetryEvent(Object.assign(Object.assign(Object.assign({ eventName: "ContainerLoadStats" }, this.createContainerMetadata), this.dataStores.containerLoadStats), { summaryCount: this.summaryCount, 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 }));
         connectionTelemetry_1.ReportOpPerfTelemetry(this.context.clientId, this.deltaManager, this.logger);
     }
     get IContainerRuntime() { return this; }
@@ -460,7 +571,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 runtimeVersion: packageVersion_1.pkgVersion,
             },
         });
-        const { summaryOptions = { generateSummaries: true }, gcOptions = {}, loadSequenceNumberVerification = "close", } = runtimeOptions;
+        const { summaryOptions = {}, gcOptions = {}, loadSequenceNumberVerification = "close", } = runtimeOptions;
         // We pack at data store level only. If isolated channels are disabled,
         // then there are no .channel layers, we pack at level 1, otherwise we pack at level 2
         const packingLevel = summaryOptions.disableIsolatedChannels ? 1 : 2;
@@ -511,7 +622,8 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             const protocolSequenceNumber = context.deltaManager.initialSequenceNumber;
             // Unless bypass is explicitly set, then take action when sequence numbers mismatch.
             if (loadSequenceNumberVerification !== "bypass" && runtimeSequenceNumber !== protocolSequenceNumber) {
-                const error = new container_utils_1.DataCorruptionError("Load from summary, runtime metadata sequenceNumber !== initialSequenceNumber", { runtimeSequenceNumber, protocolSequenceNumber });
+                // "Load from summary, runtime metadata sequenceNumber !== initialSequenceNumber"
+                const error = new container_utils_1.DataCorruptionError("SummaryMetadataMismatch", { runtimeSequenceNumber, protocolSequenceNumber });
                 if (loadSequenceNumberVerification === "log") {
                     logger.sendErrorEvent({ eventName: "SequenceNumberMismatch" }, error);
                 }
@@ -590,6 +702,13 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         return Object.assign(Object.assign(Object.assign({}, DefaultSummaryConfiguration), (_b = (_a = this.context) === null || _a === void 0 ? void 0 : _a.serviceConfiguration) === null || _b === void 0 ? void 0 : _b.summary), (_c = this.runtimeOptions.summaryOptions) === null || _c === void 0 ? void 0 : _c.summaryConfigOverrides);
     }
     get disposed() { return this._disposed; }
+    /**
+     * True, if GC data should be written at root of the summary tree.
+     * False, if data stores should write GC blobs in their summary tree.
+     */
+    get writeGCDataAtRoot() {
+        return this.garbageCollector.writeDataAtRoot;
+    }
     static get defaultFlushMode() {
         return localStorageFeatureGates_1.getLocalStorageFeatureGate(turnBasedFlushModeKey) ? runtime_definitions_1.FlushMode.TurnBased : runtime_definitions_1.FlushMode.Immediate;
     }
@@ -710,14 +829,10 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     }
     formMetadata() {
         var _a;
-        return {
-            summaryFormatVersion: 1,
-            disableIsolatedChannels: this.disableIsolatedChannels || undefined,
-            gcFeature: this.garbageCollector.gcSummaryFeatureVersion,
+        return Object.assign(Object.assign({}, this.createContainerMetadata), { summaryCount: this.summaryCount, summaryFormatVersion: 1, disableIsolatedChannels: this.disableIsolatedChannels || undefined, gcFeature: this.garbageCollector.gcSummaryFeatureVersion, 
             // The last message processed at the time of summary. If there are no messages, nothing has changed from
             // the base summary we loaded from. So, use the message from its metadata blob.
-            message: (_a = summaryFormat_1.extractSummaryMetadataMessage(this.deltaManager.lastMessage)) !== null && _a !== void 0 ? _a : this.baseSummaryMessage,
-        };
+            message: (_a = summaryFormat_1.extractSummaryMetadataMessage(this.deltaManager.lastMessage)) !== null && _a !== void 0 ? _a : this.baseSummaryMessage });
     }
     /**
      * Retrieves the runtime for a data store if it's referenced as per the initially summary that it is loaded with.
@@ -744,22 +859,14 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
      * @deprecated - Use summarize to get summary of the container runtime.
      */
     async snapshot() {
-        if (this.garbageCollector.shouldRunGC) {
-            await this.collectGarbage({ logger: this.logger, fullGC: true /* fullGC */ });
-        }
-        const root = { entries: [] };
-        const entries = await this.dataStores.snapshot();
-        if (this.disableIsolatedChannels) {
-            root.entries = root.entries.concat(entries);
-        }
-        else {
-            root.entries.push(new protocol_base_1.TreeTreeEntry(runtime_definitions_1.channelsTreeName, { entries }));
-        }
-        root.entries.push(new protocol_base_1.BlobTreeEntry(summaryFormat_1.metadataBlobName, JSON.stringify(this.formMetadata())));
-        if (this.chunkMap.size > 0) {
-            root.entries.push(new protocol_base_1.BlobTreeEntry(summaryFormat_1.chunksBlobName, JSON.stringify([...this.chunkMap])));
-        }
-        return root;
+        const summaryResult = await this.summarize({
+            summaryLogger: this.logger,
+            fullTree: true,
+            trackState: false,
+            runGC: this.garbageCollector.shouldRunGC,
+            fullGC: true,
+        });
+        return runtime_utils_1.convertSummaryTreeToITree(summaryResult.summary);
     }
     addContainerBlobsToSummary(summaryTree) {
         var _a;
@@ -779,6 +886,12 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             const blobsTree = runtime_utils_1.convertToSummaryTree(snapshot, false);
             runtime_utils_1.addTreeToSummary(summaryTree, summaryFormat_1.blobsTreeName, blobsTree);
         }
+        if (this.writeGCDataAtRoot) {
+            const gcSummary = this.garbageCollector.summarize();
+            if (gcSummary !== undefined) {
+                runtime_utils_1.addTreeToSummary(summaryTree, garbageCollection_1.gcTreeKey, gcSummary);
+            }
+        }
     }
     replayPendingStates() {
         // We need to be able to send ops to replay states
@@ -848,11 +961,10 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         // We do not need to make deep copy, as each layer will just replace message.content itself,
         // but would not modify contents details
         let message = Object.assign({}, messageArg);
-        let error;
         // Surround the actual processing of the operation with messages to the schedule manager indicating
         // the beginning and end. This allows it to emit appropriate events and/or pause the processing of new
         // messages once a batch has been fully processed.
-        this.scheduleManager.beginOperation(message);
+        this.scheduleManager.beforeOpProcessing(message);
         try {
             message = unpackRuntimeMessage(message);
             // Chunk processing must come first given that we will transform the message to the unchunked version
@@ -880,14 +992,12 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 default:
             }
             this.emit("op", message);
+            this.scheduleManager.afterOpProcessing(undefined, message);
         }
         catch (e) {
-            error = e;
+            this.scheduleManager.afterOpProcessing(e, message);
             throw e;
         }
-        finally {
-            this.scheduleManager.endOperation(error, message);
-        }
     }
     processSignal(message, local) {
         const envelope = message.content;
@@ -1099,7 +1209,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             await this.collectGarbage({ logger: summaryLogger, runSweep, fullGC });
         }
         const summarizeResult = await this.summarizerNode.summarize(fullTree, trackState);
-        common_utils_1.assert(summarizeResult.summary.type === 1 /* Tree */, 0x12f /* "Container Runtime's summarize should always return a tree" */);
+        common_utils_1.assert(summarizeResult.summary.type === protocol_definitions_1.SummaryType.Tree, 0x12f /* "Container Runtime's summarize should always return a tree" */);
         return summarizeResult;
     }
     /**
@@ -1114,19 +1224,16 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
      * Implementation of IGarbageCollectionRuntime::updateUsedRoutes.
      * After GC has run, called to notify this container's nodes of routes that are used in it.
      * @param usedRoutes - The routes that are used in all nodes in this Container.
+     * @param gcTimestamp - The time when GC was run that generated these used routes. If any node node becomes
+     * unreferenced as part of this GC run, this should be used to update the time when it happens.
      * @returns the statistics of the used state of the data stores.
      */
-    updateUsedRoutes(usedRoutes) {
-        var _a;
+    updateUsedRoutes(usedRoutes, gcTimestamp) {
         // Update our summarizer node's used routes. Updating used routes in summarizer node before
         // summarizing is required and asserted by the the summarizer node. We are the root and are
         // always referenced, so the used routes is only self-route (empty string).
         this.summarizerNode.updateUsedRoutes([""]);
-        return this.dataStores.updateUsedRoutes(usedRoutes, (_a = 
-        // For now, we use the timestamp of the last op for gcTimestamp. However, there can be cases where
-        // we don't have an op (on demand summaries for instance). In those cases, we will use the timestamp
-        // of this client's connection - https://github.com/microsoft/FluidFramework/issues/7152.
-        this.deltaManager.lastMessage) === null || _a === void 0 ? void 0 : _a.timestamp);
+        return this.dataStores.updateUsedRoutes(usedRoutes, gcTimestamp);
     }
     /**
      * Runs garbage collection and udpates the reference / used state of the nodes in the container.
@@ -1194,6 +1301,13 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             if (!continueResult.continue) {
                 return { stage: "base", referenceSequenceNumber: summaryRefSeqNum, error: continueResult.error };
             }
+            // increment summary count
+            if (this.summaryCount !== undefined) {
+                this.summaryCount++;
+            }
+            else {
+                this.summaryCount = 1;
+            }
             const trace = common_utils_1.Trace.start();
             let summarizeResult;
             try {
@@ -1215,8 +1329,8 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             // Because handles are unchanged dataStores in the current logic,
             // summarized dataStore count is total dataStore count minus handle count
             const dataStoreTree = this.disableIsolatedChannels ? summaryTree : summaryTree.tree[runtime_definitions_1.channelsTreeName];
-            common_utils_1.assert(dataStoreTree.type === 1 /* Tree */, 0x1fc /* "summary is not a tree" */);
-            const handleCount = Object.values(dataStoreTree.tree).filter((value) => value.type === 3 /* Handle */).length;
+            common_utils_1.assert(dataStoreTree.type === protocol_definitions_1.SummaryType.Tree, 0x1fc /* "summary is not a tree" */);
+            const handleCount = Object.values(dataStoreTree.tree).filter((value) => value.type === protocol_definitions_1.SummaryType.Handle).length;
             const summaryStats = Object.assign({ dataStoreCount: this.dataStores.size, summarizedDataStoreCount: this.dataStores.size - handleCount }, partialStats);
             const generateSummaryData = {
                 referenceSequenceNumber: summaryRefSeqNum,
@@ -1493,6 +1607,14 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     getPendingLocalState() {
         return this.pendingStateManager.getLocalState();
     }
+    /**
+     * @returns true if summaries are explicitly disabled for this ContainerRuntime, false otherwise
+     */
+    summariesDisabled() {
+        var _a;
+        return this.runtimeOptions.summaryOptions.disableSummaries === true ||
+            ((_a = this.runtimeOptions.summaryOptions.summaryConfigOverrides) === null || _a === void 0 ? void 0 : _a.disableSummaries) === true;
+    }
 }
 exports.ContainerRuntime = ContainerRuntime;
 /**