@fluidframework/container-runtime 2.0.0-rc.2.0.3 → 2.0.0-rc.2.0.5

package/api-report/container-runtime.api.md

@@ -261,6 +261,9 @@ export interface ContainerRuntimeMessage {
 // @alpha (undocumented)
 export const DefaultSummaryConfiguration: ISummaryConfiguration;
 
+// @alpha
+export const DeletedResponseHeaderKey = "wasDeleted";
+
 // @internal
 export function detectOutboundReferences(envelope: IEnvelope, addedOutboundReference: (fromNodePath: string, toNodePath: string) => void): void;
 
@@ -294,10 +297,10 @@ export type GCFeatureMatrix = {
 
 // @alpha
 export const GCNodeType: {
-    DataStore: string;
-    SubDataStore: string;
-    Blob: string;
-    Other: string;
+    readonly DataStore: "DataStore";
+    readonly SubDataStore: "SubDataStore";
+    readonly Blob: "Blob";
+    readonly Other: "Other";
 };
 
 // @alpha (undocumented)
@@ -459,6 +462,19 @@ export interface IGCMetadata {
     readonly tombstoneTimeoutMs?: number;
 }
 
+// @internal
+export interface IGCNodeUpdatedProps {
+    headerData?: RuntimeHeaderData;
+    node: {
+        type: (typeof GCNodeType)["DataStore" | "Blob"];
+        path: string;
+    };
+    packagePath?: readonly string[];
+    reason: "Loaded" | "Changed";
+    request?: IRequest;
+    timestampMs?: number;
+}
+
 // @alpha (undocumented)
 export interface IGCRuntimeOptions {
     [key: string]: any;
@@ -763,6 +779,18 @@ export interface RecentlyAddedContainerRuntimeMessageDetails {
     compatDetails: IContainerRuntimeMessageCompatDetails;
 }
 
+// @internal
+export interface RuntimeHeaderData {
+    // (undocumented)
+    allowInactive?: boolean;
+    // (undocumented)
+    allowTombstone?: boolean;
+    // (undocumented)
+    viaHandle?: boolean;
+    // (undocumented)
+    wait?: boolean;
+}
+
 // @internal
 export enum RuntimeHeaders {
     viaHandle = "viaHandle",

package/dist/channelCollection.d.ts

@@ -9,7 +9,7 @@ import { AttachState } from "@fluidframework/container-definitions";
 import { RuntimeHeaderData } from "./containerRuntime.js";
 import { FluidDataStoreContext, LocalFluidDataStoreContext } from "./dataStoreContext.js";
 import { IDataStoreAliasMessage } from "./dataStore.js";
-import { GCNodeType } from "./gc/index.js";
+import { GCNodeType, IGCNodeUpdatedProps } from "./gc/index.js";
 import { IContainerRuntimeMetadata } from "./summary/index.js";
 /**
  * Accepted header keys for requests coming to the runtime.
@@ -67,7 +67,8 @@ export declare class ChannelCollection implements IFluidDataStoreChannel, IDispo
     private readonly containerRuntimeHandle;
     private readonly pendingAliasMap;
     private readonly contexts;
-    constructor(baseSnapshot: ISnapshotTree | undefined, parentContext: IFluidParentContext, baseLogger: ITelemetryBaseLogger, gcNodeUpdated: (nodePath: string, reason: "Loaded" | "Changed", timestampMs?: number, packagePath?: readonly string[], request?: IRequest, headerData?: RuntimeHeaderData) => void, isDataStoreDeleted: (nodePath: string) => boolean, aliasMap: Map<string, string>, provideEntryPoint: (runtime: ChannelCollection) => Promise<FluidObject>);
+    private readonly aliasedDataStores;
+    constructor(baseSnapshot: ISnapshotTree | undefined, parentContext: IFluidParentContext, baseLogger: ITelemetryBaseLogger, gcNodeUpdated: (props: IGCNodeUpdatedProps) => void, isDataStoreDeleted: (nodePath: string) => boolean, aliasMap: Map<string, string>, provideEntryPoint: (runtime: ChannelCollection) => Promise<FluidObject>);
     get aliases(): ReadonlyMap<string, string>;
     get pendingAliases(): Map<string, Promise<AliasResult>>;
     waitIfPendingAlias(maybeAlias: string): Promise<AliasResult>;
@@ -118,7 +119,7 @@ export declare class ChannelCollection implements IFluidDataStoreChannel, IDispo
     applyStashedOp(content: unknown): Promise<unknown>;
     private applyStashedAttachOp;
     process(message: ISequencedDocumentMessage, local: boolean, localMessageMetadata: unknown, addedOutboundReference?: (fromNodePath: string, toNodePath: string) => void): void;
-    getDataStore(id: string, requestHeaderData: RuntimeHeaderData): Promise<FluidDataStoreContext>;
+    private getDataStore;
     /**
      * Returns the data store requested with the given id if available. Otherwise, returns undefined.
      */
@@ -127,8 +128,10 @@ export declare class ChannelCollection implements IFluidDataStoreChannel, IDispo
      * Checks if the data store has been deleted by GC. If so, log an error.
      * @param id - The data store's id.
      * @param context - The data store context.
+     * @param deletedLogSuffix - Whether it was Changed or Requested (will go into the eventName)
      * @param callSite - The function name this is called from.
      * @param requestHeaderData - The request header information to log if the data store is deleted.
+     * @param originalRequest - The original request (could be for a child of the DataStore)
      * @returns true if the data store is deleted. Otherwise, returns false.
      */
     private checkAndLogIfDeleted;
@@ -171,6 +174,7 @@ export declare class ChannelCollection implements IFluidDataStoreChannel, IDispo
      * @param unusedRoutes - The routes that are unused in all data stores in this Container.
      */
     updateUnusedRoutes(unusedRoutes: readonly string[]): void;
+    private deleteChild;
     /**
      * Delete data stores and its objects that are sweep ready.
      * @param sweepReadyDataStoreRoutes - The routes of data stores and its objects that are sweep ready and should

package/dist/channelCollection.d.ts.map

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

package/dist/channelCollection.js

@@ -169,6 +169,7 @@ class ChannelCollection {
         this.contexts = new dataStoreContexts_js_1.DataStoreContexts(baseLogger);
         this.containerRuntimeHandle = new datastore_1.FluidObjectHandle(this.parentContext, "/", this.parentContext.IFluidHandleContext);
         this.entryPoint = new datastore_1.FluidObjectHandle(new core_utils_1.LazyPromise(async () => provideEntryPoint(this)), "", this.parentContext.IFluidHandleContext);
+        this.aliasedDataStores = new Set(aliasMap.values());
         // Extract stores stored inside the snapshot
         const fluidDataStores = new Map();
         if (baseSnapshot) {
@@ -346,6 +347,7 @@ class ChannelCollection {
         const handle = new datastore_1.FluidObjectHandle(context, aliasMessage.internalId, this.parentContext.IFluidHandleContext);
         this.parentContext.addedGCOutboundReference?.(this.containerRuntimeHandle, handle);
         this.aliasMap.set(aliasMessage.alias, context.id);
+        this.aliasedDataStores.add(context.id);
         context.setInMemoryRoot();
         return true;
     }
@@ -605,14 +607,20 @@ class ChannelCollection {
         }
         // Notify that a GC node for the data store changed. This is used to detect if a deleted data store is
         // being used.
-        this.gcNodeUpdated(`/${envelope.address}`, "Changed", message.timestamp, context.isLoaded ? context.packagePath : undefined);
+        this.gcNodeUpdated({
+            node: { type: "DataStore", path: `/${envelope.address}` },
+            reason: "Changed",
+            timestampMs: message.timestamp,
+            packagePath: context.isLoaded ? context.packagePath : undefined,
+        });
     }
-    async getDataStore(id, requestHeaderData) {
+    async getDataStore(id, requestHeaderData, originalRequest) {
         const headerData = { ...containerRuntime_js_1.defaultRuntimeHeaderData, ...requestHeaderData };
-        if (this.checkAndLogIfDeleted(id, this.contexts.get(id), "Requested", "getDataStore", requestHeaderData)) {
+        if (this.checkAndLogIfDeleted(id, this.contexts.get(id), "Requested", "getDataStore", requestHeaderData, originalRequest)) {
             // The requested data store has been deleted by gc. Create a 404 response exception.
-            const request = { url: id };
-            throw (0, runtime_utils_1.responseToException)((0, runtime_utils_1.createResponseError)(404, "DataStore was deleted", request), request);
+            throw (0, runtime_utils_1.responseToException)((0, runtime_utils_1.createResponseError)(404, "DataStore was deleted", originalRequest, {
+                [containerRuntime_js_1.DeletedResponseHeaderKey]: true,
+            }), originalRequest);
         }
         const context = await this.contexts.getBoundOrRemoted(id, headerData.wait);
         if (context === undefined) {
@@ -641,21 +649,52 @@ class ChannelCollection {
      * Checks if the data store has been deleted by GC. If so, log an error.
      * @param id - The data store's id.
      * @param context - The data store context.
+     * @param deletedLogSuffix - Whether it was Changed or Requested (will go into the eventName)
      * @param callSite - The function name this is called from.
      * @param requestHeaderData - The request header information to log if the data store is deleted.
+     * @param originalRequest - The original request (could be for a child of the DataStore)
      * @returns true if the data store is deleted. Otherwise, returns false.
      */
-    checkAndLogIfDeleted(id, context, deletedLogSuffix, callSite, requestHeaderData) {
+    checkAndLogIfDeleted(id, context, deletedLogSuffix, callSite, requestHeaderData, originalRequest) {
         const dataStoreNodePath = `/${id}`;
         if (!this.isDataStoreDeleted(dataStoreNodePath)) {
             return false;
         }
+        const idToLog = originalRequest !== undefined
+            ? (0, index_js_1.urlToGCNodePath)(originalRequest.url)
+            : dataStoreNodePath;
+        // Log the package details asynchronously since getInitialSnapshotDetails is async
+        const recentelyDeletedContext = this.contexts.getRecentlyDeletedContext(id);
+        if (recentelyDeletedContext !== undefined) {
+            recentelyDeletedContext
+                .getInitialSnapshotDetails()
+                .then((details) => {
+                return details.pkg.join("/");
+            })
+                .then((pkg) => ({ pkg, error: undefined }), (error) => ({ pkg: undefined, error }))
+                .then(({ pkg, error }) => {
+                this.mc.logger.sendTelemetryEvent({
+                    eventName: `GC_DeletedDataStore_PathInfo`,
+                    ...(0, telemetry_utils_1.tagCodeArtifacts)({
+                        id: idToLog,
+                        pkg,
+                    }),
+                    callSite,
+                }, error);
+            })
+                .catch(() => { });
+        }
         this.mc.logger.sendErrorEvent({
             eventName: `GC_Deleted_DataStore_${deletedLogSuffix}`,
-            ...(0, telemetry_utils_1.tagCodeArtifacts)({ id }),
+            ...(0, telemetry_utils_1.tagCodeArtifacts)({ id: idToLog }),
             callSite,
             headers: JSON.stringify(requestHeaderData),
             exists: context !== undefined,
+            details: {
+                url: originalRequest?.url,
+                headers: JSON.stringify(originalRequest?.headers),
+                aliased: this.aliasedDataStores.has(id),
+            },
         });
         return true;
     }
@@ -856,13 +895,31 @@ class ChannelCollection {
                 continue;
             }
             const dataStoreId = pathParts[1];
-            (0, core_utils_1.assert)(this.contexts.has(dataStoreId), 0x2d7 /* No data store with specified id */);
+            (0, core_utils_1.assert)(this.contexts.has(dataStoreId), "updateUnusedRoutes: No data store with specified id");
             // Delete the contexts of unused data stores.
             this.contexts.delete(dataStoreId);
             // Delete the summarizer node of the unused data stores.
             this.parentContext.deleteChildSummarizerNode?.(dataStoreId);
         }
     }
+    deleteChild(dataStoreId) {
+        const dataStoreContext = this.contexts.get(dataStoreId);
+        (0, core_utils_1.assert)(dataStoreContext !== undefined, 0x2d7 /* No data store with specified id */);
+        if (dataStoreContext.isLoaded) {
+            this.mc.logger.sendTelemetryEvent({
+                eventName: "GC_DeletingLoadedDataStore",
+                ...(0, telemetry_utils_1.tagCodeArtifacts)({
+                    id: dataStoreId,
+                    pkg: dataStoreContext.packagePath.join("/"),
+                }),
+            });
+        }
+        dataStoreContext.delete();
+        // Delete the contexts of sweep ready data stores.
+        this.contexts.delete(dataStoreId);
+        // Delete the summarizer node of the sweep ready data stores.
+        this.parentContext.deleteChildSummarizerNode?.(dataStoreId);
+    }
     /**
      * Delete data stores and its objects that are sweep ready.
      * @param sweepReadyDataStoreRoutes - The routes of data stores and its objects that are sweep ready and should
@@ -893,11 +950,7 @@ class ChannelCollection {
                 });
                 continue;
             }
-            dataStoreContext.delete();
-            // Delete the contexts of sweep ready data stores.
-            this.contexts.delete(dataStoreId);
-            // Delete the summarizer node of the sweep ready data stores.
-            this.parentContext.deleteChildSummarizerNode?.(dataStoreId);
+            this.deleteChild(dataStoreId);
         }
         return Array.from(sweepReadyDataStoreRoutes);
     }
@@ -932,8 +985,9 @@ class ChannelCollection {
      */
     async getOutboundRoutes() {
         const outboundRoutes = [];
+        // Getting this information is a performance optimization that reduces network calls for virtualized datastores
         for (const [contextId, context] of this.contexts) {
-            const isRootDataStore = await context.isRoot();
+            const isRootDataStore = await context.isRoot(this.aliasedDataStores);
             if (isRootDataStore) {
                 outboundRoutes.push(`/${contextId}`);
             }
@@ -986,21 +1040,25 @@ class ChannelCollection {
         if (typeof request.headers?.[exports.AllowInactiveRequestHeaderKey] === "boolean") {
             headerData.allowInactive = request.headers[exports.AllowInactiveRequestHeaderKey];
         }
-        // We allow Tombstone requests for sub-DataStore objects
+        // We allow Tombstone/Inactive requests for sub-DataStore objects
         if (requestForChild) {
             headerData.allowTombstone = true;
+            headerData.allowInactive = true;
         }
         await this.waitIfPendingAlias(id);
         const internalId = this.internalId(id);
-        const dataStoreContext = await this.getDataStore(internalId, headerData);
-        // Remove query params, leading and trailing slashes from the url. This is done to make sure the format is
-        // the same as GC nodes id.
-        const urlWithoutQuery = (0, index_js_1.trimLeadingAndTrailingSlashes)(request.url.split("?")[0]);
+        const dataStoreContext = await this.getDataStore(internalId, headerData, request);
         // Get the initial snapshot details which contain the data store package path.
         const details = await dataStoreContext.getInitialSnapshotDetails();
-        // Note that this will throw if the data store is inactive or tombstoned and throwing on incorrect usage
-        // is configured.
-        this.gcNodeUpdated(`/${urlWithoutQuery}`, "Loaded", undefined /* timestampMs */, details.pkg, request, headerData);
+        // When notifying GC of this node being loaded, we only indicate the DataStore itself, not the full subDataStore url if applicable.
+        // This is in case the url is to a route that Fluid doesn't understand or track for GC (e.g. if suited for a custom request handler)
+        this.gcNodeUpdated({
+            node: { type: "DataStore", path: `/${id}` },
+            reason: "Loaded",
+            packagePath: details.pkg,
+            request,
+            headerData,
+        });
         const dataStore = await dataStoreContext.realize();
         const subRequest = requestParser.createSubRequest(1);
         // We always expect createSubRequest to include a leading slash, but asserting here to protect against