@fluidframework/container-runtime 2.1.0 → 2.2.0

package/src/dataStoreContext.ts

@@ -69,7 +69,6 @@ import {
 	tagCodeArtifacts,
 } from "@fluidframework/telemetry-utils/internal";
 
-import { sendGCUnexpectedUsageEvent } from "./gc/index.js";
 import {
 	// eslint-disable-next-line import/no-deprecated
 	ReadFluidDataStoreAttributes,
@@ -254,9 +253,15 @@ export abstract class FluidDataStoreContext
 	public get tombstoned() {
 		return this._tombstoned;
 	}
-	/** If true, throw an error when a tombstone data store is used. */
-	public readonly gcThrowOnTombstoneUsage: boolean;
-	public readonly gcTombstoneEnforcementAllowed: boolean;
+	/**
+	 * If true, throw an error when a tombstone data store is used.
+	 * @deprecated NOT SUPPORTED - hardcoded to return false since it's deprecated.
+	 */
+	public readonly gcThrowOnTombstoneUsage: boolean = false;
+	/**
+	 * @deprecated NOT SUPPORTED - hardcoded to return false since it's deprecated.
+	 */
+	public readonly gcTombstoneEnforcementAllowed: boolean = false;
 
 	/** If true, this means that this data store context and its children have been removed from the runtime */
 	protected deleted: boolean = false;
@@ -333,10 +338,6 @@ export abstract class FluidDataStoreContext
 	 */
 	private localChangesTelemetryCount: number;
 
-	// The used routes of this node as per the last GC run. This is used to update the used routes of the channel
-	// if it realizes after GC is run.
-	private lastUsedRoutes: string[] | undefined;
-
 	public readonly id: string;
 	private readonly _containerRuntime: IContainerRuntimeBase;
 	private readonly parentContext: IFluidParentContext;
@@ -399,9 +400,6 @@ export abstract class FluidDataStoreContext
 			this.mc.logger,
 		);
 
-		this.gcThrowOnTombstoneUsage = this.parentContext.gcThrowOnTombstoneUsage;
-		this.gcTombstoneEnforcementAllowed = this.parentContext.gcTombstoneEnforcementAllowed;
-
 		// By default, a data store can log maximum 10 local changes telemetry in summarizer.
 		this.localChangesTelemetryCount =
 			this.mc.config.getNumber("Fluid.Telemetry.LocalChangesTelemetryCount") ?? 10;
