@fluidframework/container-runtime 2.0.0-internal.4.2.1 → 2.0.0-internal.4.4.0

package/dist/containerRuntime.js

@@ -924,8 +924,14 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         }
         return this.consecutiveReconnects < this.maxConsecutiveReconnects;
     }
-    resetReconnectCount() {
-        this.consecutiveReconnects = 0;
+    resetReconnectCount(message) {
+        // Chunked ops don't count towards making progress as they are sent
+        // in their own batches before the originating batch is sent.
+        // Therefore, receiving them while attempting to send the originating batch
+        // does not mean that the container is making any progress.
+        if ((message === null || message === void 0 ? void 0 : message.type) !== ContainerMessageType.ChunkedOp) {
+            this.consecutiveReconnects = 0;
+        }
     }
     replayPendingStates() {
         // We need to be able to send ops to replay states
@@ -967,15 +973,15 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         const { IdCompressor } = await Promise.resolve().then(() => __importStar(require("./id-compressor")));
         this.idCompressor = IdCompressor.deserialize(op.stashedState);
     }
-    async applyStashedOp(type, op) {
+    async applyStashedOp(type, contents) {
         switch (type) {
             case ContainerMessageType.FluidDataStoreOp:
-                return this.dataStores.applyStashedOp(op);
+                return this.dataStores.applyStashedOp(contents);
             case ContainerMessageType.Attach:
-                return this.dataStores.applyStashedAttachOp(op);
+                return this.dataStores.applyStashedAttachOp(contents);
             case ContainerMessageType.IdAllocation:
                 (0, common_utils_1.assert)(this.idCompressor !== undefined, 0x67b /* IdCompressor should be defined if enabled */);
-                return this.applyStashedIdAllocationOp(op);
+                return this.applyStashedIdAllocationOp(contents);
             case ContainerMessageType.Alias:
             case ContainerMessageType.BlobAttach:
                 return;
@@ -1126,7 +1132,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 // If we have processed a local op, this means that the container is
                 // making progress and we can reset the counter for how many times
                 // we have consecutively replayed the pending states
-                this.resetReconnectCount();
+                this.resetReconnectCount(message);
             }
         }
         catch (e) {
@@ -1586,7 +1592,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
      * @param options - options controlling how the summary is generated or submitted
      */
     async submitSummary(options) {
-        var _a, _b;
+        var _a, _b, _c;
         const { fullTree = false, refreshLatestAck, summaryLogger } = 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.
@@ -1604,12 +1610,13 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             await this.waitForDeltaManagerToCatchup(latestSnapshotRefSeq, summaryNumberLogger);
         }
         const shouldPauseInboundSignal = this.mc.config.getBoolean("Fluid.ContainerRuntime.SubmitSummary.disableInboundSignalPause") !== true;
+        let summaryRefSeqNum;
         try {
             await this.deltaManager.inbound.pause();
             if (shouldPauseInboundSignal) {
                 await this.deltaManager.inboundSignal.pause();
             }
-            const summaryRefSeqNum = this.deltaManager.lastSequenceNumber;
+            summaryRefSeqNum = this.deltaManager.lastSequenceNumber;
             const minimumSequenceNumber = this.deltaManager.minimumSequenceNumber;
             const message = `Summary @${summaryRefSeqNum}:${this.deltaManager.minimumSequenceNumber}`;
             const lastAck = this.summaryCollection.latestAck;
@@ -1690,7 +1697,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             const gcSummaryTreeStats = summaryTree.tree[runtime_definitions_1.gcTreeKey]
                 ? (0, runtime_utils_1.calculateStats)(summaryTree.tree[runtime_definitions_1.gcTreeKey])
                 : undefined;
-            const summaryStats = Object.assign({ dataStoreCount: this.dataStores.size, summarizedDataStoreCount: this.dataStores.size - handleCount, gcStateUpdatedDataStoreCount: (_a = summarizeResult.gcStats) === null || _a === void 0 ? void 0 : _a.updatedDataStoreCount, gcBlobNodeCount: gcSummaryTreeStats === null || gcSummaryTreeStats === void 0 ? void 0 : gcSummaryTreeStats.blobNodeCount, gcTotalBlobsSize: gcSummaryTreeStats === null || gcSummaryTreeStats === void 0 ? void 0 : gcSummaryTreeStats.totalBlobSize, summaryNumber }, partialStats);
+            const summaryStats = Object.assign({ dataStoreCount: this.dataStores.size, summarizedDataStoreCount: this.dataStores.size - handleCount, gcStateUpdatedDataStoreCount: this.garbageCollector.updatedDSCountSinceLastSummary, gcBlobNodeCount: gcSummaryTreeStats === null || gcSummaryTreeStats === void 0 ? void 0 : gcSummaryTreeStats.blobNodeCount, gcTotalBlobsSize: gcSummaryTreeStats === null || gcSummaryTreeStats === void 0 ? void 0 : gcSummaryTreeStats.totalBlobSize, summaryNumber }, partialStats);
             const generateSummaryData = {
                 referenceSequenceNumber: summaryRefSeqNum,
                 minimumSequenceNumber,
@@ -1720,7 +1727,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             else if (lastAck === undefined) {
                 summaryContext = {
                     proposalHandle: undefined,
-                    ackHandle: (_b = this.context.getLoadedFromVersion()) === null || _b === void 0 ? void 0 : _b.id,
+                    ackHandle: (_a = this.context.getLoadedFromVersion()) === null || _a === void 0 ? void 0 : _a.id,
                     referenceSequenceNumber: summaryRefSeqNum,
                 };
             }
@@ -1765,6 +1772,8 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         finally {
             // Cleanup wip summary in case of failure
             this.summarizerNode.clearSummary();
+            // ! This needs to happen before we resume inbound queues to ensure heuristics are tracked correctly
+            (_c = (_b = this._summarizer) === null || _b === void 0 ? void 0 : _b.recordSummaryAttempt) === null || _c === void 0 ? void 0 : _c.call(_b, summaryRefSeqNum);
             // Restart the delta manager
             this.deltaManager.inbound.resume();
             if (shouldPauseInboundSignal) {