@fluidframework/container-runtime 2.0.0-rc.1.0.4 → 2.0.0-rc.2.0.0

package/dist/deltaManagerSummarizerProxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"deltaManagerSummarizerProxy.js","sourceRoot":"","sources":["../src/deltaManagerSummarizerProxy.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAKH,mEAAgE;AAChE,uCAAiD;AAEjD;;;;GAIG;AACH,MAAa,2BACZ,SAAQ,6CAAqB;IAG7B,IAAW,MAAM;QAChB,0GAA0G;QAC1G,gEAAgE;QAChE,OAAO,CAAC,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;IAC7D,CAAC;IAED,IAAW,YAAY;QACtB,+GAA+G;QAC/G,iHAAiH;QACjH,IAAI,IAAI,CAAC,kBAAkB,EAAE;YAC5B,OAAO;gBACN,QAAQ,EAAE,IAAI;gBACd,MAAM,EAAE,KAAK;gBACb,WAAW,EAAE,SAAS;gBACtB,WAAW,EAAE,KAAK;aAClB,CAAC;SACF;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC;IACvC,CAAC;IAID,YAAY,YAAwE;QACnF,KAAK,CAAC,YAAY,CAAC,CAAC;QACpB,kHAAkH;QAClH,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QACzB,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,KAAK,8BAAoB,CAAC;IACzF,CAAC;CACD;AAhCD,kEAgCC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { IDeltaManager, ReadOnlyInfo } from \"@fluidframework/container-definitions\";\nimport { IDocumentMessage, ISequencedDocumentMessage } from \"@fluidframework/protocol-definitions\";\n\nimport { DeltaManagerProxyBase } from \"./deltaManagerProxyBase\";\nimport { summarizerClientType } from \"./summary\";\n\n/**\n * Proxy to the real IDeltaManager for restricting certain access to layers below container runtime in summarizer clients:\n * - Summarizer client should be read-only to layers below the container runtime to restrict local changes.\n * - Summarizer client should not be active to layers below the container runtime to restrict local changes.\n */\nexport class DeltaManagerSummarizerProxy\n\textends DeltaManagerProxyBase\n\timplements IDeltaManager<ISequencedDocumentMessage, IDocumentMessage>\n{\n\tpublic get active(): boolean {\n\t\t// Summarize clients should not be active. There shouldn't be any local changes (writes) in the summarizer\n\t\t// except for the SummarizeOp which is generated by the runtime.\n\t\treturn !this.isSummarizerClient && this.deltaManager.active;\n\t}\n\n\tpublic get readOnlyInfo(): ReadOnlyInfo {\n\t\t// Summarizer clients should be read-only as far as the runtime and layers below are concerned. There shouldn't\n\t\t// be any local changes (writes) in the summarizer except for the summarize op which is generated by the runtime.\n\t\tif (this.isSummarizerClient) {\n\t\t\treturn {\n\t\t\t\treadonly: true,\n\t\t\t\tforced: false,\n\t\t\t\tpermissions: undefined,\n\t\t\t\tstorageOnly: false,\n\t\t\t};\n\t\t}\n\t\treturn this.deltaManager.readOnlyInfo;\n\t}\n\n\tprivate readonly isSummarizerClient: boolean;\n\n\tconstructor(deltaManager: IDeltaManager<ISequencedDocumentMessage, IDocumentMessage>) {\n\t\tsuper(deltaManager);\n\t\t// We are expecting this class to have many listeners, so we suppress noisy \"MaxListenersExceededWarning\" logging.\n\t\tsuper.setMaxListeners(0);\n\t\tthis.isSummarizerClient = this.deltaManager.clientDetails.type === summarizerClientType;\n\t}\n}\n"]}
+{"version":3,"file":"deltaManagerSummarizerProxy.js","sourceRoot":"","sources":["../src/deltaManagerSummarizerProxy.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { TypedEventEmitter } from \"@fluid-internal/client-utils\";\nimport type {\n\tIConnectionDetails,\n\tIDeltaManager,\n\tIDeltaManagerEvents,\n\tIDeltaQueue,\n\tIDeltaSender,\n\tReadOnlyInfo,\n} from \"@fluidframework/container-definitions\";\nimport type { IErrorBase } from \"@fluidframework/core-interfaces\";\nimport type { IAnyDriverError } from \"@fluidframework/driver-definitions\";\nimport {\n\tIClientConfiguration,\n\tIClientDetails,\n\tIDocumentMessage,\n\tISequencedDocumentMessage,\n\tISignalMessage,\n} from \"@fluidframework/protocol-definitions\";\n\nimport { summarizerClientType } from \"./summary/index.js\";\n\n/**\n * Proxy to the real IDeltaManager for restricting certain access to layers below container runtime in summarizer clients:\n * - Summarizer client should be read-only to layers below the container runtime to restrict local changes.\n * - Summarizer client should not be active to layers below the container runtime to restrict local changes.\n */\nexport class DeltaManagerSummarizerProxy\n\textends TypedEventEmitter<IDeltaManagerEvents>\n\timplements IDeltaManager<ISequencedDocumentMessage, IDocumentMessage>\n{\n\tpublic get IDeltaSender(): IDeltaSender {\n\t\treturn this;\n\t}\n\n\tpublic get inbound(): IDeltaQueue<ISequencedDocumentMessage> {\n\t\treturn this.deltaManager.inbound;\n\t}\n\n\tpublic get outbound(): IDeltaQueue<IDocumentMessage[]> {\n\t\treturn this.deltaManager.outbound;\n\t}\n\n\tpublic get inboundSignal(): IDeltaQueue<ISignalMessage> {\n\t\treturn this.deltaManager.inboundSignal;\n\t}\n\n\tpublic get minimumSequenceNumber(): number {\n\t\treturn this.deltaManager.minimumSequenceNumber;\n\t}\n\n\tpublic get lastSequenceNumber(): number {\n\t\treturn this.deltaManager.lastSequenceNumber;\n\t}\n\n\tpublic get lastMessage() {\n\t\treturn this.deltaManager.lastMessage;\n\t}\n\n\tpublic get lastKnownSeqNumber() {\n\t\treturn this.deltaManager.lastKnownSeqNumber;\n\t}\n\n\tpublic get initialSequenceNumber(): number {\n\t\treturn this.deltaManager.initialSequenceNumber;\n\t}\n\n\tpublic get hasCheckpointSequenceNumber() {\n\t\treturn this.deltaManager.hasCheckpointSequenceNumber;\n\t}\n\n\tpublic get clientDetails(): IClientDetails {\n\t\treturn this.deltaManager.clientDetails;\n\t}\n\n\tpublic get version(): string {\n\t\treturn this.deltaManager.version;\n\t}\n\n\tpublic get maxMessageSize(): number {\n\t\treturn this.deltaManager.maxMessageSize;\n\t}\n\n\tpublic get serviceConfiguration(): IClientConfiguration | undefined {\n\t\treturn this.deltaManager.serviceConfiguration;\n\t}\n\n\tpublic get active(): boolean {\n\t\t// Summarize clients should not be active. There shouldn't be any local changes (writes) in the summarizer\n\t\t// except for the SummarizeOp which is generated by the runtime.\n\t\treturn !this.isSummarizerClient && this.deltaManager.active;\n\t}\n\n\tpublic get readOnlyInfo(): ReadOnlyInfo {\n\t\t// Summarizer clients should be read-only as far as the runtime and layers below are concerned. There shouldn't\n\t\t// be any local changes (writes) in the summarizer except for the summarize op which is generated by the runtime.\n\t\tif (this.isSummarizerClient) {\n\t\t\treturn {\n\t\t\t\treadonly: true,\n\t\t\t\tforced: false,\n\t\t\t\tpermissions: undefined,\n\t\t\t\tstorageOnly: false,\n\t\t\t};\n\t\t}\n\t\treturn this.deltaManager.readOnlyInfo;\n\t}\n\n\tprivate readonly isSummarizerClient: boolean;\n\n\tconstructor(\n\t\tprivate readonly deltaManager: IDeltaManager<ISequencedDocumentMessage, IDocumentMessage>,\n\t) {\n\t\tsuper();\n\n\t\t// We are expecting this class to have many listeners, so we suppress noisy \"MaxListenersExceededWarning\" logging.\n\t\tsuper.setMaxListeners(0);\n\t\tthis.isSummarizerClient = this.deltaManager.clientDetails.type === summarizerClientType;\n\n\t\tthis.deltaManager.on(\"prepareSend\", this.onPrepareSend);\n\t\tthis.deltaManager.on(\"submitOp\", this.onSubmitOp);\n\t\tthis.deltaManager.on(\"op\", this.onOp);\n\t\tthis.deltaManager.on(\"pong\", this.onPong);\n\t\tthis.deltaManager.on(\"connect\", this.onConnect);\n\t\tthis.deltaManager.on(\"disconnect\", this.onDisconnect);\n\t\tthis.deltaManager.on(\"readonly\", this.onReadonly);\n\t}\n\n\tpublic dispose(): void {\n\t\tthis.deltaManager.off(\"prepareSend\", this.onPrepareSend);\n\t\tthis.deltaManager.off(\"submitOp\", this.onSubmitOp);\n\t\tthis.deltaManager.off(\"op\", this.onOp);\n\t\tthis.deltaManager.off(\"pong\", this.onPong);\n\t\tthis.deltaManager.off(\"connect\", this.onConnect);\n\t\tthis.deltaManager.off(\"disconnect\", this.onDisconnect);\n\t\tthis.deltaManager.off(\"readonly\", this.onReadonly);\n\t}\n\n\tpublic submitSignal(content: any, targetClientId?: string): void {\n\t\treturn this.deltaManager.submitSignal(content, targetClientId);\n\t}\n\n\tpublic flush(): void {\n\t\treturn this.deltaManager.flush();\n\t}\n\n\tprivate readonly onPrepareSend = (messageBuffer: any[]): void => {\n\t\tthis.emit(\"prepareSend\", messageBuffer);\n\t};\n\tprivate readonly onSubmitOp = (message: IDocumentMessage): void => {\n\t\tthis.emit(\"submitOp\", message);\n\t};\n\tprivate readonly onOp = (message: ISequencedDocumentMessage, processingTime: number): void => {\n\t\tthis.emit(\"op\", message, processingTime);\n\t};\n\tprivate readonly onPong = (latency: number): void => {\n\t\tthis.emit(\"pong\", latency);\n\t};\n\tprivate readonly onConnect = (details: IConnectionDetails, opsBehind?: number): void => {\n\t\tthis.emit(\"connect\", details, opsBehind);\n\t};\n\tprivate readonly onDisconnect = (reason: string, error?: IAnyDriverError): void => {\n\t\tthis.emit(\"disconnect\", reason, error);\n\t};\n\tprivate readonly onReadonly = (\n\t\treadonly: boolean,\n\t\treadonlyConnectionReason?: { reason: string; error?: IErrorBase },\n\t): void => {\n\t\tthis.emit(\"readonly\", readonly, readonlyConnectionReason);\n\t};\n}\n"]}