@@ -570,16 +568,8 @@ export abstract class FluidDataStoreContext
 	): void {
 		const safeTelemetryProps = extractSafePropertiesFromMessage(message);
 		// On op process, tombstone error is logged in garbage collector. So, set "checkTombstone" to false when calling
-		// "verifyNotClosed" which logs tombstone errors. Throw error if tombstoned and throwing on load is configured.
+		// "verifyNotClosed" which logs tombstone errors.
 		this.verifyNotClosed("process", false /* checkTombstone */, safeTelemetryProps);
-		if (this.tombstoned && this.gcThrowOnTombstoneUsage) {
-			throw DataProcessingError.create(
-				"Context is tombstoned! Call site [process]",
-				"process",
-				undefined /* sequencedMessage */,
-				safeTelemetryProps,
-			);
-		}
 
 		this.summarizerNode.recordChange(message);
 
@@ -698,17 +688,10 @@ export abstract class FluidDataStoreContext
 
 	/**
 	 * After GC has run, called to notify the data store of routes used in it. These are used for the following:
-	 *
 	 * 1. To identify if this data store is being referenced in the document or not.
-	 *
 	 * 2. To determine if it needs to re-summarize in case used routes changed since last summary.
-	 *
-	 * 3. These are added to the summary generated by the data store.
-	 *
-	 * 4. To notify child contexts of their used routes. This is done immediately if the data store is loaded.
-	 * Else, it is done when realizing the data store.
-	 *
-	 * 5. To update the timestamp when this data store or any children are marked as unreferenced.
+	 * 3. To notify child contexts of their used routes. This is done immediately if the data store is loaded.
+	 * Else, it is done by the data stores's summarizer node when child summarizer nodes are created.
 	 *
 	 * @param usedRoutes - The routes that are used in this data store.
 	 */
@@ -716,18 +699,17 @@ export abstract class FluidDataStoreContext
 		// Update the used routes in this data store's summarizer node.
 		this.summarizerNode.updateUsedRoutes(usedRoutes);
 
-		/**
-		 * Store the used routes to update the channel if the data store is not loaded yet. If the used routes changed
-		 * since the previous run, the data store will be loaded during summarize since the used state changed. So, it's
-		 * safe to only store the last used routes.
-		 */
-		this.lastUsedRoutes = usedRoutes;
-
-		// If we are loaded, call the channel so it can update the used routes of the child contexts.
-		// If we are not loaded, we will update this when we are realized.
-		if (this.loaded) {
-			this.updateChannelUsedRoutes();
+		// If the channel doesn't exist yet (data store is not realized), the summarizer node will update it
+		// when it creates child nodes.
+		if (!this.channel) {
+			return;
 		}
+
+		// Remove the route to this data store, if it exists.
+		const usedChannelRoutes = usedRoutes.filter((id: string) => {
+			return id !== "/" && id !== "";
+		});
+		this.channel.updateUsedRoutes(usedChannelRoutes);
 	}
 
 	/**
@@ -742,31 +724,6 @@ export abstract class FluidDataStoreContext
 		this.parentContext.addedGCOutboundRoute(fromPath, toPath, messageTimestampMs);
 	}
 
-	/**
-	 * Updates the used routes of the channel and its child contexts. The channel must be loaded before calling this.
-	 * It is called in these two scenarios:
-	 * 1. When the used routes of the data store is updated and the data store is loaded.
-	 * 2. When the data store is realized. This updates the channel's used routes as per last GC run.
-	 */
-	private updateChannelUsedRoutes() {
-		assert(this.loaded, 0x144 /* "Channel should be loaded when updating used routes" */);
-		assert(
-			this.channel !== undefined,
-			0x145 /* "Channel should be present when data store is loaded" */,
-		);
-
-		// If there is no lastUsedRoutes, GC has not run up until this point.
-		if (this.lastUsedRoutes === undefined) {
-			return;
-		}
-
-		// Remove the route to this data store, if it exists.
-		const usedChannelRoutes = this.lastUsedRoutes.filter((id: string) => {
-			return id !== "/" && id !== "";
-		});
-		this.channel.updateUsedRoutes(usedChannelRoutes);
-	}
-
 	/**
 	 * @deprecated 0.18.Should call request on the runtime directly
 	 */
@@ -861,15 +818,6 @@ export abstract class FluidDataStoreContext
 		// Freeze the package path to ensure that someone doesn't modify it when it is
 		// returned in packagePath().
 		Object.freeze(this.pkg);
-
-		/**
-		 * Update the used routes of the channel. If GC has run before this data store was realized, we will have
-		 * the used routes saved. So, this will ensure that all the child contexts have up-to-date used routes as
-		 * per the last time GC was run.
-		 * Also, this data store may have been realized during summarize. In that case, the child contexts need to
-		 * have their used routes updated to determine if its needs to summarize again and to add it to the summary.
-		 */
-		this.updateChannelUsedRoutes();
 	}
 
 	protected async bindRuntime(channel: IFluidDataStoreChannel, existing: boolean) {
@@ -999,20 +947,14 @@ export abstract class FluidDataStoreContext
 				safeTelemetryProps,
 			);
 
-			sendGCUnexpectedUsageEvent(
-				this.mc,
+			this.mc.logger.sendTelemetryEvent(
 				{
 					eventName: "GC_Tombstone_DataStore_Changed",
-					category: this.gcThrowOnTombstoneUsage ? "error" : "generic",
-					gcTombstoneEnforcementAllowed: this.gcTombstoneEnforcementAllowed,
+					category: "generic",
 					callSite,
 				},
-				this.pkg,
 				error,
 			);
-			if (this.gcThrowOnTombstoneUsage) {
-				throw error;
-			}
 		}
 	}
 
