@fluidframework/container-runtime 2.0.0-dev.3.1.0.125672 → 2.0.0-dev.4.2.0.153917

package/lib/{runWhileConnectedCoordinator.d.ts → summary/runWhileConnectedCoordinator.d.ts}

@@ -18,6 +18,7 @@ export declare const neverCancelledSummaryToken: ISummaryCancellationToken;
  */
 export declare class RunWhileConnectedCoordinator implements ICancellableSummarizerController {
     private readonly runtime;
+    private readonly active;
     private _cancelled;
     private readonly stopDeferred;
     get cancelled(): boolean;
@@ -25,8 +26,8 @@ export declare class RunWhileConnectedCoordinator implements ICancellableSummari
      * Returns a promise that resolves once stopped either externally or by disconnect.
      */
     get waitCancelled(): Promise<SummarizerStopReason>;
-    static create(runtime: IConnectableRuntime): Promise<RunWhileConnectedCoordinator>;
-    protected constructor(runtime: IConnectableRuntime);
+    static create(runtime: IConnectableRuntime, active: () => boolean): Promise<RunWhileConnectedCoordinator>;
+    protected constructor(runtime: IConnectableRuntime, active: () => boolean);
     /**
      * Starts and waits for a promise which resolves when connected.
      * The promise will also resolve if stopped either externally or by disconnect.

package/lib/summary/runWhileConnectedCoordinator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runWhileConnectedCoordinator.d.ts","sourceRoot":"","sources":["../../src/summary/runWhileConnectedCoordinator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACN,oBAAoB,EACpB,mBAAmB,EACnB,yBAAyB,EACzB,MAAM,mBAAmB,CAAC;AAG3B,MAAM,WAAW,gCAAiC,SAAQ,yBAAyB;IAClF,IAAI,CAAC,MAAM,EAAE,oBAAoB,GAAG,IAAI,CAAC;CACzC;AAED;;;GAGG;AACH,eAAO,MAAM,0BAA0B,EAAE,yBAGxC,CAAC;AAEF;;;;GAIG;AACH,qBAAa,4BAA6B,YAAW,gCAAgC;IAsCnF,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAtCxB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAwC;IAErE,IAAW,SAAS,YAkBnB;IAED;;OAEG;IACH,IAAW,aAAa,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAExD;WAEmB,MAAM,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,OAAO;IAM9E,SAAS,aACS,OAAO,EAAE,mBAAmB,EAC5B,MAAM,EAAE,MAAM,OAAO;IAGvC;;;;;;;;;;;;OAYG;cACa,SAAS;IAiBzB;;OAEG;IACI,IAAI,CAAC,MAAM,EAAE,oBAAoB,GAAG,IAAI;CAM/C"}

package/lib/{runWhileConnectedCoordinator.js → summary/runWhileConnectedCoordinator.js}

@@ -17,14 +17,15 @@ export const neverCancelledSummaryToken = {
  * when disconnected or if stop() is called.
  */
 export class RunWhileConnectedCoordinator {
-    constructor(runtime) {
+    constructor(runtime, active) {
         this.runtime = runtime;
+        this.active = active;
         this._cancelled = false;
         this.stopDeferred = new Deferred();
     }
     get cancelled() {
         if (!this._cancelled) {
-            assert(this.runtime.deltaManager.active, 0x25d /* "We should never connect as 'read'" */);
+            assert(this.active(), 0x25d /* "We should never connect as 'read'" */);
             // This check can't be enabled in current design due to lastSummary flow, where
             // summarizer for closed container stays around and can produce one more summary.
             // Currently we solve the problem of overlapping summarizer by doing wait in
@@ -45,8 +46,8 @@ export class RunWhileConnectedCoordinator {
     get waitCancelled() {
         return this.stopDeferred.promise;
     }
-    static async create(runtime) {
-        const obj = new RunWhileConnectedCoordinator(runtime);
+    static async create(runtime, active) {
+        const obj = new RunWhileConnectedCoordinator(runtime, active);
         await obj.waitStart();
         return obj;
     }

package/lib/summary/runWhileConnectedCoordinator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runWhileConnectedCoordinator.js","sourceRoot":"","sources":["../../src/summary/runWhileConnectedCoordinator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAYhE;;;GAGG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAA8B;IACpE,SAAS,EAAE,KAAK;IAChB,aAAa,EAAE,IAAI,OAAO,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;CACpC,CAAC;AAEF;;;;GAIG;AACH,MAAM,OAAO,4BAA4B;IAqCxC,YACkB,OAA4B,EAC5B,MAAqB;QADrB,YAAO,GAAP,OAAO,CAAqB;QAC5B,WAAM,GAAN,MAAM,CAAe;QAtC/B,eAAU,GAAG,KAAK,CAAC;QACV,iBAAY,GAAG,IAAI,QAAQ,EAAwB,CAAC;IAsClE,CAAC;IApCJ,IAAW,SAAS;QACnB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACrB,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,yCAAyC,CAAC,CAAC;YAEvE,+EAA+E;YAC/E,iFAAiF;YACjF,4EAA4E;YAC5E,oCAAoC;YACpC,6CAA6C;YAC7C,mGAAmG;YACnG,yBAAyB;YACzB,oFAAoF;YACpF,EAAE;YACF,wEAAwE;YACxE,uFAAuF;SACvF;QAED,OAAO,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;IAED;;OAEG;IACH,IAAW,aAAa;QACvB,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;IAClC,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAA4B,EAAE,MAAqB;QAC7E,MAAM,GAAG,GAAG,IAAI,4BAA4B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC9D,MAAM,GAAG,CAAC,SAAS,EAAE,CAAC;QACtB,OAAO,GAAG,CAAC;IACZ,CAAC;IAOD;;;;;;;;;;;;OAYG;IACO,KAAK,CAAC,SAAS;QACxB,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YAC1B,IAAI,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;YAC1C,OAAO;SACP;QAED,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC,CAAC;QAE9E,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YAC5B,MAAM,aAAa,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CACnD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CACvC,CAAC;YACF,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;SACxD;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC,CAAC;IACpF,CAAC;IAED;;OAEG;IACI,IAAI,CAAC,MAA4B;QACvC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACrB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YACvB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;SAClC;IACF,CAAC;CACD","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { assert, Deferred } from \"@fluidframework/common-utils\";\nimport {\n\tSummarizerStopReason,\n\tIConnectableRuntime,\n\tISummaryCancellationToken,\n} from \"./summarizerTypes\";\n\n/* Similar to AbortController, but using promise instead of events */\nexport interface ICancellableSummarizerController extends ISummaryCancellationToken {\n\tstop(reason: SummarizerStopReason): void;\n}\n\n/**\n * Can be useful in testing as well as in places where caller does not use cancellation.\n * This object implements ISummaryCancellationToken interface but cancellation is never leveraged.\n */\nexport const neverCancelledSummaryToken: ISummaryCancellationToken = {\n\tcancelled: false,\n\twaitCancelled: new Promise(() => {}),\n};\n\n/**\n * Helper class to coordinate something that needs to run only while connected.\n * This provides promises that resolve as it starts or stops.  Stopping happens\n * when disconnected or if stop() is called.\n */\nexport class RunWhileConnectedCoordinator implements ICancellableSummarizerController {\n\tprivate _cancelled = false;\n\tprivate readonly stopDeferred = new Deferred<SummarizerStopReason>();\n\n\tpublic get cancelled() {\n\t\tif (!this._cancelled) {\n\t\t\tassert(this.active(), 0x25d /* \"We should never connect as 'read'\" */);\n\n\t\t\t// This check can't be enabled in current design due to lastSummary flow, where\n\t\t\t// summarizer for closed container stays around and can produce one more summary.\n\t\t\t// Currently we solve the problem of overlapping summarizer by doing wait in\n\t\t\t// SummaryManager.createSummarizer()\n\t\t\t// Better solution would involve these steps:\n\t\t\t// 1. Summarizer selection logic should chose summarizing client (with clientType === \"summarizer\")\n\t\t\t// if such client exists.\n\t\t\t// 2. Summarizer should be updated about such changes (to update onBehalfOfClientId)\n\t\t\t//\n\t\t\t// assert(this.runtime.summarizerClientId === this.onBehalfOfClientId ||\n\t\t\t//    this.runtime.summarizerClientId === this.runtime.clientId, \"onBehalfOfClientId\");\n\t\t}\n\n\t\treturn this._cancelled;\n\t}\n\n\t/**\n\t * Returns a promise that resolves once stopped either externally or by disconnect.\n\t */\n\tpublic get waitCancelled(): Promise<SummarizerStopReason> {\n\t\treturn this.stopDeferred.promise;\n\t}\n\n\tpublic static async create(runtime: IConnectableRuntime, active: () => boolean) {\n\t\tconst obj = new RunWhileConnectedCoordinator(runtime, active);\n\t\tawait obj.waitStart();\n\t\treturn obj;\n\t}\n\n\tprotected constructor(\n\t\tprivate readonly runtime: IConnectableRuntime,\n\t\tprivate readonly active: () => boolean,\n\t) {}\n\n\t/**\n\t * Starts and waits for a promise which resolves when connected.\n\t * The promise will also resolve if stopped either externally or by disconnect.\n\t *\n\t * We only listen on disconnected event for clientType === \"summarizer\" container!\n\t * And only do it here - no other place should check it! That way we have only one place\n\t * that controls policy and it's easy to change policy in the future if we want to!\n\t * We do not listen for \"main\" (aka interactive) container disconnect here, as it's\n\t * responsibility of SummaryManager to decide if that's material or not. There are cases\n\t * like \"lastSummary\", or main client experiencing nacks / disconnects due to hitting limit\n\t * of non-summarized ops, where can make determination to continue with summary even if main\n\t * client is disconnected.\n\t */\n\tprotected async waitStart() {\n\t\tif (this.runtime.disposed) {\n\t\t\tthis.stop(\"summarizerClientDisconnected\");\n\t\t\treturn;\n\t\t}\n\n\t\tthis.runtime.once(\"dispose\", () => this.stop(\"summarizerClientDisconnected\"));\n\n\t\tif (!this.runtime.connected) {\n\t\t\tconst waitConnected = new Promise<void>((resolve) =>\n\t\t\t\tthis.runtime.once(\"connected\", resolve),\n\t\t\t);\n\t\t\tawait Promise.race([waitConnected, this.waitCancelled]);\n\t\t}\n\t\tthis.runtime.once(\"disconnected\", () => this.stop(\"summarizerClientDisconnected\"));\n\t}\n\n\t/**\n\t * Stops running.\n\t */\n\tpublic stop(reason: SummarizerStopReason): void {\n\t\tif (!this._cancelled) {\n\t\t\tthis._cancelled = true;\n\t\t\tthis.stopDeferred.resolve(reason);\n\t\t}\n\t}\n}\n"]}

package/{dist → lib/summary}/runningSummarizer.d.ts

@@ -4,8 +4,8 @@
  */
 import { IDisposable, ITelemetryLogger } from "@fluidframework/common-definitions";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
-import { ISummaryConfiguration } from "./containerRuntime";
-import { IEnqueueSummarizeOptions, ISummarizeHeuristicData, IOnDemandSummarizeOptions, EnqueueSummarizeResult, SummarizerStopReason, ISubmitSummaryOptions, SubmitSummaryResult, ISummaryCancellationToken, ISummarizeResults, ISummarizerRuntime } from "./summarizerTypes";
+import { ISummaryConfiguration } from "../containerRuntime";
+import { IEnqueueSummarizeOptions, ISummarizeHeuristicData, IOnDemandSummarizeOptions, EnqueueSummarizeResult, SummarizerStopReason, ISubmitSummaryOptions, SubmitSummaryResult, ISummaryCancellationToken, ISummarizeResults, ISummarizerRuntime, IRefreshSummaryAckOptions } from "./summarizerTypes";
 import { IClientSummaryWatcher, SummaryCollection } from "./summaryCollection";
 import { SummarizeResultBuilder } from "./summaryGenerator";
 /**
@@ -19,28 +19,40 @@ export declare class RunningSummarizer implements IDisposable {
     private readonly summaryWatcher;
     private readonly configuration;
     private readonly submitSummaryCallback;
+    private readonly refreshLatestSummaryAckCallback;
     private readonly heuristicData;
-    private readonly raiseSummarizingError;
     private readonly summaryCollection;
     private readonly cancellationToken;
     private readonly stopSummarizerCallback;
     private readonly runtime;
-    static start(logger: ITelemetryLogger, summaryWatcher: IClientSummaryWatcher, configuration: ISummaryConfiguration, submitSummaryCallback: (options: ISubmitSummaryOptions) => Promise<SubmitSummaryResult>, heuristicData: ISummarizeHeuristicData, raiseSummarizingError: (errorMessage: string) => void, summaryCollection: SummaryCollection, cancellationToken: ISummaryCancellationToken, stopSummarizerCallback: (reason: SummarizerStopReason) => void, runtime: ISummarizerRuntime): Promise<RunningSummarizer>;
+    static start(logger: ITelemetryLogger, summaryWatcher: IClientSummaryWatcher, configuration: ISummaryConfiguration, submitSummaryCallback: (options: ISubmitSummaryOptions) => Promise<SubmitSummaryResult>, refreshLatestSummaryAckCallback: (options: IRefreshSummaryAckOptions) => Promise<void>, heuristicData: ISummarizeHeuristicData, summaryCollection: SummaryCollection, cancellationToken: ISummaryCancellationToken, stopSummarizerCallback: (reason: SummarizerStopReason) => void, runtime: ISummarizerRuntime): Promise<RunningSummarizer>;
     get disposed(): boolean;
     private stopping;
     private _disposed;
     private summarizingLock;
-    private refreshSummaryAckLock;
     private tryWhileSummarizing;
     private readonly pendingAckTimer;
     private heuristicRunner?;
     private readonly generator;
-    private readonly logger;
+    private readonly mc;
+    private readonly shouldAbortOnSummaryFailure;
     private enqueuedSummary;
     private summarizeCount;
     private totalSuccessfulAttempts;
     private initialized;
+    private readonly deltaManagerListener;
+    private readonly runtimeListener;
     private constructor();
+    private handleSummaryAck;
+    /**
+     * Responsible for receiving and processing all the summaryAcks.
+     * In case there was a summary ack processed by the running summarizer before processIncomingSummaryAcks is called,
+     * it will wait for the summary ack that is newer than the one indicated by the lastAckRefSeq.
+     * @param lastAckRefSeq - Identifies the minimum reference sequence number the summarizer needs to wait for.
+     * In case of a negative number, the summarizer will wait for ANY summary ack that is greater than the deltaManager's initial sequence number,
+     * and, in case of a positive one, it will wait for a summary ack that is greater than this current reference sequence number.
+     */
+    private processIncomingSummaryAcks;
     dispose(): void;
     /**
      * RunningSummarizer's logger includes the sequenced index of the current summary on each event.
@@ -51,7 +63,7 @@ export declare class RunningSummarizer implements IDisposable {
     tryGetCorrelatedLogger: (summaryOpRefSeq: any) => ITelemetryLogger | undefined;
     /** We only want a single heuristic runner micro-task (will provide better optimized grouping of ops) */
     private heuristicRunnerMicroTaskExists;
-    handleOp(op: ISequencedDocumentMessage): void;
+    handleOp(op: ISequencedDocumentMessage, runtimeMessage: boolean): void;
     /**
      * Can the given op trigger a summary?
      * # Currently always prevents summaries for Summarize and SummaryAck/Nack ops
@@ -62,24 +74,15 @@ export declare class RunningSummarizer implements IDisposable {
     private nonRuntimeOpCanTriggerSummary;
     waitStop(allowLastSummary: boolean): Promise<void>;
     private waitStart;
-    /**
-     * Blocks a new summarizer from running in case RefreshSummaryAck is being processed.
-     * Assumes that caller checked upfront for lack of concurrent action (this.refreshSummaryAckLock)
-     * before calling this API. I.e. caller is responsible for either erroring out or waiting on this promise.
-     * Note: The refreshSummaryAckLock makes sure no summarizer gets enqueued or processed
-     * until the refresh has completed. One can't rely uniquely on the summarizingLock as the
-     * refreshLatestSummaryAck also happens during the time summarizingLock !== undefined.
-     * Ex. Summarizer submits a summay + op and then waits for the Summary Ack to proceed
-     * with the refreshLatestSummaryAck and complete the summary.
-     * @param action - action to perform.
-     * @returns - result of action.
-     */
-    lockedRefreshSummaryAckAction<T>(action: () => Promise<T>): Promise<T>;
+    private beforeSummaryAction;
+    private afterSummaryAction;
     /**
      * Runs single summary action that prevents any other concurrent actions.
      * Assumes that caller checked upfront for lack of concurrent action (this.summarizingLock)
      * before calling this API. I.e. caller is responsible for either erroring out or waiting on this promise.
+     * @param before - set of instructions to run before running the action.
      * @param action - action to perform.
+     * @param after - set of instructions to run after running the action.
      * @returns - result of action.
      */
     private lockedSummaryAction;

package/lib/summary/runningSummarizer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runningSummarizer.d.ts","sourceRoot":"","sources":["../../src/summary/runningSummarizer.ts"],"names":[],"mappings":"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"}

package/lib/{runningSummarizer.js → summary/runningSummarizer.js}

@@ -15,13 +15,16 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import { assert, delay, Deferred, PromiseTimer } from "@fluidframework/common-utils";
 import { UsageError } from "@fluidframework/container-utils";
+import { DriverErrorType } from "@fluidframework/driver-definitions";
 import { isRuntimeMessage } from "@fluidframework/driver-utils";
 import { MessageType } from "@fluidframework/protocol-definitions";
-import { ChildLogger } from "@fluidframework/telemetry-utils";
-import { opSize } from "./opProperties";
+import { ChildLogger, isFluidError, loggerToMonitoringContext, } from "@fluidframework/telemetry-utils";
+import { opSize } from "../opProperties";
 import { SummarizeHeuristicRunner } from "./summarizerHeuristics";
 import { raceTimer, SummarizeResultBuilder, SummaryGenerator, } from "./summaryGenerator";
 const maxSummarizeAckWaitTime = 10 * 60 * 1000; // 10 minutes
+const defaultNumberSummarizationAttempts = 2; // only up to 2 attempts
+const numberOfAttemptsOnRestartAsRecovery = 1; // Only summarize once
 /**
  * An instance of RunningSummarizer manages the heuristics for summarizing.
  * Until disposed, the instance of RunningSummarizer can assume that it is
@@ -30,12 +33,13 @@ const maxSummarizeAckWaitTime = 10 * 60 * 1000; // 10 minutes
  * This object is created and controlled by Summarizer object.
  */
 export class RunningSummarizer {
-    constructor(baseLogger, summaryWatcher, configuration, submitSummaryCallback, heuristicData, raiseSummarizingError, summaryCollection, cancellationToken, stopSummarizerCallback, runtime) {
+    constructor(baseLogger, summaryWatcher, configuration, submitSummaryCallback, refreshLatestSummaryAckCallback, heuristicData, summaryCollection, cancellationToken, stopSummarizerCallback, runtime) {
+        var _a, _b;
         this.summaryWatcher = summaryWatcher;
         this.configuration = configuration;
         this.submitSummaryCallback = submitSummaryCallback;
+        this.refreshLatestSummaryAckCallback = refreshLatestSummaryAckCallback;
         this.heuristicData = heuristicData;
-        this.raiseSummarizingError = raiseSummarizingError;
         this.summaryCollection = summaryCollection;
         this.cancellationToken = cancellationToken;
         this.stopSummarizerCallback = stopSummarizerCallback;
@@ -53,7 +57,7 @@ export class RunningSummarizer {
          * @param summaryOpRefSeq - RefSeq number of the summary op, to ensure the log correlation will be correct
          */
         this.tryGetCorrelatedLogger = (summaryOpRefSeq) => this.heuristicData.lastAttempt.refSequenceNumber === summaryOpRefSeq
-            ? this.logger
+            ? this.mc.logger
             : undefined;
         /** We only want a single heuristic runner micro-task (will provide better optimized grouping of ops) */
         this.heuristicRunnerMicroTaskExists = false;
@@ -61,25 +65,27 @@ export class RunningSummarizer {
             summarizeCount: () => this.summarizeCount,
             summarizerSuccessfulAttempts: () => this.totalSuccessfulAttempts,
         };
-        this.logger = ChildLogger.create(baseLogger, "Running", {
+        this.mc = loggerToMonitoringContext(ChildLogger.create(baseLogger, "Running", {
             all: telemetryProps,
-        });
+        }));
+        this.shouldAbortOnSummaryFailure =
+            this.mc.config.getString("Fluid.ContainerRuntime.Test.SummarizationRecoveryMethod") ===
+                "restart";
         if (configuration.state !== "disableHeuristics") {
             assert(this.configuration.state === "enabled", 0x2ea /* "Configuration state should be enabled" */);
-            this.heuristicRunner = new SummarizeHeuristicRunner(heuristicData, this.configuration, (reason) => this.trySummarize(reason), this.logger);
+            this.heuristicRunner = new SummarizeHeuristicRunner(heuristicData, this.configuration, (reason) => this.trySummarize(reason), this.mc.logger);
         }
         assert(this.configuration.state !== "disabled", 0x2eb /* "Summary not supported with configuration disabled" */);
         // Cap the maximum amount of time client will wait for a summarize op ack to maxSummarizeAckWaitTime
         // configuration.maxAckWaitTime is composed from defaults, server values, and runtime overrides
         const maxAckWaitTime = Math.min(this.configuration.maxAckWaitTime, maxSummarizeAckWaitTime);
         this.pendingAckTimer = new PromiseTimer(maxAckWaitTime, () => {
-            // pre-0.58 error message: summaryAckWaitTimeout
-            this.raiseSummarizingError("Pending summary ack not received in time");
             // Note: summarizeCount (from ChildLogger definition) may be 0,
             // since this code path is hit when RunningSummarizer first starts up,
             // before this instance has kicked off a new summarize run.
-            this.logger.sendErrorEvent({
+            this.mc.logger.sendErrorEvent({
                 eventName: "SummaryAckWaitTimeout",
+                message: "Pending summary ack not received in time",
                 maxAckWaitTime,
                 referenceSequenceNumber: this.heuristicData.lastAttempt.refSequenceNumber,
                 summarySequenceNumber: this.heuristicData.lastAttempt.summarySequenceNumber,
@@ -89,7 +95,7 @@ export class RunningSummarizer {
         // Set up pending ack timeout by op timestamp differences for previous summaries.
         summaryCollection.setPendingAckTimerTimeoutCallback(maxAckWaitTime, () => {
             if (this.pendingAckTimer.hasTimer) {
-                this.logger.sendTelemetryEvent({
+                this.mc.logger.sendTelemetryEvent({
                     eventName: "MissingSummaryAckFoundByOps",
                     referenceSequenceNumber: this.heuristicData.lastAttempt.refSequenceNumber,
                     summarySequenceNumber: this.heuristicData.lastAttempt.summarySequenceNumber,
@@ -97,18 +103,39 @@ export class RunningSummarizer {
                 this.pendingAckTimer.clear();
             }
         });
-        this.generator = new SummaryGenerator(this.pendingAckTimer, this.heuristicData, this.submitSummaryCallback, this.raiseSummarizingError, () => {
+        this.generator = new SummaryGenerator(this.pendingAckTimer, this.heuristicData, this.submitSummaryCallback, () => {
             this.totalSuccessfulAttempts++;
-        }, this.summaryWatcher, this.logger);
-        // Listen for ops
-        this.runtime.deltaManager.on("op", (op) => {
-            this.handleOp(op);
-        });
+        }, this.summaryWatcher, this.mc.logger);
+        // Listen to deltaManager for non-runtime ops
+        this.deltaManagerListener = (op) => {
+            if (!isRuntimeMessage(op)) {
+                this.handleOp(op, false);
+            }
+        };
+        // Listen to runtime for runtime ops
+        this.runtimeListener = (op, runtimeMessage) => {
+            if (runtimeMessage) {
+                this.handleOp(op, true);
+            }
+        };
+        // Purpose of listening to deltaManager is for back-compat
+        // Can remove and only listen to runtime once loader version is past 2.0.0-internal.1.2.0 (https://github.com/microsoft/FluidFramework/pull/11832)
+        // Tracked by AB#3883
+        this.runtime.deltaManager.on("op", this.deltaManagerListener);
+        (_b = (_a = this.runtime).on) === null || _b === void 0 ? void 0 : _b.call(_a, "op", this.runtimeListener);
     }
-    static async start(logger, summaryWatcher, configuration, submitSummaryCallback, heuristicData, raiseSummarizingError, summaryCollection, cancellationToken, stopSummarizerCallback, runtime) {
+    static async start(logger, summaryWatcher, configuration, submitSummaryCallback, refreshLatestSummaryAckCallback, heuristicData, summaryCollection, cancellationToken, stopSummarizerCallback, runtime) {
         var _a, _b;
-        const summarizer = new RunningSummarizer(logger, summaryWatcher, configuration, submitSummaryCallback, heuristicData, raiseSummarizingError, summaryCollection, cancellationToken, stopSummarizerCallback, runtime);
+        const summarizer = new RunningSummarizer(logger, summaryWatcher, configuration, submitSummaryCallback, refreshLatestSummaryAckCallback, heuristicData, summaryCollection, cancellationToken, stopSummarizerCallback, runtime);
+        // Before doing any heuristics or proceeding with its refreshing, if there is a summary ack received while
+        // this summarizer catches up, let's refresh state before proceeding with the summarization.
+        const lastAckRefSeq = await summarizer.handleSummaryAck();
         await summarizer.waitStart();
+        // Handle summary acks asynchronously
+        // Note: no exceptions are thrown from processIncomingSummaryAcks handler as it handles all exceptions
+        summarizer.processIncomingSummaryAcks(lastAckRefSeq).catch((error) => {
+            logger.sendErrorEvent({ eventName: "HandleSummaryAckFatalError" }, error);
+        });
         // Update heuristic counts
         // By the time we get here, there are potentially ops missing from the heuristic summary counts
         // Examples of where this could happen:
@@ -135,13 +162,87 @@ export class RunningSummarizer {
     get disposed() {
         return this._disposed;
     }
-    dispose() {
+    async handleSummaryAck() {
         var _a;
-        this.runtime.deltaManager.off("op", (op) => {
-            this.handleOp(op);
-        });
+        const lastAck = this.summaryCollection.latestAck;
+        let refSequenceNumber = -1;
+        // In case we haven't received the lastestAck yet, just return.
+        if (lastAck !== undefined) {
+            refSequenceNumber = lastAck.summaryOp.referenceSequenceNumber;
+            const summaryLogger = (_a = this.tryGetCorrelatedLogger(refSequenceNumber)) !== null && _a !== void 0 ? _a : this.mc.logger;
+            const summaryOpHandle = lastAck.summaryOp.contents.handle;
+            const summaryAckHandle = lastAck.summaryAck.contents.handle;
+            while (this.summarizingLock !== undefined) {
+                summaryLogger.sendTelemetryEvent({
+                    eventName: "RefreshAttemptWithSummarizerRunning",
+                    referenceSequenceNumber: refSequenceNumber,
+                    proposalHandle: summaryOpHandle,
+                    ackHandle: summaryAckHandle,
+                });
+                await this.summarizingLock;
+            }
+            // Make sure we block any summarizer from being executed/enqueued while
+            // executing the refreshLatestSummaryAck.
+            // https://dev.azure.com/fluidframework/internal/_workitems/edit/779
+            await this.lockedSummaryAction(() => { }, async () => this.refreshLatestSummaryAckCallback({
+                proposalHandle: summaryOpHandle,
+                ackHandle: summaryAckHandle,
+                summaryRefSeq: refSequenceNumber,
+                summaryLogger,
+            }).catch(async (error) => {
+                // If the error is 404, so maybe the fetched version no longer exists on server. We just
+                // ignore this error in that case, as that means we will have another summaryAck for the
+                // latest version with which we will refresh the state. However in case of single commit
+                // summary, we might me missing a summary ack, so in that case we are still fine as the
+                // code in `submitSummary` function in container runtime, will refresh the latest state
+                // by calling `refreshLatestSummaryAckFromServer` and we will be fine.
+                const isIgnoredError = isFluidError(error) &&
+                    error.errorType === DriverErrorType.fileNotFoundOrAccessDeniedError;
+                summaryLogger.sendTelemetryEvent({
+                    eventName: isIgnoredError
+                        ? "HandleSummaryAckErrorIgnored"
+                        : "HandleLastSummaryAckError",
+                    referenceSequenceNumber: refSequenceNumber,
+                    proposalHandle: summaryOpHandle,
+                    ackHandle: summaryAckHandle,
+                }, error);
+            }), () => { });
+            refSequenceNumber++;
+        }
+        return refSequenceNumber;
+    }
+    /**
+     * Responsible for receiving and processing all the summaryAcks.
+     * In case there was a summary ack processed by the running summarizer before processIncomingSummaryAcks is called,
+     * it will wait for the summary ack that is newer than the one indicated by the lastAckRefSeq.
+     * @param lastAckRefSeq - Identifies the minimum reference sequence number the summarizer needs to wait for.
+     * In case of a negative number, the summarizer will wait for ANY summary ack that is greater than the deltaManager's initial sequence number,
+     * and, in case of a positive one, it will wait for a summary ack that is greater than this current reference sequence number.
+     */
+    async processIncomingSummaryAcks(lastAckRefSeq) {
+        var _a;
+        let refSequenceNumber = lastAckRefSeq > 0 ? lastAckRefSeq : this.runtime.deltaManager.initialSequenceNumber;
+        while (!this.disposed) {
+            const summaryLogger = (_a = this.tryGetCorrelatedLogger(refSequenceNumber)) !== null && _a !== void 0 ? _a : this.mc.logger;
+            // Initialize ack with undefined if exception happens inside of waitSummaryAck on second iteration,
+            // we record undefined, not previous handles.
+            await this.summaryCollection.waitSummaryAck(refSequenceNumber);
+            summaryLogger.sendTelemetryEvent({
+                eventName: "processIncomingSummaryAcks",
+                referenceSequenceNumber: refSequenceNumber,
+                lastAckRefSeq,
+            });
+            refSequenceNumber = await this.handleSummaryAck();
+            // A valid Summary Ack must have been processed.
+            assert(refSequenceNumber >= 0, 0x58f /* Invalid ref sequence number */);
+        }
+    }
+    dispose() {
+        var _a, _b, _c;
+        this.runtime.deltaManager.off("op", this.deltaManagerListener);
+        (_b = (_a = this.runtime).off) === null || _b === void 0 ? void 0 : _b.call(_a, "op", this.runtimeListener);
         this.summaryWatcher.dispose();
-        (_a = this.heuristicRunner) === null || _a === void 0 ? void 0 : _a.dispose();
+        (_c = this.heuristicRunner) === null || _c === void 0 ? void 0 : _c.dispose();
         this.heuristicRunner = undefined;
         this.generator.dispose();
         this.pendingAckTimer.clear();
@@ -149,9 +250,9 @@ export class RunningSummarizer {
         this._disposed = true;
         this.stopping = true;
     }
-    handleOp(op) {
+    handleOp(op, runtimeMessage) {
         this.heuristicData.lastOpSequenceNumber = op.sequenceNumber;
-        if (isRuntimeMessage(op)) {
+        if (runtimeMessage) {
             this.heuristicData.numRuntimeOps++;
         }
         else {
@@ -160,7 +261,7 @@ export class RunningSummarizer {
         this.heuristicData.totalOpsSize += opSize(op);
         // Check for enqueued on-demand summaries; Intentionally do nothing otherwise
         if (this.initialized &&
-            this.opCanTriggerSummary(op) &&
+            this.opCanTriggerSummary(op, runtimeMessage) &&
             !this.tryRunEnqueuedSummary() &&
             !this.heuristicRunnerMicroTaskExists) {
             this.heuristicRunnerMicroTaskExists = true;
@@ -180,14 +281,14 @@ export class RunningSummarizer {
      * @param op - op to check
      * @returns true if this op can trigger a summary
      */
-    opCanTriggerSummary(op) {
+    opCanTriggerSummary(op, runtimeMessage) {
         switch (op.type) {
             case MessageType.Summarize:
             case MessageType.SummaryAck:
             case MessageType.SummaryNack:
                 return false;
             default:
-                return isRuntimeMessage(op) || this.nonRuntimeOpCanTriggerSummary();
+                return runtimeMessage || this.nonRuntimeOpCanTriggerSummary();
         }
     }
     nonRuntimeOpCanTriggerSummary() {
@@ -238,52 +339,37 @@ export class RunningSummarizer {
         }
         this.initialized = true;
     }
-    /**
-     * Blocks a new summarizer from running in case RefreshSummaryAck is being processed.
-     * Assumes that caller checked upfront for lack of concurrent action (this.refreshSummaryAckLock)
-     * before calling this API. I.e. caller is responsible for either erroring out or waiting on this promise.
-     * Note: The refreshSummaryAckLock makes sure no summarizer gets enqueued or processed
-     * until the refresh has completed. One can't rely uniquely on the summarizingLock as the
-     * refreshLatestSummaryAck also happens during the time summarizingLock !== undefined.
-     * Ex. Summarizer submits a summay + op and then waits for the Summary Ack to proceed
-     * with the refreshLatestSummaryAck and complete the summary.
-     * @param action - action to perform.
-     * @returns - result of action.
-     */
-    async lockedRefreshSummaryAckAction(action) {
-        assert(this.refreshSummaryAckLock === undefined, 0x396 /* Refresh Summary Ack - Caller is responsible for checking lock */);
-        const refreshSummaryAckLock = new Deferred();
-        this.refreshSummaryAckLock = refreshSummaryAckLock.promise;
-        return action().finally(() => {
-            refreshSummaryAckLock.resolve();
-            this.refreshSummaryAckLock = undefined;
-        });
+    beforeSummaryAction() {
+        this.summarizeCount++;
+    }
+    afterSummaryAction() {
+        var _a;
+        const retry = this.tryWhileSummarizing;
+        this.tryWhileSummarizing = false;
+        // After summarizing, we should check to see if we need to summarize again.
+        // Rerun the heuristics and check for enqueued summaries.
+        if (!this.stopping && !this.tryRunEnqueuedSummary() && retry) {
+            (_a = this.heuristicRunner) === null || _a === void 0 ? void 0 : _a.run();
+        }
     }
     /**
      * Runs single summary action that prevents any other concurrent actions.
      * Assumes that caller checked upfront for lack of concurrent action (this.summarizingLock)
      * before calling this API. I.e. caller is responsible for either erroring out or waiting on this promise.
+     * @param before - set of instructions to run before running the action.
      * @param action - action to perform.
+     * @param after - set of instructions to run after running the action.
      * @returns - result of action.
      */
-    async lockedSummaryAction(action) {
+    async lockedSummaryAction(before, action, after) {
         assert(this.summarizingLock === undefined, 0x25b /* "Caller is responsible for checking lock" */);
         const summarizingLock = new Deferred();
         this.summarizingLock = summarizingLock.promise;
-        this.summarizeCount++;
-        // Make sure the RefreshLatestSummaryAck is not being executed.
-        await this.refreshSummaryAckLock;
+        before();
         return action().finally(() => {
-            var _a;
             summarizingLock.resolve();
             this.summarizingLock = undefined;
-            const retry = this.tryWhileSummarizing;
-            this.tryWhileSummarizing = false;
-            // After summarizing, we should check to see if we need to summarize again.
-            // Rerun the heuristics and check for enqueued summaries.
-            if (!this.stopping && !this.tryRunEnqueuedSummary() && retry) {
-                (_a = this.heuristicRunner) === null || _a === void 0 ? void 0 : _a.run();
-            }
+            after();
         });
     }
     /**
@@ -295,10 +381,14 @@ export class RunningSummarizer {
      * @returns ISummarizeResult - result of running a summary.
      */
     trySummarizeOnce(summarizeProps, options, cancellationToken = this.cancellationToken, resultsBuilder = new SummarizeResultBuilder()) {
-        this.lockedSummaryAction(async () => {
+        this.lockedSummaryAction(() => {
+            this.beforeSummaryAction();
+        }, async () => {
             const summarizeResult = this.generator.summarize(summarizeProps, options, cancellationToken, resultsBuilder);
             // ensure we wait till the end of the process
             return summarizeResult.receivedSummaryAckOrNack;
+        }, () => {
+            this.afterSummaryAction();
         }).catch((error) => {
             // SummaryGenerator.summarize() does not throw exceptions - it converts them to failed result
             // on resultsBuilder
@@ -315,7 +405,10 @@ export class RunningSummarizer {
             this.tryWhileSummarizing = true;
             return;
         }
-        this.lockedSummaryAction(async () => {
+        this.lockedSummaryAction(() => {
+            this.beforeSummaryAction();
+        }, async () => {
+            var _a;
             const attempts = [
                 { refreshLatestAck: false, fullTree: false },
                 { refreshLatestAck: true, fullTree: false },
@@ -325,8 +418,22 @@ export class RunningSummarizer {
             let overrideDelaySeconds;
             let summaryAttempts = 0;
             let summaryAttemptsPerPhase = 0;
+            // Reducing the default number of attempts to defaultNumberofSummarizationAttempts.
+            let totalAttempts = this.shouldAbortOnSummaryFailure
+                ? numberOfAttemptsOnRestartAsRecovery
+                : (_a = this.mc.config.getNumber("Fluid.Summarizer.Attempts")) !== null && _a !== void 0 ? _a : defaultNumberSummarizationAttempts;
+            if (totalAttempts > attempts.length) {
+                this.mc.logger.sendTelemetryEvent({
+                    eventName: "InvalidSummarizerAttempts",
+                    attempts: totalAttempts,
+                });
+                totalAttempts = defaultNumberSummarizationAttempts;
+            }
+            else if (totalAttempts < 1) {
+                throw new UsageError("Invalid number of attempts.");
+            }
             let lastResult;
-            for (let summaryAttemptPhase = 0; summaryAttemptPhase < attempts.length;) {
+            for (let summaryAttemptPhase = 0; summaryAttemptPhase < totalAttempts;) {
                 if (this.cancellationToken.cancelled) {
                     return;
                 }
@@ -335,17 +442,10 @@ export class RunningSummarizer {
                     return;
                 }
                 summaryAttemptsPerPhase++;
-                const _a = attempts[summaryAttemptPhase], { delaySeconds: regularDelaySeconds = 0 } = _a, options = __rest(_a, ["delaySeconds"]);
-                const delaySeconds = overrideDelaySeconds !== null && overrideDelaySeconds !== void 0 ? overrideDelaySeconds : regularDelaySeconds;
+                const _b = attempts[summaryAttemptPhase], { delaySeconds: regularDelaySeconds = 0 } = _b, options = __rest(_b, ["delaySeconds"]);
                 const summarizeProps = Object.assign({ reason,
                     summaryAttempts,
                     summaryAttemptsPerPhase, summaryAttemptPhase: summaryAttemptPhase + 1 }, options);
-                if (delaySeconds > 0) {
-                    this.logger.sendPerformanceEvent(Object.assign({ eventName: "SummarizeAttemptDelay", duration: delaySeconds, summaryNackDelay: overrideDelaySeconds !== undefined }, summarizeProps));
-                    await delay(delaySeconds * 1000);
-                }
-                // Make sure the refresh Summary Ack is not being executed.
-                await this.refreshSummaryAckLock;
                 // Note: no need to account for cancellationToken.waitCancelled here, as
                 // this is accounted SummaryGenerator.summarizeCore that controls receivedSummaryAckOrNack.
                 const resultSummarize = this.generator.summarize(summarizeProps, options, cancellationToken);
@@ -361,16 +461,33 @@ export class RunningSummarizer {
                     summaryAttemptsPerPhase = 0;
                 }
                 lastResult = result;
+                const delaySeconds = overrideDelaySeconds !== null && overrideDelaySeconds !== void 0 ? overrideDelaySeconds : regularDelaySeconds;
+                if (delaySeconds > 0) {
+                    this.mc.logger.sendPerformanceEvent(Object.assign({ eventName: "SummarizeAttemptDelay", duration: delaySeconds, summaryNackDelay: overrideDelaySeconds !== undefined }, summarizeProps));
+                    await delay(delaySeconds * 1000);
+                }
+            }
+            if (this.shouldAbortOnSummaryFailure) {
+                this.mc.logger.sendTelemetryEvent({
+                    eventName: "ClosingSummarizerOnSummaryStale",
+                    reason,
+                    message: lastResult === null || lastResult === void 0 ? void 0 : lastResult.message,
+                }, lastResult === null || lastResult === void 0 ? void 0 : lastResult.error);
+                this.stopSummarizerCallback("latestSummaryStateStale");
+                this.runtime.closeFn();
+                return;
             }
             // If all attempts failed, log error (with last attempt info) and close the summarizer container
-            this.logger.sendErrorEvent({
+            this.mc.logger.sendErrorEvent({
                 eventName: "FailToSummarize",
                 reason,
                 message: lastResult === null || lastResult === void 0 ? void 0 : lastResult.message,
             }, lastResult === null || lastResult === void 0 ? void 0 : lastResult.error);
             this.stopSummarizerCallback("failToSummarize");
+        }, () => {
+            this.afterSummaryAction();
         }).catch((error) => {
-            this.logger.sendErrorEvent({ eventName: "UnexpectedSummarizeError" }, error);
+            this.mc.logger.sendErrorEvent({ eventName: "UnexpectedSummarizeError" }, error);
         });
     }
     /** {@inheritdoc (ISummarizer:interface).summarizeOnDemand} */