package/dist/gc/garbageCollection.d.ts

@@ -5,10 +5,10 @@
 import { IRequest } from "@fluidframework/core-interfaces";
 import { IGarbageCollectionDetailsBase, ISummarizeResult, ITelemetryContext } from "@fluidframework/runtime-definitions";
 import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
-import { RuntimeHeaderData } from "../containerRuntime";
-import { ContainerRuntimeGCMessage } from "../messageTypes";
-import { IRefreshSummaryResult } from "../summary";
-import { IGarbageCollector, IGarbageCollectorCreateParams, IGCStats, IGCMetadata } from "./gcDefinitions";
+import { RuntimeHeaderData } from "../containerRuntime.js";
+import { ContainerRuntimeGCMessage } from "../messageTypes.js";
+import { IRefreshSummaryResult } from "../summary/index.js";
+import { IGarbageCollector, IGarbageCollectorCreateParams, IGCStats, IGCMetadata } from "./gcDefinitions.js";
 /**
  * The garbage collector for the container runtime. It consolidates the garbage collection functionality and maintains
  * its state across summaries.
@@ -36,6 +36,7 @@ export declare class GarbageCollector implements IGarbageCollector {
     private readonly mc;
     private readonly configs;
     get shouldRunGC(): boolean;
+    readonly sessionExpiryTimerStarted: number | undefined;
     private gcDataFromLastRun;
     private readonly newReferencesSinceLastRun;
     private tombstones;
@@ -43,6 +44,11 @@ export declare class GarbageCollector implements IGarbageCollector {
     private readonly baseSnapshotDataP;
     private readonly initializeGCStateFromBaseSnapshotP;
     private readonly baseGCDetailsP;
+    /**
+     * Map of node ids to their unreferenced state tracker
+     * NOTE: The set of keys in this map is considered as the set of unreferenced nodes
+     * as of the last GC run. So in between runs, nothing should be added or removed.
+     */
     private readonly unreferencedNodesState;
     private sessionExpiryTimer;
     private completedRuns;