@@ -1036,7 +978,7 @@ export abstract class FluidDataStoreContext
 			eventName,
 			type,
 			isSummaryInProgress: this.summarizerNode.isSummaryInProgress?.(),
-			stack: generateStack(),
+			stack: generateStack(30),
 		});
 		this.localChangesTelemetryCount--;
 	}
@@ -1378,16 +1320,10 @@ export class LocalFluidDataStoreContextBase extends FluidDataStoreContext {
 	 */
 	public delete() {
 		// TODO: GC:Validation - potentially prevent this from happening or asserting. Maybe throw here.
-		sendGCUnexpectedUsageEvent(
-			this.mc,
-			{
-				eventName: "GC_Deleted_DataStore_Unexpected_Delete",
-				message: "Unexpected deletion of a local data store context",
-				category: "error",
-				gcTombstoneEnforcementAllowed: undefined,
-			},
-			this.pkg,
-		);
+		this.mc.logger.sendErrorEvent({
+			eventName: "GC_Deleted_DataStore_Unexpected_Delete",
+			message: "Unexpected deletion of a local data store context",
+		});
 		super.delete();
 	}
 }

package/src/gc/garbageCollection.ts

@@ -27,7 +27,7 @@ import {
 } from "@fluidframework/telemetry-utils/internal";
 
 import { blobManagerBasePath } from "../blobManager/index.js";
-import { InactiveResponseHeaderKey, TombstoneResponseHeaderKey } from "../containerRuntime.js";
+import { TombstoneResponseHeaderKey } from "../containerRuntime.js";
 import { ClientSessionExpiredError } from "../error.js";
 import { ContainerMessageType, ContainerRuntimeGCMessage } from "../messageTypes.js";
 import { IRefreshSummaryResult } from "../summary/index.js";
