@fluidframework/container-runtime 2.0.0-internal.7.2.2 → 2.0.0-internal.7.4.0

package/dist/containerRuntime.js

@@ -62,14 +62,8 @@ function compatBehaviorAllowsMessageType(_unknownContainerRuntimeMessageType, co
     // undefined defaults to same behavior as "FailToProcess"
     return compatBehavior === "Ignore";
 }
-function prepareLocalContainerRuntimeIdAllocationMessageForTransit(message) {
-    // Remove the stashedState from the op if it's a stashed op
-    if ("stashedState" in message.contents) {
-        delete message.contents.stashedState;
-    }
-}
 /**
- * @public
+ * @internal
  */
 exports.DefaultSummaryConfiguration = {
     state: "enabled",
@@ -87,7 +81,7 @@ exports.DefaultSummaryConfiguration = {
 };
 /**
  * Accepted header keys for requests coming to the runtime.
- * @public
+ * @internal
  */
 var RuntimeHeaders;
 (function (RuntimeHeaders) {
@@ -97,22 +91,22 @@ var RuntimeHeaders;
     RuntimeHeaders["viaHandle"] = "viaHandle";
 })(RuntimeHeaders || (exports.RuntimeHeaders = RuntimeHeaders = {}));
 /** True if a tombstoned object should be returned without erroring
- * @public
+ * @internal
  */
 exports.AllowTombstoneRequestHeaderKey = "allowTombstone"; // Belongs in the enum above, but avoiding the breaking change
 /**
  * [IRRELEVANT IF throwOnInactiveLoad OPTION NOT SET] True if an inactive object should be returned without erroring
- * @public
+ * @internal
  */
 exports.AllowInactiveRequestHeaderKey = "allowInactive"; // Belongs in the enum above, but avoiding the breaking change
 /**
  * Tombstone error responses will have this header set to true
- * @public
+ * @internal
  */
 exports.TombstoneResponseHeaderKey = "isTombstoned";
 /**
  * Inactive error responses will have this header set to true
- * @public
+ * @internal
  */
 exports.InactiveResponseHeaderKey = "isInactive";
 /** Default values for Runtime Headers */
@@ -124,7 +118,7 @@ exports.defaultRuntimeHeaderData = {
 };
 /**
  * Available compression algorithms for op compression.
- * @public
+ * @alpha
  */
 var CompressionAlgorithms;
 (function (CompressionAlgorithms) {
@@ -155,7 +149,7 @@ exports.defaultPendingOpsRetryDelayMs = 1000;
 const defaultCloseSummarizerDelayMs = 5000; // 5 seconds
 /**
  * @deprecated use ContainerRuntimeMessageType instead
- * @public
+ * @internal
  */
 var RuntimeMessage;
 (function (RuntimeMessage) {
@@ -169,7 +163,7 @@ var RuntimeMessage;
 })(RuntimeMessage || (exports.RuntimeMessage = RuntimeMessage = {}));
 /**
  * @deprecated please use version in driver-utils
- * @public
+ * @internal
  */
 function isRuntimeMessage(message) {
     return Object.values(RuntimeMessage).includes(message.type);
@@ -179,7 +173,7 @@ exports.isRuntimeMessage = isRuntimeMessage;
  * Legacy ID for the built-in AgentScheduler.  To minimize disruption while removing it, retaining this as a
  * special-case for document dirty state.  Ultimately we should have no special-cases from the
  * ContainerRuntime's perspective.
- * @public
+ * @internal
  */
 exports.agentSchedulerId = "_scheduler";
 // safely check navigator and get the hardware spec value
@@ -258,7 +252,7 @@ exports.TEST_requestSummarizer = TEST_requestSummarizer;
 /**
  * Represents the runtime of the container. Contains helper functions/state of the container.
  * It will define the store level mappings.
- * @public
+ * @alpha
  */
 class ContainerRuntime extends client_utils_1.TypedEventEmitter {
     /**
@@ -375,11 +369,17 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         const idCompressorEnabled = metadata?.idCompressorEnabled ?? runtimeOptions.enableRuntimeIdCompressor ?? false;
         let idCompressor;
         if (idCompressorEnabled) {
-            const { IdCompressor, createSessionId } = await Promise.resolve().then(() => __importStar(require("./id-compressor")));
-            idCompressor =
-                serializedIdCompressor !== undefined
-                    ? IdCompressor.deserialize(serializedIdCompressor, createSessionId())
-                    : IdCompressor.create(logger);
+            const { createIdCompressor, deserializeIdCompressor, createSessionId } = await Promise.resolve().then(() => __importStar(require("@fluidframework/id-compressor")));
+            const pendingLocalState = context.pendingLocalState;
+            if (pendingLocalState?.pendingIdCompressorState !== undefined) {
+                idCompressor = deserializeIdCompressor(pendingLocalState.pendingIdCompressorState);
+            }
+            else if (serializedIdCompressor !== undefined) {
+                idCompressor = deserializeIdCompressor(serializedIdCompressor, createSessionId());
+            }
+            else {
+                idCompressor = createIdCompressor(logger);
+            }
         }
         const runtime = new containerRuntimeCtor(context, registry, metadata, electedSummarizerData, chunks ?? [], aliases ?? [], {
             summaryOptions,
@@ -481,9 +481,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
     get gcThrowOnTombstoneUsage() {
         return this.garbageCollector.throwOnTombstoneUsage;
     }
-    /**
-     * @internal
-     */
+    /***/
     constructor(context, registry, metadata, electedSummarizerData, chunks, dataStoreAliasMap, runtimeOptions, containerScope, logger, existing, blobManagerSnapshot, _storage, idCompressor, provideEntryPoint, requestHandler, summaryConfiguration = {
         // the defaults
         ...exports.DefaultSummaryConfiguration,
@@ -498,6 +496,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         this._storage = _storage;
         this.requestHandler = requestHandler;
         this.summaryConfiguration = summaryConfiguration;
+        this.imminentClosure = false;
         this.defaultMaxConsecutiveReconnects = 7;
         this._orderSequentiallyCalls = 0;
         this.flushTaskExists = false;
@@ -589,7 +588,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             eventName: "GCFeatureMatrix",
             metadataValue: JSON.stringify(metadata?.gcFeatureMatrix),
             inputs: JSON.stringify({
-                gcOptions_gcTombstoneGeneration: this.runtimeOptions.gcOptions[gc_1.gcTombstoneGenerationOptionName],
+                gcOptions_gcGeneration: this.runtimeOptions.gcOptions[gc_1.gcGenerationOptionName],
             }),
         });
         this.telemetryDocumentId = metadata?.telemetryDocumentId ?? (0, uuid_1.v4)();
@@ -655,6 +654,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             // GC runs in summarizer client and needs access to the real (non-proxy) active information. The proxy
             // delta manager would always return false for summarizer client.
             activeConnection: () => this.innerDeltaManager.active,
+            submitMessage: (message) => this.submit(message),
         });
         const loadedFromSequenceNumber = this.deltaManager.initialSequenceNumber;
         this.summarizerNode = (0, summary_1.createRootSummarizerNodeWithGC)((0, telemetry_utils_1.createChildLogger)({ logger: this.logger, namespace: "SummarizerNode" }), 
@@ -1078,19 +1078,6 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         // Officially transition from the old state to the new state.
         this.updateDocumentDirtyState(newState);
     }
-    /**
-     * Updates the runtime's IdCompressor with the stashed state present in the given op. This is a bit of a
-     * hack and is unnecessarily expensive. As it stands, every locally stashed op (all ops that get stored in
-     * the PendingStateManager) will store their serialized representation locally until ack'd. Upon receiving
-     * this stashed state, the IdCompressor blindly deserializes to the stashed state and assumes the session.
-     * Technically only the last stashed state is needed to do this correctly, but we would have to write some
-     * more hacky code to modify the batch before it gets sent out.
-     * @param content - An IdAllocationOp with "stashedState", which is a representation of un-ack'd local state.
-     */
-    async applyStashedIdAllocationOp(op) {
-        const { IdCompressor } = await Promise.resolve().then(() => __importStar(require("./id-compressor")));
-        this.idCompressor = IdCompressor.deserialize(op.stashedState);
-    }
     /**
      * Parse an op's type and actual content from given serialized content
      * ! Note: this format needs to be in-line with what is set in the "ContainerRuntime.submit(...)" method
@@ -1112,7 +1099,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 return this.dataStores.applyStashedAttachOp(opContents.contents);
             case messageTypes_1.ContainerMessageType.IdAllocation:
                 (0, core_utils_1.assert)(this.idCompressor !== undefined, 0x67b /* IdCompressor should be defined if enabled */);
-                return this.applyStashedIdAllocationOp(opContents.contents);
+                return;
             case messageTypes_1.ContainerMessageType.Alias:
             case messageTypes_1.ContainerMessageType.BlobAttach:
                 return;
@@ -1120,6 +1107,9 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 throw new Error("chunkedOp not expected here");
             case messageTypes_1.ContainerMessageType.Rejoin:
                 throw new Error("rejoin not expected here");
+            case messageTypes_1.ContainerMessageType.GC:
+                // GC op is only sent in summarizer which should never have stashed ops.
+                throw new telemetry_utils_1.LoggingError("GC op not expected to be stashed in summarizer");
             default: {
                 // This should be extremely rare for stashed ops.
                 // It would require a newer runtime stashing ops and then an older one applying them,
@@ -1298,7 +1288,14 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 break;
             case messageTypes_1.ContainerMessageType.IdAllocation:
                 (0, core_utils_1.assert)(this.idCompressor !== undefined, 0x67c /* IdCompressor should be defined if enabled */);
-                this.idCompressor.finalizeCreationRange(messageWithContext.message.contents);
+                // Don't re-finalize the range if we're processing a "savedOp" in
+                // stashed ops flow. The compressor is stashed with these ops already processed.
+                if (messageWithContext.message.metadata?.savedOp !== true) {
+                    this.idCompressor.finalizeCreationRange(messageWithContext.message.contents);
+                }
+                break;
+            case messageTypes_1.ContainerMessageType.GC:
+                this.garbageCollector.processMessage(messageWithContext.message, local);
                 break;
             case messageTypes_1.ContainerMessageType.ChunkedOp:
             case messageTypes_1.ContainerMessageType.Rejoin:
@@ -1489,7 +1486,6 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
     }
     /**
      * @deprecated 0.16 Issue #1537, #3631
-     * @internal
      */
     async _createDataStoreWithProps(pkg, props, id = (0, uuid_1.v4)()) {
         return (0, dataStore_1.channelToDataStore)(await this.dataStores
@@ -1499,7 +1495,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
     canSendOps() {
         // Note that the real (non-proxy) delta manager is needed here to get the readonly info. This is because
         // container runtime's ability to send ops depend on the actual readonly state of the delta manager.
-        return this.connected && !this.innerDeltaManager.readOnlyInfo.readonly;
+        return (this.connected && !this.innerDeltaManager.readOnlyInfo.readonly && !this.imminentClosure);
     }
     /**
      * Are we in the middle of batching ops together?
@@ -1521,19 +1517,28 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         return this.dirtyContainer;
     }
     isContainerMessageDirtyable({ type, contents }) {
-        // For legacy purposes, exclude the old built-in AgentScheduler from dirty consideration as a special-case.
-        // Ultimately we should have no special-cases from the ContainerRuntime's perspective.
-        if (type === messageTypes_1.ContainerMessageType.Attach) {
-            const attachMessage = contents;
-            if (attachMessage.id === exports.agentSchedulerId) {
-                return false;
+        // Certain container runtime messages should not mark the container dirty such as the old built-in
+        // AgentScheduler and Garbage collector messages.
+        switch (type) {
+            case messageTypes_1.ContainerMessageType.Attach: {
+                const attachMessage = contents;
+                if (attachMessage.id === exports.agentSchedulerId) {
+                    return false;
+                }
+                break;
             }
-        }
-        else if (type === messageTypes_1.ContainerMessageType.FluidDataStoreOp) {
-            const envelope = contents;
-            if (envelope.address === exports.agentSchedulerId) {
+            case messageTypes_1.ContainerMessageType.FluidDataStoreOp: {
+                const envelope = contents;
+                if (envelope.address === exports.agentSchedulerId) {
+                    return false;
+                }
+                break;
+            }
+            case messageTypes_1.ContainerMessageType.GC: {
                 return false;
             }
+            default:
+                break;
         }
         return true;
     }
@@ -1824,10 +1829,10 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 properties: { all: { safeSummary: true } },
             }));
         }
-        // If 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.
-        if (this.validateSummaryBeforeUpload && this.hasPendingMessages()) {
+        // 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.
+        if (this.validateSummaryBeforeUpload && this.isDirty) {
             const countBefore = this.pendingMessagesCount;
             // The timeout for waiting for pending ops can be overridden via configurations.
             const pendingOpsTimeout = this.mc.config.getNumber("Fluid.Summarizer.waitForPendingOpsTimeoutMs") ??
@@ -1847,7 +1852,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             // happens, whether we attempted to wait for these ops to be acked and what was the result.
             summaryNumberLogger.sendTelemetryEvent({
                 eventName: "PendingOpsWhileSummarizing",
-                saved: this.hasPendingMessages() ? false : true,
+                saved: !this.isDirty,
                 timeout: pendingOpsTimeout,
                 countBefore,
                 countAfter: this.pendingMessagesCount,
@@ -2072,7 +2077,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         }
     }
     /**
-     * This helper is called during summarization. If there are pending ops, it will return a failed summarize result
+     * This helper is called during summarization. If the container is dirty, it will return a failed summarize result
      * (IBaseSummarizeResult) unless this is the final summarize attempt and SkipFailingIncorrectSummary option is set.
      * @param logger - The logger to be used for sending telemetry.
      * @param referenceSequenceNumber - The reference sequence number of the summary attempt.
@@ -2082,7 +2087,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
      * @returns failed summarize result (IBaseSummarizeResult) if summary should be failed, undefined otherwise.
      */
     async shouldFailSummaryOnPendingOps(logger, referenceSequenceNumber, minimumSequenceNumber, finalAttempt, beforeSummaryGeneration) {
-        if (!this.hasPendingMessages()) {
+        if (!this.isDirty) {
             return;
         }
         // If "SkipFailingIncorrectSummary" option is true, don't fail the summary in the last attempt.
@@ -2174,12 +2179,12 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                     contents: JSON.stringify(idAllocationMessage),
                     referenceSequenceNumber: this.deltaManager.lastSequenceNumber,
                     metadata: undefined,
-                    localOpMetadata: this.idCompressor?.serialize(true),
+                    localOpMetadata: undefined,
                     type: messageTypes_1.ContainerMessageType.IdAllocation,
                 };
             }
             if (idAllocationBatchMessage !== undefined) {
-                this.outbox.submit(idAllocationBatchMessage);
+                this.outbox.submitIdAllocation(idAllocationBatchMessage);
             }
         }
     }
@@ -2352,6 +2357,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
     /**
      * Finds the right store and asks it to resubmit the message. This typically happens when we
      * reconnect and there are pending messages.
+     * ! Note: successfully resubmitting an op that has been successfully sequenced is not possible due to checks in the ConnectionStateHandler (Loader layer)
      * @param message - The original LocalContainerRuntimeMessage.
      * @param localOpMetadata - The local metadata associated with the original message.
      */
@@ -2364,10 +2370,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 break;
             case messageTypes_1.ContainerMessageType.Attach:
             case messageTypes_1.ContainerMessageType.Alias:
-                this.submit(message, localOpMetadata);
-                break;
             case messageTypes_1.ContainerMessageType.IdAllocation: {
-                prepareLocalContainerRuntimeIdAllocationMessageForTransit(message);
                 this.submit(message, localOpMetadata);
                 break;
             }
@@ -2379,6 +2382,9 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             case messageTypes_1.ContainerMessageType.Rejoin:
                 this.submit(message);
                 break;
+            case messageTypes_1.ContainerMessageType.GC:
+                // GC op is only sent in summarizer which should never reconnect.
+                throw new telemetry_utils_1.LoggingError("GC op not expected to be resubmitted in summarizer");
             default: {
                 // This case should be very rare - it would imply an op was stashed from a
                 // future version of runtime code and now is being applied on an older version
@@ -2520,7 +2526,11 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             notifyImminentClosure: props?.notifyImminentClosure,
         }, async (event) => {
             this.verifyNotClosed();
-            const waitBlobsToAttach = props?.notifyImminentClosure;
+            // in case imminentClosure is set to true by future code, we don't
+            // try to change its value
+            if (!this.imminentClosure) {
+                this.imminentClosure = props?.notifyImminentClosure ?? this.imminentClosure;
+            }
             const stopBlobAttachingSignal = props?.stopBlobAttachingSignal;
             if (this._orderSequentiallyCalls !== 0) {
                 throw new telemetry_utils_1.UsageError("can't get state during orderSequentially");
@@ -2529,16 +2539,18 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             // getPendingLocalState() is only exposed through Container.closeAndGetPendingLocalState(), so it's safe
             // to close current batch.
             this.flush();
-            const pendingAttachmentBlobs = waitBlobsToAttach
+            const pendingAttachmentBlobs = this.imminentClosure
                 ? await this.blobManager.attachAndGetPendingBlobs(stopBlobAttachingSignal)
                 : undefined;
             const pending = this.pendingStateManager.getLocalState();
             if (!pendingAttachmentBlobs && !this.hasPendingMessages()) {
                 return; // no pending state to save
             }
+            const pendingIdCompressorState = this.idCompressor?.serialize(true);
             const pendingState = {
                 pending,
                 pendingAttachmentBlobs,
+                pendingIdCompressorState,
             };
             event.end({
                 attachmentBlobsSize: Object.keys(pendingAttachmentBlobs ?? {}).length,