@@ -196,14 +202,25 @@ export declare class GarbageCollector implements IGarbageCollector {
      * @param requestHeaders - If the node was loaded via request path, the headers in the request.
      */
     nodeUpdated(nodePath: string, reason: "Loaded" | "Changed", timestampMs?: number, packagePath?: readonly string[], request?: IRequest, headerData?: RuntimeHeaderData): void;
+    /**
+     * The given node should have its unreferenced state reset in the next GC,
+     * even if the true GC graph shows it is unreferenced. This will
+     * prevent it from being deleted by Sweep (after the Grace Period).
+     *
+     * Submit a GC op indicating that the Tombstone with the given path has been loaded.
+     * Broadcasting this information in the op stream allows the Summarizer to reset unreferenced state
+     * before runnint GC next.
+     */
+    private triggerAutoRecovery;
     /**
      * Called when an outbound reference is added to a node. This is used to identify all nodes that have been
      * referenced between summaries so that their unreferenced timestamp can be reset.
      *
      * @param fromNodePath - The node from which the reference is added.
      * @param toNodePath - The node to which the reference is added.
+     * @param autorecovery - This reference is added artificially, for autorecovery. Used for logging.
      */
-    addedOutboundReference(fromNodePath: string, toNodePath: string): void;
+    addedOutboundReference(fromNodePath: string, toNodePath: string, autorecovery?: true): void;
     /**
      * Returns whether a node with the given path has been deleted or not. This can be used by the runtime to identify
      * cases where objects are used after they are deleted and throw / log errors accordingly.

package/dist/gc/garbageCollection.d.ts.map

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

package/dist/gc/garbageCollection.js

@@ -9,17 +9,17 @@ const core_utils_1 = require("@fluidframework/core-utils");
 const runtime_definitions_1 = require("@fluidframework/runtime-definitions");
 const runtime_utils_1 = require("@fluidframework/runtime-utils");
 const telemetry_utils_1 = require("@fluidframework/telemetry-utils");
-const blobManager_1 = require("../blobManager");
-const containerRuntime_1 = require("../containerRuntime");
-const error_1 = require("../error");
-const messageTypes_1 = require("../messageTypes");
-const gcConfigs_1 = require("./gcConfigs");
-const gcDefinitions_1 = require("./gcDefinitions");
-const gcHelpers_1 = require("./gcHelpers");
-const gcReferenceGraphAlgorithm_1 = require("./gcReferenceGraphAlgorithm");
-const gcSummaryStateTracker_1 = require("./gcSummaryStateTracker");
-const gcUnreferencedStateTracker_1 = require("./gcUnreferencedStateTracker");
-const gcTelemetry_1 = require("./gcTelemetry");
+const blobManager_js_1 = require("../blobManager.js");
+const containerRuntime_js_1 = require("../containerRuntime.js");
+const error_js_1 = require("../error.js");
+const messageTypes_js_1 = require("../messageTypes.js");
+const gcConfigs_js_1 = require("./gcConfigs.js");
+const gcDefinitions_js_1 = require("./gcDefinitions.js");
+const gcHelpers_js_1 = require("./gcHelpers.js");
+const gcReferenceGraphAlgorithm_js_1 = require("./gcReferenceGraphAlgorithm.js");
+const gcSummaryStateTracker_js_1 = require("./gcSummaryStateTracker.js");
+const gcUnreferencedStateTracker_js_1 = require("./gcUnreferencedStateTracker.js");
+const gcTelemetry_js_1 = require("./gcTelemetry.js");
 /**
  * The garbage collector for the container runtime. It consolidates the garbage collection functionality and maintains
  * its state across summaries.
@@ -76,8 +76,12 @@ class GarbageCollector {
         this.tombstones = [];
         // A list of nodes that have been deleted during sweep phase.
         this.deletedNodes = new Set();
-        // Map of node ids to their unreferenced state tracker.
-        this.unreferencedNodesState = new Map();
+        /**
+         * Map of node ids to their unreferenced state tracker
+         * NOTE: The set of keys in this map is considered as the set of unreferenced nodes
+         * as of the last GC run. So in between runs, nothing should be added or removed.
+         */
+        this.unreferencedNodesState = new gcUnreferencedStateTracker_js_1.UnreferencedStateTrackerMap();
         // The number of times GC has successfully completed on this instance of GarbageCollector.
         this.completedRuns = 0;
         this.runtime = createParams.runtime;
@@ -87,6 +91,7 @@ class GarbageCollector {
         this.submitMessage = createParams.submitMessage;
         const baseSnapshot = createParams.baseSnapshot;
         const readAndParseBlob = createParams.readAndParseBlob;
+        const pendingSessionExpiryTimerStarted = createParams.sessionExpiryTimerStarted;
         this.mc = (0, telemetry_utils_1.createChildMonitoringContext)({
             logger: createParams.baseLogger,
             namespace: "GarbageCollector",
@@ -94,19 +99,29 @@ class GarbageCollector {
                 all: { completedGCRuns: () => this.completedRuns },
             },
         });
-        this.configs = (0, gcConfigs_1.generateGCConfigs)(this.mc, createParams);
+        this.configs = (0, gcConfigs_js_1.generateGCConfigs)(this.mc, createParams);
         // If session expiry is enabled, we need to close the container when the session expiry timeout expires.
         if (this.configs.sessionExpiryTimeoutMs !== undefined) {
             // If Test Override config is set, override Session Expiry timeout.
             const overrideSessionExpiryTimeoutMs = this.mc.config.getNumber("Fluid.GarbageCollection.TestOverride.SessionExpiryMs");
-            const timeoutMs = overrideSessionExpiryTimeoutMs ?? this.configs.sessionExpiryTimeoutMs;
+            let timeoutMs = this.configs.sessionExpiryTimeoutMs;
+            if (pendingSessionExpiryTimerStarted) {
+                // NOTE: This assumes the client clock hasn't been tampered with since the original session
+                const timeLapsedSincePendingTimer = Date.now() - pendingSessionExpiryTimerStarted;
+                timeoutMs -= timeLapsedSincePendingTimer;
+            }
+            timeoutMs = overrideSessionExpiryTimeoutMs ?? timeoutMs;
+            if (timeoutMs <= 0) {
+                this.runtime.closeFn(new error_js_1.ClientSessionExpiredError(`Client session expired.`, timeoutMs));
+            }
             this.sessionExpiryTimer = new core_utils_1.Timer(timeoutMs, () => {
-                this.runtime.closeFn(new error_1.ClientSessionExpiredError(`Client session expired.`, timeoutMs));
+                this.runtime.closeFn(new error_js_1.ClientSessionExpiredError(`Client session expired.`, timeoutMs));
             });
             this.sessionExpiryTimer.start();
+            this.sessionExpiryTimerStarted = Date.now();
         }
-        this.summaryStateTracker = new gcSummaryStateTracker_1.GCSummaryStateTracker(this.configs, baseSnapshot?.trees[runtime_definitions_1.gcTreeKey] !== undefined /* wasGCRunInBaseSnapshot */);
-        this.telemetryTracker = new gcTelemetry_1.GCTelemetryTracker(this.mc, this.configs, this.isSummarizerClient, createParams.createContainerMetadata, (nodeId) => this.runtime.getNodeType(nodeId), (nodeId) => this.unreferencedNodesState.get(nodeId), this.getNodePackagePath);
+        this.summaryStateTracker = new gcSummaryStateTracker_js_1.GCSummaryStateTracker(this.configs, baseSnapshot?.trees[runtime_definitions_1.gcTreeKey] !== undefined /* wasGCRunInBaseSnapshot */);
+        this.telemetryTracker = new gcTelemetry_js_1.GCTelemetryTracker(this.mc, this.configs, this.isSummarizerClient, createParams.createContainerMetadata, (nodeId) => this.runtime.getNodeType(nodeId), (nodeId) => this.unreferencedNodesState.get(nodeId), this.getNodePackagePath);
         // Get the GC data from the base snapshot. Use LazyPromise because we only want to do this once since it
         // it involves fetching blobs from storage which is expensive.
         this.baseSnapshotDataP = new core_utils_1.LazyPromise(async () => {
@@ -121,7 +136,7 @@ class GarbageCollector {
                     // incremental gc summary will not work with older gc data as well
                     return undefined;
                 }
-                const snapshotData = await (0, gcHelpers_1.getGCDataFromSnapshot)(gcSnapshotTree, readAndParseBlob);
+                const snapshotData = await (0, gcHelpers_js_1.getGCDataFromSnapshot)(gcSnapshotTree, readAndParseBlob);
                 // If the GC version in base snapshot does not match the GC version currently in effect, the GC data
                 // in the snapshot cannot be interpreted correctly. Set everything to undefined except for
                 // deletedNodes because irrespective of GC versions, these nodes have been deleted and cannot be
@@ -168,7 +183,7 @@ class GarbageCollector {
             const gcNodes = {};
             for (const [nodeId, nodeData] of Object.entries(baseSnapshotData.gcState.gcNodes)) {
                 if (nodeData.unreferencedTimestampMs !== undefined) {
-                    this.unreferencedNodesState.set(nodeId, new gcUnreferencedStateTracker_1.UnreferencedStateTracker(nodeData.unreferencedTimestampMs, this.configs.inactiveTimeoutMs, currentReferenceTimestampMs, this.configs.tombstoneTimeoutMs, this.configs.sweepGracePeriodMs));
+                    this.unreferencedNodesState.set(nodeId, new gcUnreferencedStateTracker_js_1.UnreferencedStateTracker(nodeData.unreferencedTimestampMs, this.configs.inactiveTimeoutMs, currentReferenceTimestampMs, this.configs.tombstoneTimeoutMs, this.configs.sweepGracePeriodMs));
                 }
                 gcNodes[nodeId] = Array.from(nodeData.outboundRoutes);
             }
@@ -188,7 +203,7 @@ class GarbageCollector {
             // Run GC on the nodes in the base summary to get the routes used in each node in the container.
             // This is an optimization for space (vs performance) wherein we don't need to store the used routes of
             // each node in the summary.
-            const usedRoutes = (0, gcReferenceGraphAlgorithm_1.runGarbageCollection)(gcNodes, ["/"]).referencedNodeIds;
+            const usedRoutes = (0, gcReferenceGraphAlgorithm_js_1.runGarbageCollection)(gcNodes, ["/"]).referencedNodeIds;
             return { gcData: { gcNodes }, usedRoutes };
         });
         // Log all the GC options and the state determined by the garbage collector.
@@ -290,7 +305,9 @@ class GarbageCollector {
      */
     async collectGarbage(options, telemetryContext) {
         const fullGC = options.fullGC ??
-            (this.configs.runFullGC === true || this.summaryStateTracker.doesSummaryStateNeedReset);
+            (this.configs.runFullGC === true ||
+                this.summaryStateTracker.autoRecovery.fullGCRequested() ||
+                this.summaryStateTracker.doesSummaryStateNeedReset);
         // Add the options that are used to run GC to the telemetry context.
         telemetryContext?.setMultiple("fluid_GC", "Options", {
             fullGC,
@@ -366,7 +383,7 @@ class GarbageCollector {
         // 1. Generate / analyze the runtime's reference graph.
         // Get the reference graph (gcData) and run GC algorithm to get referenced / unreferenced nodes.
         const gcData = await this.runtime.getGCData(fullGC);
-        const gcResult = (0, gcReferenceGraphAlgorithm_1.runGarbageCollection)(gcData.gcNodes, ["/"]);
+        const gcResult = (0, gcReferenceGraphAlgorithm_js_1.runGarbageCollection)(gcData.gcNodes, ["/"]);
         // Get all referenced nodes - References in this run + references between the previous and current runs.
         const allReferencedNodeIds = this.findAllNodesReferencedBetweenGCs(gcData, this.gcDataFromLastRun, logger) ??
             gcResult.referencedNodeIds;
@@ -381,7 +398,7 @@ class GarbageCollector {
         // allowed to be deleted per config, and tombstone the rest along with the tombstone-ready nodes.
         // Note that no nodes will be deleted until the GC Sweep op is processed.
         this.runSweepPhase(gcResult, tombstoneReadyNodeIds, sweepReadyNodeIds);
-        this.gcDataFromLastRun = (0, gcHelpers_1.cloneGCData)(gcData);
+        this.gcDataFromLastRun = (0, gcHelpers_js_1.cloneGCData)(gcData);
         // 5. Get the sweep phase stats.
         const sweepPhaseStats = this.getSweepPhaseStats(this.deletedNodes, sweepReadyNodeIds, markPhaseStats);
         return { ...markPhaseStats, ...sweepPhaseStats };
@@ -403,31 +420,25 @@ class GarbageCollector {
     runMarkPhase(gcResult, allReferencedNodeIds, currentReferenceTimestampMs) {
         // 1. Marks all referenced nodes by clearing their unreferenced tracker, if any.
         for (const nodeId of allReferencedNodeIds) {
-            const nodeStateTracker = this.unreferencedNodesState.get(nodeId);
-            if (nodeStateTracker !== undefined) {
-                // Stop tracking so as to clear out any running timers.
-                nodeStateTracker.stopTracking();
-                // Delete the node as we don't need to track it any more.
-                this.unreferencedNodesState.delete(nodeId);
-            }
+            this.unreferencedNodesState.delete(nodeId);
         }
-        // 2. Mark unreferenced nodes in this run by starting unreferenced tracking for them.
+        // 2. Mark unreferenced nodes in this run by starting or updating unreferenced tracking for them.
         const tombstoneReadyNodeIds = new Set();
         const sweepReadyNodeIds = new Set();
         for (const nodeId of gcResult.deletedNodeIds) {
             const nodeStateTracker = this.unreferencedNodesState.get(nodeId);
             if (nodeStateTracker === undefined) {
-                this.unreferencedNodesState.set(nodeId, new gcUnreferencedStateTracker_1.UnreferencedStateTracker(currentReferenceTimestampMs, this.configs.inactiveTimeoutMs, currentReferenceTimestampMs, this.configs.tombstoneTimeoutMs, this.configs.sweepGracePeriodMs));
+                this.unreferencedNodesState.set(nodeId, new gcUnreferencedStateTracker_js_1.UnreferencedStateTracker(currentReferenceTimestampMs, this.configs.inactiveTimeoutMs, currentReferenceTimestampMs, this.configs.tombstoneTimeoutMs, this.configs.sweepGracePeriodMs));
             }
             else {
                 // If a node was already unreferenced, update its tracking information. Since the current reference time
                 // is from the ops seen, this will ensure that we keep updating unreferenced state as time moves forward.
                 nodeStateTracker.updateTracking(currentReferenceTimestampMs);
                 // If a node is tombstone or sweep-ready, store it so it can be returned.
-                if (nodeStateTracker.state === gcDefinitions_1.UnreferencedState.TombstoneReady) {
+                if (nodeStateTracker.state === gcDefinitions_js_1.UnreferencedState.TombstoneReady) {
                     tombstoneReadyNodeIds.add(nodeId);
                 }
-                if (nodeStateTracker.state === gcDefinitions_1.UnreferencedState.SweepReady) {
+                if (nodeStateTracker.state === gcDefinitions_js_1.UnreferencedState.SweepReady) {
                     sweepReadyNodeIds.add(nodeId);
                 }
             }
@@ -476,7 +487,7 @@ class GarbageCollector {
             case "ONLY_BLOBS":
                 sweepReadyNodes.forEach((nodeId) => {
                     const nodeType = this.runtime.getNodeType(nodeId);
-                    if (nodeType === gcDefinitions_1.GCNodeType.Blob) {
+                    if (nodeType === gcDefinitions_js_1.GCNodeType.Blob) {
                         nodesToDelete.push(nodeId);
                     }
                     else {
@@ -499,17 +510,17 @@ class GarbageCollector {
             // local state when processing the op.
             const sweepReadyDSAndBlobs = nodesToDelete.filter((nodeId) => {
                 const nodeType = this.runtime.getNodeType(nodeId);
-                return nodeType === gcDefinitions_1.GCNodeType.DataStore || nodeType === gcDefinitions_1.GCNodeType.Blob;
+                return nodeType === gcDefinitions_js_1.GCNodeType.DataStore || nodeType === gcDefinitions_js_1.GCNodeType.Blob;
             });
             const contents = {
-                type: gcDefinitions_1.GarbageCollectionMessageType.Sweep,
+                type: gcDefinitions_js_1.GarbageCollectionMessageType.Sweep,
                 deletedNodeIds: sweepReadyDSAndBlobs,
             };
             // Its fine for older clients to ignore this op because it doesn't have any functional impact. This op
             // is an optimization to ensure that all clients are in sync when it comes to deleted nodes to prevent their
             // accidental usage. The clients will sync without the delete op too but it may take longer.
             const containerGCMessage = {
-                type: messageTypes_1.ContainerMessageType.GC,
+                type: messageTypes_js_1.ContainerMessageType.GC,
                 contents,
                 compatDetails: { behavior: "Ignore" },
             };
@@ -564,7 +575,7 @@ class GarbageCollector {
          * - We don't require DDSes handles to be stored in a referenced DDS.
          * - A new data store may have "root" DDSes already created and we don't detect them today.
          */
-        const gcDataSuperSet = (0, gcHelpers_1.concatGarbageCollectionData)(previousGCData, currentGCData);
+        const gcDataSuperSet = (0, gcHelpers_js_1.concatGarbageCollectionData)(previousGCData, currentGCData);
         const newOutboundRoutesSinceLastRun = [];
         this.newReferencesSinceLastRun.forEach((outboundRoutes, sourceNodeId) => {
             if (gcDataSuperSet.gcNodes[sourceNodeId] === undefined) {
@@ -582,7 +593,7 @@ class GarbageCollector {
          * Note that some of these nodes may be unreferenced now and if so, the current run will mark them as
          * unreferenced and add unreferenced state.
          */
-        const gcResult = (0, gcReferenceGraphAlgorithm_1.runGarbageCollection)(gcDataSuperSet.gcNodes, [
+        const gcResult = (0, gcReferenceGraphAlgorithm_js_1.runGarbageCollection)(gcDataSuperSet.gcNodes, [
             "/",
             ...newOutboundRoutesSinceLastRun,
         ]);
@@ -604,7 +615,7 @@ class GarbageCollector {
                 unreferencedTimestampMs: this.unreferencedNodesState.get(nodeId)?.unreferencedTimestampMs,
             };
         }
-        return this.summaryStateTracker.summarize(fullTree, trackState, gcState, this.deletedNodes, this.tombstones);
+        return this.summaryStateTracker.summarize(trackState && !fullTree, gcState, this.deletedNodes, this.tombstones);
     }
     getMetadata() {
         return {
@@ -631,15 +642,28 @@ class GarbageCollector {
      * @param local - Whether it was send by this client.
      */
     processMessage(message, local) {
-        switch (message.contents.type) {
-            case "Sweep": {
+        const gcMessageType = message.contents.type;
+        switch (gcMessageType) {
+            case gcDefinitions_js_1.GarbageCollectionMessageType.Sweep: {
                 // Delete the nodes whose ids are present in the contents.
                 this.deleteSweepReadyNodes(message.contents.deletedNodeIds);
                 break;
             }
+            case gcDefinitions_js_1.GarbageCollectionMessageType.TombstoneLoaded: {
+                if (this.mc.config.getBoolean(gcDefinitions_js_1.disableAutoRecoveryKey) === true) {
+                    break;
+                }
+                // Mark the node as referenced to ensure it isn't Swept
+                const tombstonedNodePath = message.contents.nodePath;
+                this.addedOutboundReference("/", tombstonedNodePath, true /* autorecovery */);
+                // In case the cause of the TombstoneLoaded event is incorrect GC Data (i.e. the object is actually reachable),
+                // do fullGC on the next run to get a chance to repair (in the likely case the bug is not deterministic)
+                this.summaryStateTracker.autoRecovery.requestFullGCOnNextRun();
+                break;
+            }
             default: {
-                if (!(0, gcHelpers_1.compatBehaviorAllowsGCMessageType)(message.contents.type, message.compatDetails?.behavior)) {
-                    const error = telemetry_utils_1.DataProcessingError.create(`Garbage collection message of unknown type ${message.contents.type}`, "processMessage");
+                if (!(0, gcHelpers_js_1.compatBehaviorAllowsGCMessageType)(gcMessageType, message.compatDetails?.behavior)) {
+                    const error = telemetry_utils_1.DataProcessingError.create(`Garbage collection message of unknown type ${gcMessageType}`, "processMessage");
                     throw error;
                 }
                 break;
@@ -678,13 +702,9 @@ class GarbageCollector {
         const deletedNodeIds = this.runtime.deleteSweepReadyNodes(allSweepReadyNodeIds);
         // Clear unreferenced state tracking for deleted nodes.
         for (const nodeId of deletedNodeIds) {
-            const nodeStateTracker = this.unreferencedNodesState.get(nodeId);
-            if (nodeStateTracker !== undefined) {
-                // Stop tracking so as to clear out any running timers.
-                nodeStateTracker.stopTracking();
-                // Delete the node as we don't need to track it any more.
-                this.unreferencedNodesState.delete(nodeId);
-            }
+            // Usually we avoid modifying the set of unreferencedNodesState keys in between GC runs,
+            // but this is ok since this node won't exist at all in the next GC run.
+            this.unreferencedNodesState.delete(nodeId);
             this.deletedNodes.add(nodeId);
         }
     }
@@ -714,17 +734,24 @@ class GarbageCollector {
             lastSummaryTime: this.getLastSummaryTimestampMs(),
             headers: headerData,
         });
+        // Any time we log a Tombstone Loaded error (via Telemetry Tracker),
+        // we want to also trigger autorecovery to avoid the object being deleted
+        // Note: We don't need to trigger on "Changed" because any change will cause the object
+        // to be loaded by the Summarizer, and auto-recovery will be triggered then.
+        if (isTombstoned && reason === "Loaded") {
+            // Note that when a DataStore and its DDS are all loaded, each will trigger AutoRecovery for itself.
+            this.triggerAutoRecovery(nodePath);
+        }
         const nodeType = this.runtime.getNodeType(nodePath);
         // Unless this is a Loaded event for a Blob or DataStore, we're done after telemetry tracking
-        if (reason !== "Loaded" || ![gcDefinitions_1.GCNodeType.Blob, gcDefinitions_1.GCNodeType.DataStore].includes(nodeType)) {
+        if (reason !== "Loaded" || ![gcDefinitions_js_1.GCNodeType.Blob, gcDefinitions_js_1.GCNodeType.DataStore].includes(nodeType)) {
             return;
         }
         const errorRequest = request ?? { url: nodePath };
-        // If the object is tombstoned and tombstone enforcement is configured, throw an error.
         if (isTombstoned && this.throwOnTombstoneLoad && headerData?.allowTombstone !== true) {
             // The requested data store is removed by gc. Create a 404 gc response exception.
             throw (0, runtime_utils_1.responseToException)((0, runtime_utils_1.createResponseError)(404, `${nodeType} was tombstoned`, errorRequest, {
-                [containerRuntime_1.TombstoneResponseHeaderKey]: true,
+                [containerRuntime_js_1.TombstoneResponseHeaderKey]: true,
             }), errorRequest);
         }
         // If the object is inactive and inactive enforcement is configured, throw an error.
@@ -734,19 +761,45 @@ class GarbageCollector {
                 headerData?.allowInactive !== true;
             if (shouldThrowOnInactiveLoad) {
                 throw (0, runtime_utils_1.responseToException)((0, runtime_utils_1.createResponseError)(404, `${nodeType} is inactive`, errorRequest, {
-                    [containerRuntime_1.InactiveResponseHeaderKey]: true,
+                    [containerRuntime_js_1.InactiveResponseHeaderKey]: true,
                 }), errorRequest);
             }
         }
     }
+    /**
+     * The given node should have its unreferenced state reset in the next GC,
+     * even if the true GC graph shows it is unreferenced. This will
+     * prevent it from being deleted by Sweep (after the Grace Period).
+     *
+     * Submit a GC op indicating that the Tombstone with the given path has been loaded.
+     * Broadcasting this information in the op stream allows the Summarizer to reset unreferenced state
+     * before runnint GC next.
+     */
+    triggerAutoRecovery(nodePath) {
+        if (this.mc.config.getBoolean(gcDefinitions_js_1.disableAutoRecoveryKey) === true) {
+            return;
+        }
+        // Use compat behavior "Ignore" since this is an optimization to opportunistically protect
+        // objects from deletion, so it's fine for older clients to ignore this op.
+        const containerGCMessage = {
+            type: messageTypes_js_1.ContainerMessageType.GC,
+            contents: {
+                type: gcDefinitions_js_1.GarbageCollectionMessageType.TombstoneLoaded,
+                nodePath,
+            },
+            compatDetails: { behavior: "Ignore" },
+        };
+        this.submitMessage(containerGCMessage);
+    }
     /**
      * Called when an outbound reference is added to a node. This is used to identify all nodes that have been
      * referenced between summaries so that their unreferenced timestamp can be reset.
      *
      * @param fromNodePath - The node from which the reference is added.
      * @param toNodePath - The node to which the reference is added.
+     * @param autorecovery - This reference is added artificially, for autorecovery. Used for logging.
      */
-    addedOutboundReference(fromNodePath, toNodePath) {
+    addedOutboundReference(fromNodePath, toNodePath, autorecovery) {
         if (!this.configs.shouldRunGC) {
             return;
         }
@@ -772,7 +825,13 @@ class GarbageCollector {
             isTombstoned: this.tombstones.includes(toNodePath),
             lastSummaryTime: this.getLastSummaryTimestampMs(),
             fromId: fromNodePath,
+            autorecovery,
         });
+        // This node is referenced - Clear its unreferenced state
+        // But don't delete the node id from the map yet.
+        // When generating GC stats, the set of nodes in here is used as the baseline for
+        // what was unreferenced in the last GC run.
+        this.unreferencedNodesState.get(toNodePath)?.stopTracking();
     }
     /**
      * Returns whether a node with the given path has been deleted or not. This can be used by the runtime to identify
@@ -802,33 +861,33 @@ class GarbageCollector {
             updatedDataStoreCount: 0,
             updatedAttachmentBlobCount: 0,
         };
-        const updateNodeStats = (nodeId, referenced) => {
+        const updateNodeStats = (nodeId, isReferenced) => {
             markPhaseStats.nodeCount++;
             // If there is no previous GC data, every node's state is generated and is considered as updated.
             // Otherwise, find out if any node went from referenced to unreferenced or vice-versa.
-            const stateUpdated = this.gcDataFromLastRun === undefined ||
-                this.unreferencedNodesState.has(nodeId) === referenced;
+            const wasNotReferenced = this.unreferencedNodesState.has(nodeId);
+            const stateUpdated = this.gcDataFromLastRun === undefined || wasNotReferenced === isReferenced;
             if (stateUpdated) {
                 markPhaseStats.updatedNodeCount++;
             }
-            if (!referenced) {
+            if (!isReferenced) {
                 markPhaseStats.unrefNodeCount++;
             }
-            if (this.runtime.getNodeType(nodeId) === gcDefinitions_1.GCNodeType.DataStore) {
+            if (this.runtime.getNodeType(nodeId) === gcDefinitions_js_1.GCNodeType.DataStore) {
                 markPhaseStats.dataStoreCount++;
                 if (stateUpdated) {
                     markPhaseStats.updatedDataStoreCount++;
                 }
-                if (!referenced) {
+                if (!isReferenced) {
                     markPhaseStats.unrefDataStoreCount++;
                 }
             }
-            if (this.runtime.getNodeType(nodeId) === gcDefinitions_1.GCNodeType.Blob) {
+            if (this.runtime.getNodeType(nodeId) === gcDefinitions_js_1.GCNodeType.Blob) {
                 markPhaseStats.attachmentBlobCount++;
                 if (stateUpdated) {
                     markPhaseStats.updatedAttachmentBlobCount++;
                 }
-                if (!referenced) {
+                if (!isReferenced) {
                     markPhaseStats.unrefAttachmentBlobCount++;
                 }
             }
@@ -864,24 +923,24 @@ class GarbageCollector {
         // be good enough because the only types that participate in GC today are data stores, DDSes and blobs.
         const getDeletedNodeType = (nodeId) => {
             const pathParts = nodeId.split("/");
-            if (pathParts[1] === blobManager_1.BlobManager.basePath) {
-                return gcDefinitions_1.GCNodeType.Blob;
+            if (pathParts[1] === blobManager_js_1.BlobManager.basePath) {
+                return gcDefinitions_js_1.GCNodeType.Blob;
             }
             if (pathParts.length === 2) {
-                return gcDefinitions_1.GCNodeType.DataStore;
+                return gcDefinitions_js_1.GCNodeType.DataStore;
             }
             if (pathParts.length === 3) {
-                return gcDefinitions_1.GCNodeType.SubDataStore;
+                return gcDefinitions_js_1.GCNodeType.SubDataStore;
             }
-            return gcDefinitions_1.GCNodeType.Other;
+            return gcDefinitions_js_1.GCNodeType.Other;
         };
         for (const nodeId of deletedNodes) {
             sweepPhaseStats.deletedNodeCount++;
             const nodeType = getDeletedNodeType(nodeId);
-            if (nodeType === gcDefinitions_1.GCNodeType.DataStore) {
+            if (nodeType === gcDefinitions_js_1.GCNodeType.DataStore) {
                 sweepPhaseStats.deletedDataStoreCount++;
             }
-            else if (nodeType === gcDefinitions_1.GCNodeType.Blob) {
+            else if (nodeType === gcDefinitions_js_1.GCNodeType.Blob) {
                 sweepPhaseStats.deletedAttachmentBlobCount++;
             }
         }
@@ -899,10 +958,10 @@ class GarbageCollector {
         for (const nodeId of sweepReadyNodes) {
             sweepPhaseStats.deletedNodeCount++;
             const nodeType = this.runtime.getNodeType(nodeId);
-            if (nodeType === gcDefinitions_1.GCNodeType.DataStore) {
+            if (nodeType === gcDefinitions_js_1.GCNodeType.DataStore) {
                 sweepPhaseStats.deletedDataStoreCount++;
             }
-            else if (nodeType === gcDefinitions_1.GCNodeType.Blob) {
+            else if (nodeType === gcDefinitions_js_1.GCNodeType.Blob) {
                 sweepPhaseStats.deletedAttachmentBlobCount++;
             }
         }