@@ -47,7 +47,6 @@ import {
 	IMarkPhaseStats,
 	ISweepPhaseStats,
 	UnreferencedState,
-	disableAutoRecoveryKey,
 	type IGCNodeUpdatedProps,
 } from "./gcDefinitions.js";
 import {
@@ -102,7 +101,7 @@ export class GarbageCollector implements IGarbageCollector {
 	private readonly configs: IGarbageCollectorConfigs;
 
 	public get shouldRunGC(): boolean {
-		return this.configs.gcEnabled;
+		return this.configs.gcAllowed;
 	}
 
 	public readonly sessionExpiryTimerStarted: number | undefined;
@@ -143,19 +142,6 @@ export class GarbageCollector implements IGarbageCollector {
 	private readonly summaryStateTracker: GCSummaryStateTracker;
 	private readonly telemetryTracker: GCTelemetryTracker;
 
-	/** If false, loading or using a Tombstoned object should merely log, not fail */
-	public get tombstoneEnforcementAllowed(): boolean {
-		return this.configs.sweepEnabled;
-	}
-	/** If true, throw an error when a tombstone data store is retrieved */
-	public get throwOnTombstoneLoad(): boolean {
-		return this.configs.throwOnTombstoneLoad;
-	}
-	/** If true, throw an error when a tombstone data store is used */
-	public get throwOnTombstoneUsage(): boolean {
-		return this.configs.throwOnTombstoneUsage;
-	}
-
 	/** For a given node path, returns the node's package path. */
 	private readonly getNodePackagePath: (
 		nodePath: string,
@@ -377,9 +363,8 @@ export class GarbageCollector implements IGarbageCollector {
 			this.deletedNodes = new Set(baseSnapshotData.deletedNodes);
 		}
 
-		// If running in tombstone mode, initialize the tombstone state from the snapshot. Also, notify the runtime of
-		// tombstone routes.
-		if (this.configs.tombstoneMode && baseSnapshotData.tombstones !== undefined) {
+		// Initialize the tombstone state from the snapshot. Also, notify the runtime of tombstone routes.
+		if (baseSnapshotData.tombstones !== undefined) {
 			// Create a copy since we are writing from a source we don't control
 			this.tombstones = Array.from(baseSnapshotData.tombstones);
 			this.runtime.updateTombstonedRoutes(this.tombstones);
@@ -525,7 +510,7 @@ export class GarbageCollector implements IGarbageCollector {
 					...gcStats,
 					details: {
 						timestamp: currentReferenceTimestampMs,
-						sweep: this.configs.shouldRunSweep,
+						sweep: this.configs.sweepEnabled,
 						tombstone: this.configs.throwOnTombstoneLoad,
 					},
 				});
@@ -699,34 +684,18 @@ export class GarbageCollector implements IGarbageCollector {
 		// This is important because a container may never load during a node's Sweep Grace Period,
 		// so that node would directly become sweep-ready skipping over tombstone-ready state,
 		// but should be Tombstoned since Sweep is disabled.
-		const { nodesToTombstone, nodesToDelete } = {
-			nodesToTombstone: [...tombstoneReadyNodes],
-			nodesToDelete: [] as string[],
-		};
-		switch (this.configs.shouldRunSweep) {
-			case "YES":
-				nodesToDelete.push(...sweepReadyNodes);
-				break;
-			case "ONLY_BLOBS":
-				sweepReadyNodes.forEach((nodeId) => {
-					const nodeType = this.runtime.getNodeType(nodeId);
-					if (nodeType === GCNodeType.Blob) {
-						nodesToDelete.push(nodeId);
-					} else {
-						nodesToTombstone.push(nodeId);
-					}
-				});
-				break;
-			default: // case "NO":
-				nodesToTombstone.push(...sweepReadyNodes);
-				break;
-		}
+		const { nodesToTombstone, nodesToDelete } = this.configs.sweepEnabled
+			? {
+					nodesToDelete: [...sweepReadyNodes],
+					nodesToTombstone: [...tombstoneReadyNodes],
+				}
+			: {
+					nodesToDelete: [],
+					nodesToTombstone: [...tombstoneReadyNodes, ...sweepReadyNodes],
+				};
 
-		if (this.configs.tombstoneMode) {
-			this.tombstones = nodesToTombstone;
-			// If we are running in GC tombstone mode, update tombstoned routes.
-			this.runtime.updateTombstonedRoutes(this.tombstones);
-		}
+		this.tombstones = nodesToTombstone;
+		this.runtime.updateTombstonedRoutes(this.tombstones);
 
 		if (nodesToDelete.length > 0) {
 			// Do not send DDS node ids in the GC op. This is an optimization to reduce its size. Since GC applies to
@@ -876,10 +845,10 @@ export class GarbageCollector implements IGarbageCollector {
 	public getMetadata(): IGCMetadata {
 		return {
 			/**
-			 * If GC is enabled, the GC data is written using the GC version in effect and that is the gcFeature that goes
+			 * If GC is allowed, the GC data is written using the GC version in effect and that is the gcFeature that goes
 			 * into the metadata blob. If GC is disabled, the gcFeature is 0.
 			 */
-			gcFeature: this.configs.gcEnabled ? this.configs.gcVersionInEffect : 0,
+			gcFeature: this.configs.gcAllowed ? this.configs.gcVersionInEffect : 0,
 			gcFeatureMatrix: this.configs.persistedGcFeatureMatrix,
 			sessionExpiryTimeoutMs: this.configs.sessionExpiryTimeoutMs,
 			sweepEnabled: false, // DEPRECATED - to be removed
@@ -913,13 +882,6 @@ export class GarbageCollector implements IGarbageCollector {
 				break;
 			}
 			case GarbageCollectionMessageType.TombstoneLoaded: {
-				if (
-					!this.configs.tombstoneAutorecoveryEnabled ||
-					this.mc.config.getBoolean(disableAutoRecoveryKey) === true
-				) {
-					break;
-				}
-
 				// Mark the node as referenced to ensure it isn't Swept
 				const tombstonedNodePath = message.contents.nodePath;
 				this.addedOutboundReference(
@@ -1015,8 +977,6 @@ export class GarbageCollector implements IGarbageCollector {
 		// trackedId will be either DataStore or Blob ID (not sub-DataStore ID, since some of those are unrecognized by GC)
 		const trackedId = node.path;
 		const isTombstoned = this.tombstones.includes(trackedId);
-		const isInactive = this.unreferencedNodesState.get(trackedId)?.state === "Inactive";
-
 		const fullPath = request !== undefined ? urlToGCNodePath(request.url) : trackedId;
 
 		// This will log if appropriate
@@ -1054,7 +1014,11 @@ export class GarbageCollector implements IGarbageCollector {
 		}
 
 		const errorRequest: IRequest = request ?? { url: fullPath };
-		if (isTombstoned && this.throwOnTombstoneLoad && headerData?.allowTombstone !== true) {
+		if (
+			isTombstoned &&
+			this.configs.throwOnTombstoneLoad &&
+			headerData?.allowTombstone !== true
+		) {
 			// The requested data store is removed by gc. Create a 404 gc response exception.
 			throw responseToException(
 				createResponseError(404, `${nodeType} was tombstoned`, errorRequest, {
@@ -1063,22 +1027,6 @@ export class GarbageCollector implements IGarbageCollector {
 				errorRequest,
 			);
 		}
-
-		// If the object is inactive and inactive enforcement is configured, throw an error.
-		if (isInactive) {
-			const shouldThrowOnInactiveLoad =
-				!this.isSummarizerClient &&
-				this.configs.throwOnInactiveLoad === true &&
-				headerData?.allowInactive !== true;
-			if (shouldThrowOnInactiveLoad) {
-				throw responseToException(
-					createResponseError(404, `${nodeType} is inactive`, errorRequest, {
-						[InactiveResponseHeaderKey]: true,
-					}),
-					errorRequest,
-				);
-			}
-		}
 	}
 
 	/**
@@ -1091,10 +1039,9 @@ export class GarbageCollector implements IGarbageCollector {
 	 * before runnint GC next.
 	 */
 	private triggerAutoRecovery(nodePath: string) {
-		if (
-			!this.configs.tombstoneAutorecoveryEnabled ||
-			this.mc.config.getBoolean(disableAutoRecoveryKey) === true
-		) {
+		// If sweep isn't enabled, auto-recovery isn't needed since its purpose is to prevent this object from being
+		// deleted. It also would end up sending a GC op which can break clients running FF version 1.x.
+		if (!this.configs.sweepEnabled) {
 			return;
 		}
 

package/src/gc/gcConfigs.ts

@@ -20,17 +20,12 @@ import {
 	defaultInactiveTimeoutMs,
 	defaultSessionExpiryDurationMs,
 	defaultSweepGracePeriodMs,
-	disableDatastoreSweepKey,
-	disableTombstoneKey,
-	gcDisableDataStoreSweepOptionName,
-	gcDisableThrowOnTombstoneLoadOptionName,
 	gcGenerationOptionName,
 	gcTestModeKey,
 	maxSnapshotCacheExpiryMs,
 	oneDayMs,
 	runSessionExpiryKey,
-	throwOnTombstoneLoadOverrideKey,
-	throwOnTombstoneUsageKey,
+	disableThrowOnTombstoneLoadKey,
 } from "./gcDefinitions.js";
 import { getGCVersion, getGCVersionInEffect, shouldAllowGcSweep } from "./gcHelpers.js";
 
@@ -52,7 +47,7 @@ export function generateGCConfigs(
 		isSummarizerClient: boolean;
 	},
 ): IGarbageCollectorConfigs {
-	let gcEnabled: boolean = true;
+	let gcAllowed: boolean = true;
 	let sessionExpiryTimeoutMs: number | undefined;
 	let tombstoneTimeoutMs: number | undefined;
 	let persistedGcFeatureMatrix: GCFeatureMatrix | undefined;
@@ -70,7 +65,7 @@ export function generateGCConfigs(
 		gcVersionInBaseSnapshot = getGCVersion(metadata);
 		// Existing documents which did not have metadata blob or had GC disabled have GC version as 0. GC will be
 		// disabled for these documents.
-		gcEnabled = gcVersionInBaseSnapshot !== 0;
+		gcAllowed = gcVersionInBaseSnapshot !== 0;
 		sessionExpiryTimeoutMs = metadata?.sessionExpiryTimeoutMs;
 		const legacyPersistedSweepTimeoutMs = (metadata as IGCMetadata_Deprecated)?.sweepTimeoutMs;
 		tombstoneTimeoutMs =
@@ -107,32 +102,18 @@ export function generateGCConfigs(
 	);
 
 	/**
-	 * Whether sweep should run or not. This refers to whether Tombstones should fail on load and whether
+	 * Whether sweep is enabled for this session or not. If sweep is enabled, Tombstones should fail on load and
 	 * sweep-ready nodes should be deleted.
 	 *
-	 * Assuming overall GC is enabled and tombstoneTimeout is provided, the following conditions have to be met to run sweep:
+	 * Assuming overall GC is allowed and tombstoneTimeout is provided, the following conditions have to be met to run sweep:
 	 *
 	 * 1. Sweep should be allowed in this container.
-	 * 2. Sweep should be enabled for this session, optionally restricted to attachment blobs only.
-	 *
-	 * These conditions can be overridden via the RunSweep feature flag.
+	 * 2. Sweep should be enabled for this session.
 	 */
 	const sweepEnabled: boolean =
-		!gcEnabled || tombstoneTimeoutMs === undefined
+		!gcAllowed || tombstoneTimeoutMs === undefined
 			? false
 			: sweepAllowed && createParams.gcOptions.enableGCSweep === true;
-	const disableDatastoreSweep =
-		mc.config.getBoolean(disableDatastoreSweepKey) === true ||
-		createParams.gcOptions[gcDisableDataStoreSweepOptionName] === true;
-	const shouldRunSweep: IGarbageCollectorConfigs["shouldRunSweep"] = sweepEnabled
-		? disableDatastoreSweep
-			? "ONLY_BLOBS"
-			: "YES"
-		: "NO";
-
-	// If we aren't running sweep, also disable AutoRecovery which also emits the GC op.
-	// This gives a simple control surface for compability concerns around introducing the new op.
-	const tombstoneAutorecoveryEnabled = shouldRunSweep !== "NO";
 
 	// Override inactive timeout if test config or gc options to override it is set.
 	const inactiveTimeoutMs =
@@ -148,9 +129,6 @@ export function generateGCConfigs(
 	// Whether we are running in test mode. In this mode, unreferenced nodes are immediately deleted.
 	const testMode =
 		mc.config.getBoolean(gcTestModeKey) ?? createParams.gcOptions.runGCInTestMode === true;
-	// Whether we are running in tombstone mode. If disabled, tombstone data will not be written to or read from snapshots,
-	// and objects will not be marked as tombstoned even if they pass to the "TombstoneReady" state during the session.
-	const tombstoneMode = mc.config.getBoolean(disableTombstoneKey) !== true;
 	const runFullGC = createParams.gcOptions.runFullGC;
 
 	const sweepGracePeriodMs =
@@ -159,26 +137,17 @@ export function generateGCConfigs(
 		sweepGracePeriodMs,
 	});
 
-	const throwOnInactiveLoad: boolean | undefined = createParams.gcOptions.throwOnInactiveLoad;
-
-	const throwOnTombstoneLoadConfig =
-		mc.config.getBoolean(throwOnTombstoneLoadOverrideKey) ??
-		createParams.gcOptions[gcDisableThrowOnTombstoneLoadOptionName] !== true;
 	const throwOnTombstoneLoad =
-		throwOnTombstoneLoadConfig && sweepAllowed && !createParams.isSummarizerClient;
-	const throwOnTombstoneUsage =
-		mc.config.getBoolean(throwOnTombstoneUsageKey) === true &&
-		sweepAllowed &&
+		mc.config.getBoolean(disableThrowOnTombstoneLoadKey) !== true &&
+		sweepEnabled &&
 		!createParams.isSummarizerClient;
 
 	return {
-		gcEnabled, // For this document
-		sweepEnabled: sweepAllowed, // For this document (based on current GC Generation option)
-		tombstoneAutorecoveryEnabled,
-		shouldRunSweep, // For this session
+		gcAllowed, // For this document
+		sweepAllowed, // For this document
+		sweepEnabled, // For this session
 		runFullGC,
 		testMode,
-		tombstoneMode,
 		sessionExpiryTimeoutMs,
 		tombstoneTimeoutMs,
 		sweepGracePeriodMs,
@@ -186,9 +155,7 @@ export function generateGCConfigs(
 		persistedGcFeatureMatrix,
 		gcVersionInBaseSnapshot,
 		gcVersionInEffect: getGCVersionInEffect(mc.config),
-		throwOnInactiveLoad,
 		throwOnTombstoneLoad,
-		throwOnTombstoneUsage,
 	};
 }
 

package/src/gc/gcDefinitions.ts

@@ -37,20 +37,6 @@ export const stableGCVersion: GCVersion = 3;
 /** The next version of GC Data, to bump to in case we need to regenerate all GC Data across all files. */
 export const nextGCVersion: GCVersion = 4;
 
-/**
- * This undocumented GC Option (on ContainerRuntime Options) allows an app to disable throwing an error when tombstone
- * object is loaded (requested), merely logging a message instead.
- *
- * By default, attempting to load a Tombstoned object will result in an error.
- */
-export const gcDisableThrowOnTombstoneLoadOptionName = "gcDisableThrowOnTombstoneLoad";
-
-/**
- * This undocumented GC Option (on ContainerRuntime Options) allows an app to enable Sweep for blobs only.
- * Only applies if enableGCSweep option is set to true.
- */
-export const gcDisableDataStoreSweepOptionName = "disableDataStoreSweep";
-
 /**
  * This undocumented GC Option (on ContainerRuntime Options) allows configuring which documents can have Sweep enabled.
  * This provides a way to disable both Tombstone Enforcement and Sweep.
@@ -68,19 +54,11 @@ export const gcGenerationOptionName = "gcGeneration";
 export const gcTestModeKey = "Fluid.GarbageCollection.GCTestMode";
 /** Config key to expire a session after a set period of time. Defaults to true. */
 export const runSessionExpiryKey = "Fluid.GarbageCollection.RunSessionExpiry";
-/** Config key to disable the tombstone feature, i.e., tombstone information is not read / written into summary. */
-export const disableTombstoneKey = "Fluid.GarbageCollection.DisableTombstone";
-/** Config key to override throwing an error when tombstone object is loaded (requested). */
-export const throwOnTombstoneLoadOverrideKey =
-	"Fluid.GarbageCollection.ThrowOnTombstoneLoadOverride";
-/** Config key to enable throwing an error when tombstone object is used (e.g. outgoing or incoming ops). */
-export const throwOnTombstoneUsageKey = "Fluid.GarbageCollection.ThrowOnTombstoneUsage";
+/** Config key to disable throwing an error when tombstone object is loaded (requested). */
+export const disableThrowOnTombstoneLoadKey =
+	"Fluid.GarbageCollection.DisableThrowOnTombstoneLoad";
 /** Config key to enable GC version upgrade. */
 export const gcVersionUpgradeToV4Key = "Fluid.GarbageCollection.GCVersionUpgradeToV4";
-/** Config key to disable GC sweep for datastores. They'll merely be Tombstoned. */
-export const disableDatastoreSweepKey = "Fluid.GarbageCollection.DisableDataStoreSweep";
-/** Config key to disable auto-recovery mechanism that protects Tombstones that are loaded from being swept (use true) */
-export const disableAutoRecoveryKey = "Fluid.GarbageCollection.DisableAutoRecovery";
 
 // One day in milliseconds.
 export const oneDayMs = 1 * 24 * 60 * 60 * 1000;
@@ -339,12 +317,6 @@ export interface IGarbageCollector {
 	readonly shouldRunGC: boolean;
 	/** The count of data stores whose GC state updated since the last summary. */
 	readonly updatedDSCountSinceLastSummary: number;
-	/** Tells whether tombstone feature is enabled and enforced. */
-	readonly tombstoneEnforcementAllowed: boolean;
-	/** Tells whether loading a tombstone object should fail or merely log. */
-	readonly throwOnTombstoneLoad: boolean;
-	/** Tells whether using a tombstone object should fail or merely log. */
-	readonly throwOnTombstoneUsage: boolean;
 	/** Initialize the state from the base snapshot after its creation. */
 	initializeBaseState(): Promise<void>;
 	/** Run garbage collection and update the reference / used state of the system. */
@@ -480,22 +452,17 @@ export interface IGCRuntimeOptions {
  */
 export interface IGarbageCollectorConfigs {
 	/**
-	 * Tracks if GC is enabled for this document. GC may not be enabled for old documents created pre-GC.
+	 * Tracks if GC is allowed for this document. GC may not be allowed for old documents created pre-GC.
+	 * If GC is allowed for a document, it will always be enabled. It cannot be disabled per session.
 	 */
-	readonly gcEnabled: boolean;
+	readonly gcAllowed: boolean;
 	/**
-	 * Tracks if sweep phase is allowed for this document. This is specified during document creation and doesn't change
-	 * throughout its lifetime.
+	 * Tracks whether sweep phase is allowed for this document. Sweep can be disabled per session via the sweepEnabled
+	 * flag defined below.
 	 */
+	readonly sweepAllowed: boolean;
+	/** Tracks if sweep phase is enabled to run in this session or not */
 	readonly sweepEnabled: boolean;
-	/** Is Tombstone AutoRecovery enabled? Useful for preventing the GC "TombstoneLoaded" op, for compatibility reasons */
-	readonly tombstoneAutorecoveryEnabled: boolean;
-	/**
-	 * Tracks if sweep phase should run or not, or if it should run only for attachment blobs.
-	 * Even if the sweep phase is allowed for a document (see sweepEnabled), it may be disabled or partially enabled
-	 * for the session, depending on a variety of other configurations present.
-	 */
-	readonly shouldRunSweep: "YES" | "ONLY_BLOBS" | "NO";
 	/**
 	 * If true, bypass optimizations and generate GC data for all nodes irrespective of whether a node changed or not.
 	 */
@@ -513,26 +480,14 @@ export interface IGarbageCollectorConfigs {
 	readonly inactiveTimeoutMs: number;
 	/** Tracks whether GC should run in test mode. In this mode, unreferenced objects are deleted immediately. */
 	readonly testMode: boolean;
-	/**
-	 * Tracks whether GC should run in tombstone mode. In this mode, objects are marked as tombstones as a step along the
-	 * way before they are fully deleted.
-	 * In interactive (non-summarizer) clients, tombstone objects behave as if they are deleted, i.e., access to them
-	 * is not allowed. However, these objects can be accessed after referencing them first. It is used as a "warning"
-	 * step before sweep, where objects wrongly marked as unreferenced can be recovered.
-	 */
-	readonly tombstoneMode: boolean;
 	/** @see GCFeatureMatrix. */
 	readonly persistedGcFeatureMatrix: GCFeatureMatrix | undefined;
 	/** The version of GC in the base snapshot. */
 	readonly gcVersionInBaseSnapshot: GCVersion | undefined;
 	/** The current version of GC data in the running code */
 	readonly gcVersionInEffect: GCVersion;
-	/** It is easier for users to diagnose InactiveObject usage if we throw on load, which this option enables */
-	readonly throwOnInactiveLoad: boolean | undefined;
 	/** If true, throw an error when a tombstone data store is retrieved */
 	readonly throwOnTombstoneLoad: boolean;
-	/** If true, throw an error when a tombstone data store is used. */
-	readonly throwOnTombstoneUsage: boolean;
 }
 
 /** The state of node that is unreferenced. */