@fluidframework/container-runtime 2.0.0-rc.4.0.5 → 2.0.0-rc.5.0.0

package/dist/containerRuntime.js

@@ -9,9 +9,9 @@ const client_utils_1 = require("@fluid-internal/client-utils");
 const container_definitions_1 = require("@fluidframework/container-definitions");
 const internal_1 = require("@fluidframework/container-definitions/internal");
 const internal_2 = require("@fluidframework/core-utils/internal");
+const driver_definitions_1 = require("@fluidframework/driver-definitions");
 const internal_3 = require("@fluidframework/driver-definitions/internal");
 const internal_4 = require("@fluidframework/driver-utils/internal");
-const protocol_definitions_1 = require("@fluidframework/protocol-definitions");
 const internal_5 = require("@fluidframework/runtime-definitions/internal");
 const internal_6 = require("@fluidframework/runtime-utils/internal");
 const internal_7 = require("@fluidframework/telemetry-utils/internal");
@@ -50,13 +50,13 @@ function compatBehaviorAllowsMessageType(_unknownContainerRuntimeMessageType, co
 exports.DefaultSummaryConfiguration = {
     state: "enabled",
     minIdleTime: 0,
-    maxIdleTime: 30 * 1000,
-    maxTime: 60 * 1000,
-    maxOps: 100,
+    maxIdleTime: 30 * 1000, // 30 secs.
+    maxTime: 60 * 1000, // 1 min.
+    maxOps: 100, // Summarize if 100 weighted ops received since last snapshot.
     minOpsForLastSummaryAttempt: 10,
-    maxAckWaitTime: 3 * 60 * 1000,
+    maxAckWaitTime: 3 * 60 * 1000, // 3 mins.
     maxOpsSinceLastSummary: 7000,
-    initialSummarizerDelayMs: 5 * 1000,
+    initialSummarizerDelayMs: 5 * 1000, // 5 secs.
     nonRuntimeOpWeight: 0.1,
     runtimeOpWeight: 1.0,
     nonRuntimeHeuristicThreshold: 20,
@@ -155,7 +155,7 @@ exports.getDeviceSpec = getDeviceSpec;
  */
 const makeLegacySendBatchFn = (submitFn, deltaManager) => (batch) => {
     for (const message of batch.content) {
-        submitFn(protocol_definitions_1.MessageType.Operation, 
+        submitFn(internal_3.MessageType.Operation, 
         // For back-compat (submitFn only works on deserialized content)
         message.contents === undefined ? undefined : JSON.parse(message.contents), true, // batch
         message.metadata);
@@ -532,7 +532,9 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         return this.garbageCollector.throwOnTombstoneUsage;
     }
     /***/
-    constructor(context, registry, metadata, electedSummarizerData, chunks, dataStoreAliasMap, runtimeOptions, containerScope, logger, existing, blobManagerSnapshot, _storage, createIdCompressor, documentsSchemaController, featureGatesForTelemetry, provideEntryPoint, requestHandler, summaryConfiguration = {
+    constructor(context, registry, metadata, electedSummarizerData, chunks, dataStoreAliasMap, runtimeOptions, containerScope, 
+    // Create a custom ITelemetryBaseLogger to output telemetry events.
+    baseLogger, existing, blobManagerSnapshot, _storage, createIdCompressor, documentsSchemaController, featureGatesForTelemetry, provideEntryPoint, requestHandler, summaryConfiguration = {
         // the defaults
         ...exports.DefaultSummaryConfiguration,
         // the runtime configuration overrides
@@ -543,7 +545,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         this.metadata = metadata;
         this.runtimeOptions = runtimeOptions;
         this.containerScope = containerScope;
-        this.logger = logger;
+        this.baseLogger = baseLogger;
         this._storage = _storage;
         this.createIdCompressor = createIdCompressor;
         this.documentsSchemaController = documentsSchemaController;
@@ -575,6 +577,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             expiry: { policy: "absolute", durationMs: 60000 },
         });
         const { options, clientDetails, connected, baseSnapshot, submitFn, submitBatchFn, submitSummaryFn, submitSignalFn, disposeFn, closeFn, deltaManager, quorum, audience, loader, pendingLocalState, supportedFeatures, snapshotWithContents, } = context;
+        this.logger = (0, internal_7.createChildLogger)({ logger: this.baseLogger });
         this.mc = (0, internal_7.createChildMonitoringContext)({
             logger: this.logger,
             namespace: "ContainerRuntime",
@@ -770,7 +773,10 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 snapshotTree: snapshot,
             };
         }
-        this.channelCollection = new channelCollection_js_1.ChannelCollection(snapshot, parentContext, this.mc.logger, (props) => this.garbageCollector.nodeUpdated(props), (path) => this.garbageCollector.isNodeDeleted(path), new Map(dataStoreAliasMap), async (runtime) => provideEntryPoint);
+        this.channelCollection = new channelCollection_js_1.ChannelCollection(snapshot, parentContext, this.mc.logger, (props) => this.garbageCollector.nodeUpdated({
+            ...props,
+            timestampMs: props.timestampMs ?? this.getCurrentReferenceTimestampMs(),
+        }), (path) => this.garbageCollector.isNodeDeleted(path), new Map(dataStoreAliasMap), async (runtime) => provideEntryPoint);
         this.blobManager = new blobManager_js_1.BlobManager({
             routeContext: this.handleContext,
             snapshot: blobManagerSnapshot,
@@ -786,6 +792,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             blobRequested: (blobPath) => this.garbageCollector.nodeUpdated({
                 node: { type: "Blob", path: blobPath },
                 reason: "Loaded",
+                timestampMs: this.getCurrentReferenceTimestampMs(),
             }),
             isBlobDeleted: (blobPath) => this.garbageCollector.isNodeDeleted(blobPath),
             runtime: this,
@@ -843,7 +850,8 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             });
         }
         const closeSummarizerDelayOverride = this.mc.config.getNumber("Fluid.ContainerRuntime.Test.CloseSummarizerDelayOverrideMs");
-        this.closeSummarizerDelayMs = closeSummarizerDelayOverride ?? defaultCloseSummarizerDelayMs;
+        this.closeSummarizerDelayMs =
+            closeSummarizerDelayOverride ?? defaultCloseSummarizerDelayMs;
         this.summaryCollection = new index_js_3.SummaryCollection(this.deltaManager, this.logger);
         this.dirtyContainer =
             this.attachState !== container_definitions_1.AttachState.Attached || this.hasPendingMessages();
@@ -857,7 +865,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 namespace: "OrderedClientElection",
             });
             const orderedClientCollection = new index_js_3.OrderedClientCollection(orderedClientLogger, this.innerDeltaManager, this._quorum);
-            const orderedClientElectionForSummarizer = new index_js_3.OrderedClientElection(orderedClientLogger, orderedClientCollection, electedSummarizerData ?? this.innerDeltaManager.lastSequenceNumber, index_js_3.SummarizerClientElection.isClientEligible);
+            const orderedClientElectionForSummarizer = new index_js_3.OrderedClientElection(orderedClientLogger, orderedClientCollection, electedSummarizerData ?? this.innerDeltaManager.lastSequenceNumber, index_js_3.SummarizerClientElection.isClientEligible, this.mc.config.getBoolean("Fluid.ContainerRuntime.OrderedClientElection.EnablePerformanceEvents"));
             this.summarizerClientElection = new index_js_3.SummarizerClientElection(orderedClientLogger, this.summaryCollection, orderedClientElectionForSummarizer, this.maxOpsSinceLastSummary);
             if (this.isSummarizerClient) {
                 this._summarizer = new index_js_3.Summarizer(this /* ISummarizerRuntime */, () => this.summaryConfiguration, this /* ISummarizerInternalsProvider */, this.handleContext, this.summaryCollection, async (runtime) => index_js_3.RunWhileConnectedCoordinator.create(runtime, 
@@ -874,7 +882,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                         // unregister default to no log on every op after falling behind
                         // and register summary ack handler to re-register this handler
                         // after successful summary
-                        this.summaryCollection.once(protocol_definitions_1.MessageType.SummaryAck, () => {
+                        this.summaryCollection.once(internal_3.MessageType.SummaryAck, () => {
                             this.mc.logger.sendTelemetryEvent({
                                 eventName: "SummaryStatus:CaughtUp",
                             });
@@ -901,7 +909,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             }
         }
         // logging hardware telemetry
-        logger.sendTelemetryEvent({
+        this.logger.sendTelemetryEvent({
             eventName: "DeviceSpec",
             ...getDeviceSpec(),
         });
@@ -1064,7 +1072,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             const props = {
                 eventName: "GroupIdSnapshotCatchup",
                 loadingGroupIds: sortedLoadingGroupIds.join(","),
-                targetSequenceNumber: snapshotSeqNumber,
+                targetSequenceNumber: snapshotSeqNumber, // This is so we reuse some columns in telemetry
                 sequenceNumber: this.deltaManager.lastSequenceNumber, // This is so we reuse some columns in telemetry
             };
             const event = internal_7.PerformanceEvent.start(this.mc.logger, {
@@ -1182,7 +1190,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             this.messageAtLastSummary;
         const documentSchema = this.documentsSchemaController.summarizeDocumentSchema(this.deltaManager.lastSequenceNumber);
         // Is document schema explicit control on?
-        const explitiSchemaControl = documentSchema?.runtime.explicitSchemaControl;
+        const explicitSchemaControl = documentSchema?.runtime.explicitSchemaControl;
         const metadata = {
             ...this.createContainerMetadata,
             // Increment the summary number for the next summary that will be generated.
@@ -1195,10 +1203,10 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             // runtimes (that preceed document schema control capabilities) to close container on load due to mismatch in
             // last message's sequence number.
             // See also lastMessageFromMetadata()
-            message: explitiSchemaControl
+            message: explicitSchemaControl
                 ? { sequenceNumber: -1 }
                 : message,
-            lastMessage: explitiSchemaControl ? message : undefined,
+            lastMessage: explicitSchemaControl ? message : undefined,
             documentSchema,
         };
         (0, internal_6.addBlobToSummary)(summaryTree, index_js_3.metadataBlobName, JSON.stringify(metadata));
@@ -1453,7 +1461,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         // Whether or not the message appears to be a runtime message from an up-to-date client.
         // It may be a legacy runtime message (ie already unpacked and ContainerMessageType)
         // or something different, like a system message.
-        const modernRuntimeMessage = messageArg.type === protocol_definitions_1.MessageType.Operation;
+        const modernRuntimeMessage = messageArg.type === internal_3.MessageType.Operation;
         // Do shallow copy of message, as the processing flow will modify it.
         // There might be multiple container instances receiving the same message.
         // We do not need to make a deep copy. Each layer will just replace message.contents itself,
@@ -1541,7 +1549,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             case messageTypes_js_1.ContainerMessageType.Attach:
             case messageTypes_js_1.ContainerMessageType.Alias:
             case messageTypes_js_1.ContainerMessageType.FluidDataStoreOp:
-                this.channelCollection.process(messageWithContext.message, local, localOpMetadata, (from, to) => this.garbageCollector.addedOutboundReference(from, to));
+                this.channelCollection.process(messageWithContext.message, local, localOpMetadata);
                 break;
             case messageTypes_js_1.ContainerMessageType.BlobAttach:
                 this.blobManager.processBlobAttachOp(messageWithContext.message, local);
@@ -1566,7 +1574,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 }
                 break;
             case messageTypes_js_1.ContainerMessageType.GC:
-                this.garbageCollector.processMessage(messageWithContext.message, local);
+                this.garbageCollector.processMessage(messageWithContext.message, messageWithContext.message.timestamp, local);
                 break;
             case messageTypes_js_1.ContainerMessageType.ChunkedOp:
                 // From observability POV, we should not exppse the rest of the system (including "op" events on object) to these messages.
@@ -1629,8 +1637,7 @@ class ContainerRuntime extends client_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.mc.logger.sendErrorEvent({
@@ -1750,6 +1757,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             node: { type: "DataStore", path: `/${internalId}` },
             reason: "Loaded",
             packagePath: context.packagePath,
+            timestampMs: this.getCurrentReferenceTimestampMs(),
         });
         return channel.entryPoint;
     }
@@ -1917,25 +1925,16 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 await this.collectGarbage({ logger: summaryLogger, runSweep, fullGC }, telemetryContext);
             }
             const { stats, summary } = await this.summarizerNode.summarize(fullTree, trackState, telemetryContext);
-            (0, internal_2.assert)(summary.type === protocol_definitions_1.SummaryType.Tree, 0x12f /* "Container Runtime's summarize should always return a tree" */);
+            (0, internal_2.assert)(summary.type === driver_definitions_1.SummaryType.Tree, 0x12f /* "Container Runtime's summarize should always return a tree" */);
             return { stats, summary };
         }
         finally {
-            this.mc.logger.sendTelemetryEvent({
+            summaryLogger.sendTelemetryEvent({
                 eventName: "SummarizeTelemetry",
                 details: telemetryContext.serialize(),
             });
         }
     }
-    /**
-     * Before GC runs, called by the garbage collector to update any pending GC state. This is mainly used to notify
-     * the garbage collector of references detected since the last GC run. Most references are notified immediately
-     * but there can be some for which async operation is required (such as detecting new root data stores).
-     * @see IGarbageCollectionRuntime.updateStateBeforeGC
-     */
-    async updateStateBeforeGC() {
-        return this.channelCollection.updateStateBeforeGC();
-    }
     async getGCDataInternal(fullGC) {
         return this.channelCollection.getGCData(fullGC);
     }
@@ -1984,8 +1983,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
      * @param tombstonedRoutes - Data store and attachment blob routes that are tombstones in this Container.
      */
     updateTombstonedRoutes(tombstonedRoutes) {
-        const { blobManagerRoutes, dataStoreRoutes } = this.getDataStoreAndBlobManagerRoutes(tombstonedRoutes);
-        this.blobManager.updateTombstonedRoutes(blobManagerRoutes);
+        const { dataStoreRoutes } = this.getDataStoreAndBlobManagerRoutes(tombstonedRoutes);
         this.channelCollection.updateTombstonedRoutes(dataStoreRoutes);
     }
     /**
@@ -2063,13 +2061,29 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         return this.garbageCollector.collectGarbage(options, telemetryContext);
     }
     /**
-     * Called when a new outbound reference is added to another node. This is used by garbage collection to identify
+     * Called when a new outbound route is added to another node. This is used by garbage collection to identify
      * all references added in the system.
-     * @param srcHandle - The handle of the node that added the reference.
-     * @param outboundHandle - The handle of the outbound node that is referenced.
+     * @param fromPath - The absolute path of the node that added the reference.
+     * @param toPath - The absolute path of the outbound node that is referenced.
+     * @param messageTimestampMs - The timestamp of the message that added the reference.
      */
-    addedGCOutboundReference(srcHandle, outboundHandle) {
-        this.garbageCollector.addedOutboundReference(srcHandle.absolutePath, outboundHandle.absolutePath);
+    addedGCOutboundRoute(fromPath, toPath, messageTimestampMs) {
+        // This is always called when processing an op so messageTimestampMs should exist. Due to back-compat
+        // across the data store runtime / container runtime boundary, this may be undefined and if so, get
+        // the timestamp from the last processed message which should exist.
+        // If a timestamp doesn't exist, log so we can learn about these cases and return.
+        const timestampMs = messageTimestampMs ?? this.getCurrentReferenceTimestampMs();
+        if (timestampMs === undefined) {
+            this.mc.logger.sendTelemetryEvent({
+                eventName: "NoTimestampInGCOutboundRoute",
+                ...(0, internal_7.tagCodeArtifacts)({
+                    id: toPath,
+                    fromId: fromPath,
+                }),
+            });
+            return;
+        }
+        this.garbageCollector.addedOutboundReference(fromPath, toPath, timestampMs);
     }
     /**
      * Generates the summary tree, uploads it to storage, and then submits the summarize op.
@@ -2080,7 +2094,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
      * @param options - options controlling how the summary is generated or submitted
      */
     async submitSummary(options) {
-        const { fullTree = false, finalAttempt = false, refreshLatestAck, summaryLogger, latestSummaryRefSeqNum, } = options;
+        const { fullTree = false, finalAttempt = false, summaryLogger, latestSummaryRefSeqNum, } = options;
         // The summary number for this summary. This will be updated during the summary process, so get it now and
         // use it for all events logged during this summary.
         const summaryNumber = this.nextSummaryNumber;
@@ -2095,13 +2109,6 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             },
         });
         (0, internal_2.assert)(this.outbox.isEmpty, 0x3d1 /* Can't trigger summary in the middle of a batch */);
-        // We close the summarizer and download a new snapshot and reload the container
-        if (refreshLatestAck === true) {
-            return this.prefetchLatestSummaryThenClose((0, internal_7.createChildLogger)({
-                logger: summaryNumberLogger,
-                properties: { all: { safeSummary: true } },
-            }));
-        }
         // If the container is dirty, i.e., there are pending unacked ops, the summary will not be eventual consistent
         // and it may even be incorrect. So, wait for the container to be saved with a timeout. If the container is not
         // saved within the timeout, check if it should be failed or can continue.
@@ -2156,8 +2163,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
              * Generally the validate sequence number comes from the running summarizer and the node sequence number comes from the
              * summarizer nodes.
              */
-            if (startSummaryResult.invalidNodes > 0 ||
-                startSummaryResult.mismatchNumbers.size > 0) {
+            if (startSummaryResult.invalidNodes > 0 || startSummaryResult.mismatchNumbers.size > 0) {
                 summaryLogger.sendTelemetryEvent({
                     eventName: "LatestSummaryRefSeqNumMismatch",
                     details: {
@@ -2170,7 +2176,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                         stage: "base",
                         referenceSequenceNumber: summaryRefSeqNum,
                         minimumSequenceNumber,
-                        error: new internal_7.LoggingError(`Summarizer node state inconsistent with summarizer state.`),
+                        error: new index_js_3.RetriableSummaryError(`Summarizer node state inconsistent with summarizer state.`),
                     };
                 }
             }
@@ -2213,17 +2219,14 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                     stage: "base",
                     referenceSequenceNumber: summaryRefSeqNum,
                     minimumSequenceNumber,
-                    error: new internal_7.LoggingError(continueResult.error),
+                    error: new index_js_3.RetriableSummaryError(continueResult.error),
                 };
             }
             const trace = client_utils_1.Trace.start();
             let summarizeResult;
-            // If the GC state needs to be reset, we need to force a full tree summary and update the unreferenced
-            // state of all the nodes.
-            const forcedFullTree = this.garbageCollector.summaryStateNeedsReset;
             try {
                 summarizeResult = await this.summarize({
-                    fullTree: fullTree || forcedFullTree,
+                    fullTree,
                     trackState: true,
                     summaryLogger: summaryNumberLogger,
                     runGC: this.garbageCollector.shouldRunGC,
@@ -2234,7 +2237,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                     stage: "base",
                     referenceSequenceNumber: summaryRefSeqNum,
                     minimumSequenceNumber,
-                    error: (0, internal_7.wrapError)(error, (msg) => new internal_7.LoggingError(msg)),
+                    error: (0, internal_7.wrapError)(error, (msg) => new index_js_3.RetriableSummaryError(msg)),
                 };
             }
             // Validate that the summary generated by summarizer nodes is correct before uploading.
@@ -2262,8 +2265,8 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             // Because handles are unchanged dataStores in the current logic,
             // summarized dataStore count is total dataStore count minus handle count
             const dataStoreTree = summaryTree.tree[internal_5.channelsTreeName];
-            (0, internal_2.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;
+            (0, internal_2.assert)(dataStoreTree.type === driver_definitions_1.SummaryType.Tree, 0x1fc /* "summary is not a tree" */);
+            const handleCount = Object.values(dataStoreTree.tree).filter((value) => value.type === driver_definitions_1.SummaryType.Handle).length;
             const gcSummaryTreeStats = summaryTree.tree[internal_5.gcTreeKey]
                 ? (0, internal_6.calculateStats)(summaryTree.tree[internal_5.gcTreeKey])
                 : undefined;
@@ -2282,14 +2285,13 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 summaryTree,
                 summaryStats,
                 generateDuration: trace.trace().duration,
-                forcedFullTree,
             };
             continueResult = checkContinue();
             if (!continueResult.continue) {
                 return {
                     stage: "generate",
                     ...generateSummaryData,
-                    error: new internal_7.LoggingError(continueResult.error),
+                    error: new index_js_3.RetriableSummaryError(continueResult.error),
                 };
             }
             const summaryContext = lastAck === undefined
@@ -2311,7 +2313,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 return {
                     stage: "generate",
                     ...generateSummaryData,
-                    error: (0, internal_7.wrapError)(error, (msg) => new internal_7.LoggingError(msg)),
+                    error: (0, internal_7.wrapError)(error, (msg) => new index_js_3.RetriableSummaryError(msg)),
                 };
             }
             const parent = summaryContext.ackHandle;
@@ -2332,7 +2334,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 return {
                     stage: "upload",
                     ...uploadData,
-                    error: new internal_7.LoggingError(continueResult.error),
+                    error: new index_js_3.RetriableSummaryError(continueResult.error),
                 };
             }
             let clientSequenceNumber;
@@ -2343,7 +2345,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 return {
                     stage: "upload",
                     ...uploadData,
-                    error: (0, internal_7.wrapError)(error, (msg) => new internal_7.LoggingError(msg)),
+                    error: (0, internal_7.wrapError)(error, (msg) => new index_js_3.RetriableSummaryError(msg)),
                 };
             }
             const submitData = {
@@ -2359,7 +2361,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 return {
                     stage: "upload",
                     ...uploadData,
-                    error: (0, internal_7.wrapError)(error, (msg) => new internal_7.LoggingError(msg)),
+                    error: (0, internal_7.wrapError)(error, (msg) => new index_js_3.RetriableSummaryError(msg)),
                 };
             }
             return submitData;
@@ -2449,13 +2451,13 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         this.verifyNotClosed();
         return this.blobManager.createBlob(blob, signal);
     }
-    submitIdAllocationOpIfNeeded(resubmitOutstandingRanges = false) {
+    submitIdAllocationOpIfNeeded(resubmitOutstandingRanges) {
         if (this._idCompressor) {
             const idRange = resubmitOutstandingRanges
-                ? this.idCompressor?.takeUnfinalizedCreationRange()
+                ? this._idCompressor.takeUnfinalizedCreationRange()
                 : this._idCompressor.takeNextCreationRange();
             // Don't include the idRange if there weren't any Ids allocated
-            if (idRange?.ids !== undefined) {
+            if (idRange.ids !== undefined) {
                 const idAllocationMessage = {
                     type: messageTypes_js_1.ContainerMessageType.IdAllocation,
                     contents: idRange,
@@ -2484,6 +2486,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             });
         }
         const type = containerRuntimeMessage.type;
+        (0, internal_2.assert)(type !== messageTypes_js_1.ContainerMessageType.IdAllocation, 0x9a5 /* IdAllocation should be submitted directly to outbox. */);
         const message = {
             contents: serializedContent,
             metadata,
@@ -2491,44 +2494,35 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             referenceSequenceNumber: this.deltaManager.lastSequenceNumber,
         };
         try {
-            // If `message` is an allocation op, then we are in the resubmit path and we must redirect the allocation
-            // op into the correct batch to avoid ranges being finalized out of order.
-            // Otherwise, submit an IdAllocation op if any IDs have been generated since the last op was submitted, as
-            // any of the other op types may contain those IDs and thus depend on the allocation op being sent first.
-            if (type === messageTypes_js_1.ContainerMessageType.IdAllocation) {
-                this.outbox.submitIdAllocation(message);
+            this.submitIdAllocationOpIfNeeded(false);
+            // Allow document schema controller to send a message if it needs to propose change in document schema.
+            // If it needs to send a message, it will call provided callback with payload of such message and rely
+            // on this callback to do actual sending.
+            const contents = this.documentsSchemaController.maybeSendSchemaMessage();
+            if (contents) {
+                this.logger.sendTelemetryEvent({
+                    eventName: "SchemaChangeProposal",
+                    refSeq: contents.refSeq,
+                    version: contents.version,
+                    newRuntimeSchema: JSON.stringify(contents.runtime),
+                    sessionRuntimeSchema: JSON.stringify(this.sessionSchema),
+                    oldRuntimeSchema: JSON.stringify(this.metadata?.documentSchema?.runtime),
+                });
+                const msg = {
+                    type: messageTypes_js_1.ContainerMessageType.DocumentSchemaChange,
+                    contents,
+                };
+                this.outbox.submit({
+                    contents: JSON.stringify(msg),
+                    referenceSequenceNumber: this.deltaManager.lastSequenceNumber,
+                });
+            }
+            if (type === messageTypes_js_1.ContainerMessageType.BlobAttach) {
+                // BlobAttach ops must have their metadata visible and cannot be grouped (see opGroupingManager.ts)
+                this.outbox.submitBlobAttach(message);
             }
             else {
-                this.submitIdAllocationOpIfNeeded();
-                // Allow document schema controller to send a message if it needs to propose change in document schema.
-                // If it needs to send a message, it will call provided callback with payload of such message and rely
-                // on this callback to do actual sending.
-                const contents = this.documentsSchemaController.maybeSendSchemaMessage();
-                if (contents) {
-                    this.logger.sendTelemetryEvent({
-                        eventName: "SchemaChangeProposal",
-                        refSeq: contents.refSeq,
-                        version: contents.version,
-                        newRuntimeSchema: JSON.stringify(contents.runtime),
-                        sessionRuntimeSchema: JSON.stringify(this.sessionSchema),
-                        oldRuntimeSchema: JSON.stringify(this.metadata?.documentSchema?.runtime),
-                    });
-                    const msg = {
-                        type: messageTypes_js_1.ContainerMessageType.DocumentSchemaChange,
-                        contents,
-                    };
-                    this.outbox.submit({
-                        contents: JSON.stringify(msg),
-                        referenceSequenceNumber: this.deltaManager.lastSequenceNumber,
-                    });
-                }
-                if (type === messageTypes_js_1.ContainerMessageType.BlobAttach) {
-                    // BlobAttach ops must have their metadata visible and cannot be grouped (see opGroupingManager.ts)
-                    this.outbox.submitBlobAttach(message);
-                }
-                else {
-                    this.outbox.submit(message);
-                }
+                this.outbox.submit(message);
             }
             if (!this.currentlyBatching()) {
                 this.flush();
@@ -2586,7 +2580,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         // back-compat: ADO #1385: Make this call unconditional in the future
         return this.submitSummaryFn !== undefined
             ? this.submitSummaryFn(contents, referenceSequenceNumber)
-            : this.submitFn(protocol_definitions_1.MessageType.Summarize, contents, false);
+            : this.submitFn(internal_3.MessageType.Summarize, contents, false);
     }
     /**
      * Throw an error if the runtime is closed.  Methods that are expected to potentially
@@ -2703,51 +2697,23 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
          * and then close as the current main client is likely to be re-elected as the parent summarizer again.
          */
         if (!result.isSummaryTracked && result.isSummaryNewer) {
-            await this.fetchLatestSnapshotFromStorage(summaryLogger, {
+            await this.fetchLatestSnapshotAndClose(summaryLogger, {
                 eventName: "RefreshLatestSummaryAckFetch",
                 ackHandle,
                 targetSequenceNumber: summaryRefSeq,
             }, readAndParseBlob);
-            await this.closeStaleSummarizer();
             return;
         }
         // Notify the garbage collector so it can update its latest summary state.
         await this.garbageCollector.refreshLatestSummary(result);
     }
     /**
-     * Fetches the latest snapshot from storage to refresh the cache as a performance optimization and closes the
-     * summarizer to reload from new state.
-     * @param summaryLogger - logger to use when fetching snapshot from storage
-     * @returns a generic summarization error
+     * Fetches the latest snapshot from storage and closes the container. This is done in cases where
+     * the last known snapshot is older than the latest one. This will ensure that the latest snapshot
+     * is downloaded and we don't end up loading snapshot from cache.
      */
-    async prefetchLatestSummaryThenClose(summaryLogger) {
-        const readAndParseBlob = async (id) => (0, internal_4.readAndParse)(this.storage, id);
-        // This is a performance optimization as the same parent is likely to be elected again, and would use its
-        // cache to fetch the snapshot instead of the network.
-        await this.fetchLatestSnapshotFromStorage(summaryLogger, {
-            eventName: "RefreshLatestSummaryFromServerFetch",
-        }, readAndParseBlob);
-        await this.closeStaleSummarizer();
-        return {
-            stage: "base",
-            error: new internal_7.LoggingError("summary state stale - Unsupported option 'refreshLatestAck'"),
-            referenceSequenceNumber: this.deltaManager.lastSequenceNumber,
-            minimumSequenceNumber: this.deltaManager.minimumSequenceNumber,
-        };
-    }
-    async closeStaleSummarizer() {
-        // Delay before restarting summarizer to prevent the summarizer from restarting too frequently.
-        await (0, internal_2.delay)(this.closeSummarizerDelayMs);
-        this._summarizer?.stop("latestSummaryStateStale");
-        this.disposeFn();
-    }
-    /**
-     * Downloads the latest snapshot from storage.
-     * By default, it also closes the container after downloading the snapshot. However, this may be
-     * overridden via options.
-     */
-    async fetchLatestSnapshotFromStorage(logger, event, readAndParseBlob) {
-        return internal_7.PerformanceEvent.timedExecAsync(logger, event, async (perfEvent) => {
+    async fetchLatestSnapshotAndClose(logger, event, readAndParseBlob) {
+        await internal_7.PerformanceEvent.timedExecAsync(logger, event, async (perfEvent) => {
             const stats = {};
             const trace = client_utils_1.Trace.start();
             const versions = await this.storage.getVersions(null, 1, "prefetchLatestSummaryBeforeClose", internal_3.FetchSource.noCache);
@@ -2760,12 +2726,10 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             stats.snapshotRefSeq = latestSnapshotRefSeq;
             stats.snapshotVersion = versions[0].id;
             perfEvent.end(stats);
-            return {
-                snapshotTree: maybeSnapshot,
-                versionId: versions[0].id,
-                latestSnapshotRefSeq,
-            };
         });
+        await (0, internal_2.delay)(this.closeSummarizerDelayMs);
+        this._summarizer?.stop("latestSummaryStateStale");
+        this.disposeFn();
     }
     getPendingLocalState(props) {
         this.verifyNotClosed();