@fluidframework/container-runtime 2.51.0 → 2.52.0

package/lib/blobManager/blobManager.d.ts

@@ -2,9 +2,9 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
+import { type IContainerStorageService } from "@fluidframework/container-definitions/internal";
 import { IContainerRuntime, IContainerRuntimeEvents } from "@fluidframework/container-runtime-definitions/internal";
 import type { IEventProvider, IFluidHandleContext, IFluidHandleInternalPayloadPending, ILocalFluidHandle, ILocalFluidHandleEvents, Listenable, PayloadState } from "@fluidframework/core-interfaces/internal";
-import { IDocumentStorageService, ICreateBlobResponse } from "@fluidframework/driver-definitions/internal";
 import { IGarbageCollectionData, ISummaryTreeWithStats, ITelemetryContext, type ISequencedMessageEnvelope } from "@fluidframework/runtime-definitions/internal";
 import { FluidHandleBase } from "@fluidframework/runtime-utils/internal";
 import { type IBlobManagerLoadInfo } from "./blobManagerSnapSum.js";
@@ -77,20 +77,17 @@ export declare class BlobManager {
      */
     private readonly opsInFlight;
     private readonly sendBlobAttachOp;
-    private stopAttaching;
     private readonly routeContext;
     private readonly storage;
     private readonly blobRequested;
     private readonly isBlobDeleted;
     private readonly runtime;
     private readonly localBlobIdGenerator;
-    private readonly pendingStashedBlobs;
-    readonly stashedBlobsUploadP: Promise<(void | ICreateBlobResponse)[]>;
     private readonly createBlobPayloadPending;
     constructor(props: {
         readonly routeContext: IFluidHandleContext;
         blobManagerLoadInfo: IBlobManagerLoadInfo;
-        readonly storage: IDocumentStorageService;
+        readonly storage: Pick<IContainerStorageService, "createBlob" | "readBlob">;
         /**
          * Submit a BlobAttach op. When a blob is uploaded, there is a short grace period before which the blob is
          * deleted. The BlobAttach op notifies the server that blob is in use. The server will then not delete the
@@ -101,7 +98,7 @@ export declare class BlobManager {
          * knowledge of which they cannot request the blob from storage. It's important that this op is sequenced
          * before any ops that reference the local ID, otherwise, an invalid handle could be added to the document.
          */
-        sendBlobAttachOp: (localId: string, storageId?: string) => void;
+        sendBlobAttachOp: (localId: string, storageId: string) => void;
         readonly blobRequested: (blobPath: string) => void;
         readonly isBlobDeleted: (blobPath: string) => boolean;
         readonly runtime: IBlobManagerRuntime;
@@ -112,7 +109,6 @@ export declare class BlobManager {
     get allBlobsAttached(): boolean;
     get hasPendingBlobs(): boolean;
     private createAbortError;
-    hasPendingStashedUploads(): boolean;
     hasBlob(blobId: string): boolean;
     /**
      * Retrieve the blob with the given local blob id.
@@ -179,6 +175,18 @@ export declare class BlobManager {
      */
     private verifyBlobNotDeleted;
     setRedirectTable(table: Map<string, string>): void;
+    /**
+     * To be used in getPendingLocalState flow. Get a serializable record of the blobs that are
+     * pending upload and/or their BlobAttach op, which can be given to a new BlobManager to
+     * resume work.
+     *
+     * @privateRemarks
+     * For now, we don't track any pending blobs since the getPendingBlobs flow doesn't enable
+     * restoring to a state where an accessible handle has been stored by the customer (and we'll
+     * just drop any BlobAttach ops on the ground during reSubmit). However, once we add support
+     * for payload-pending handles, this will return the blobs associated with those handles.
+     */
+    getPendingBlobs(): IPendingBlobs | undefined;
     /**
      * Part of container serialization when imminent closure is enabled (Currently when calling closeAndGetPendingLocalState).
      * This asynchronous function resolves all pending createBlob calls and waits for each blob

package/lib/blobManager/blobManager.d.ts.map

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

package/lib/blobManager/blobManager.js

@@ -2,13 +2,14 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { bufferToString, createEmitter, stringToBuffer } from "@fluid-internal/client-utils";
-import { AttachState } from "@fluidframework/container-definitions";
+import { createEmitter } from "@fluid-internal/client-utils";
+import { AttachState, } from "@fluidframework/container-definitions/internal";
 import { assert, Deferred } from "@fluidframework/core-utils/internal";
 import { canRetryOnError, runWithRetry } from "@fluidframework/driver-utils/internal";
 import { FluidHandleBase, createResponseError, generateHandleContextPath, responseToException, } from "@fluidframework/runtime-utils/internal";
-import { LoggingError, PerformanceEvent, createChildMonitoringContext, wrapError, } from "@fluidframework/telemetry-utils/internal";
+import { LoggingError, PerformanceEvent, UsageError, createChildMonitoringContext, wrapError, } from "@fluidframework/telemetry-utils/internal";
 import { v4 as uuid } from "uuid";
+import { isBlobMetadata } from "../metadata.js";
 import { getStorageIds, summarizeBlobManagerState, toRedirectTable, } from "./blobManagerSnapSum.js";
 /**
  * This class represents blob (long string)
@@ -56,12 +57,6 @@ export class BlobHandle extends FluidHandleBase {
         }
     }
 }
-const stashedPendingBlobOverrides = {
-    stashedUpload: true,
-    storageId: undefined,
-    minTTLInSeconds: undefined,
-    uploadTime: undefined,
-};
 export const blobManagerBasePath = "_blobs";
 export class BlobManager {
     get events() {
@@ -80,9 +75,7 @@ export class BlobManager {
          * because we know that the server will not delete the blob corresponding to that storage ID.
          */
         this.opsInFlight = new Map();
-        this.stopAttaching = false;
-        this.pendingStashedBlobs = new Map();
-        const { routeContext, blobManagerLoadInfo, storage, sendBlobAttachOp, blobRequested, isBlobDeleted, runtime, stashedBlobs, localBlobIdGenerator, createBlobPayloadPending, } = props;
+        const { routeContext, blobManagerLoadInfo, storage, sendBlobAttachOp, blobRequested, isBlobDeleted, runtime, localBlobIdGenerator, createBlobPayloadPending, } = props;
         this.routeContext = routeContext;
         this.storage = storage;
         this.blobRequested = blobRequested;
@@ -95,39 +88,6 @@ export class BlobManager {
             namespace: "BlobManager",
         });
         this.redirectTable = toRedirectTable(blobManagerLoadInfo, this.mc.logger, this.runtime.attachState);
-        // Begin uploading stashed blobs from previous container instance
-        for (const [localId, entry] of Object.entries(stashedBlobs ?? {})) {
-            const { acked, storageId, minTTLInSeconds, uploadTime } = entry;
-            const blob = stringToBuffer(entry.blob, "base64");
-            const pendingEntry = {
-                blob,
-                opsent: true,
-                handleP: new Deferred(),
-                storageId,
-                uploadP: undefined,
-                uploadTime,
-                minTTLInSeconds,
-                attached: true,
-                acked,
-            };
-            this.pendingBlobs.set(localId, pendingEntry);
-            if (storageId !== undefined && minTTLInSeconds && uploadTime) {
-                const timeLapseSinceLocalUpload = (Date.now() - uploadTime) / 1000;
-                // stashed entries with more than half-life in storage will not be reuploaded
-                if (minTTLInSeconds - timeLapseSinceLocalUpload > minTTLInSeconds / 2) {
-                    continue;
-                }
-            }
-            this.pendingStashedBlobs.set(localId, this.uploadBlob(localId, blob));
-            this.pendingBlobs.set(localId, {
-                ...pendingEntry,
-                ...stashedPendingBlobOverrides,
-                uploadP: this.pendingStashedBlobs.get(localId),
-            });
-        }
-        this.stashedBlobsUploadP = PerformanceEvent.timedExecAsync(this.mc.logger, { eventName: "BlobUploadProcessStashedChanges", count: this.pendingStashedBlobs.size }, async () => Promise.all(this.pendingStashedBlobs.values()), { start: true, end: true }).finally(() => {
-            this.pendingStashedBlobs.clear();
-        });
         this.sendBlobAttachOp = (localId, blobId) => {
             const pendingEntry = this.pendingBlobs.get(localId);
             assert(pendingEntry !== undefined, 0x725 /* Must have pending blob entry for upcoming op */);
@@ -175,9 +135,6 @@ export class BlobManager {
             uploadTime: pending?.uploadTime,
         });
     }
-    hasPendingStashedUploads() {
-        return [...this.pendingBlobs.values()].some((e) => e.stashedUpload === true);
-    }
     hasBlob(blobId) {
         return this.redirectTable.get(blobId) !== undefined;
     }
@@ -203,7 +160,7 @@ export class BlobManager {
         if (this.runtime.attachState === AttachState.Detached) {
             assert(this.redirectTable.has(blobId), 0x383 /* requesting unknown blobs */);
             // Blobs created while the container is detached are stored in IDetachedBlobStorage.
-            // The 'IDocumentStorageService.readBlob()' call below will retrieve these via localId.
+            // The 'IContainerStorageService.readBlob()' call below will retrieve these via localId.
             storageId = blobId;
         }
         else {
@@ -256,7 +213,7 @@ export class BlobManager {
     }
     async createBlobDetached(blob) {
         // Blobs created while the container is detached are stored in IDetachedBlobStorage.
-        // The 'IDocumentStorageService.createBlob()' call below will respond with a localId.
+        // The 'IContainerStorageService.createBlob()' call below will respond with a localId.
         const response = await this.storage.createBlob(blob);
         this.setRedirection(response.id, undefined);
         return this.getBlobHandle(response.id);
@@ -385,17 +342,8 @@ export class BlobManager {
     }
     onUploadResolve(localId, response) {
         const entry = this.pendingBlobs.get(localId);
-        if (entry === undefined && this.pendingStashedBlobs.has(localId)) {
-            // The blob was already processed and deleted. This can happen if the blob was reuploaded by
-            // the stashing process and the original upload was processed before the stashed upload.
-            this.mc.logger.sendTelemetryEvent({
-                eventName: "StashedBlobAlreadyProcessed",
-                localId,
-            });
-            return;
-        }
         assert(entry !== undefined, 0x6c8 /* pending blob entry not found for uploaded blob */);
-        if ((entry.abortSignal?.aborted === true && !entry.opsent) || this.stopAttaching) {
+        if (entry.abortSignal?.aborted === true && !entry.opsent) {
             this.mc.logger.sendTelemetryEvent({
                 eventName: "BlobAborted",
                 localId,
@@ -404,7 +352,6 @@ export class BlobManager {
             return;
         }
         assert(entry.storageId === undefined, 0x386 /* Must have pending blob entry for uploaded blob */);
-        entry.stashedUpload = undefined;
         entry.storageId = response.id;
         entry.uploadTime = Date.now();
         entry.minTTLInSeconds = response.minTTLInSeconds;
@@ -448,38 +395,29 @@ export class BlobManager {
      * @param metadata - op metadata containing storage and/or local IDs
      */
     reSubmit(metadata) {
-        assert(!!metadata, 0x38b /* Resubmitted ops must have metadata */);
+        assert(isBlobMetadata(metadata), 0xc01 /* Expected blob metadata for a BlobAttach op */);
         const { localId, blobId } = metadata;
-        assert(localId !== undefined, 0x50d /* local ID not available on reSubmit */);
-        const pendingEntry = this.pendingBlobs.get(localId);
-        if (!blobId) {
-            // We submitted this op while offline. The blob should have been uploaded by now.
-            assert(pendingEntry?.opsent === true && !!pendingEntry?.storageId, 0x38d /* blob must be uploaded before resubmitting BlobAttach op */);
-            return this.sendBlobAttachOp(localId, pendingEntry?.storageId);
+        // Any blob that we're actively trying to advance to attached state must have a
+        // pendingBlobs entry. Decline to resubmit for anything else.
+        // For example, we might be asked to resubmit stashed ops for blobs that never had
+        // their handle attached - these won't have a pendingBlobs entry and we shouldn't
+        // try to attach them since they won't be accessible to the customer and would just
+        // be considered garbage immediately.
+        if (this.pendingBlobs.has(localId)) {
+            this.sendBlobAttachOp(localId, blobId);
         }
-        return this.sendBlobAttachOp(localId, blobId);
     }
     processBlobAttachMessage(message, local) {
-        const localId = message.metadata?.localId;
-        const blobId = message.metadata?.blobId;
-        if (localId) {
-            const pendingEntry = this.pendingBlobs.get(localId);
-            if (pendingEntry?.abortSignal?.aborted) {
-                this.deletePendingBlob(localId);
-                return;
-            }
-        }
-        assert(blobId !== undefined, 0x12a /* "Missing blob id on metadata" */);
-        // Set up a mapping from local ID to storage ID. This is crucial since without this the blob cannot be
-        // requested from the server.
-        // Note: The check for undefined is needed for back-compat when localId was not part of the BlobAttach op that
-        // was sent when online.
-        if (localId !== undefined) {
-            this.setRedirection(localId, blobId);
+        assert(isBlobMetadata(message.metadata), 0xc02 /* Expected blob metadata for a BlobAttach op */);
+        const { localId, blobId } = message.metadata;
+        const pendingEntry = this.pendingBlobs.get(localId);
+        if (pendingEntry?.abortSignal?.aborted) {
+            this.deletePendingBlob(localId);
+            return;
         }
+        this.setRedirection(localId, blobId);
         // set identity (id -> id) entry
         this.setRedirection(blobId, blobId);
-        assert(localId !== undefined, 0x50e /* local ID not present in blob attach message */);
         if (local) {
             const waitingBlobs = this.opsInFlight.get(blobId);
             if (waitingBlobs !== undefined) {
@@ -626,6 +564,20 @@ export class BlobManager {
             this.setRedirection(storageId, storageId);
         }
     }
+    /**
+     * To be used in getPendingLocalState flow. Get a serializable record of the blobs that are
+     * pending upload and/or their BlobAttach op, which can be given to a new BlobManager to
+     * resume work.
+     *
+     * @privateRemarks
+     * For now, we don't track any pending blobs since the getPendingBlobs flow doesn't enable
+     * restoring to a state where an accessible handle has been stored by the customer (and we'll
+     * just drop any BlobAttach ops on the ground during reSubmit). However, once we add support
+     * for payload-pending handles, this will return the blobs associated with those handles.
+     */
+    getPendingBlobs() {
+        return undefined;
+    }
     /**
      * Part of container serialization when imminent closure is enabled (Currently when calling closeAndGetPendingLocalState).
      * This asynchronous function resolves all pending createBlob calls and waits for each blob
@@ -637,73 +589,7 @@ export class BlobManager {
      * or undefined if no blobs were processed.
      */
     async attachAndGetPendingBlobs(stopBlobAttachingSignal) {
-        return PerformanceEvent.timedExecAsync(this.mc.logger, { eventName: "GetPendingBlobs" }, async () => {
-            if (this.pendingBlobs.size === 0) {
-                return;
-            }
-            const blobs = {};
-            const localBlobs = new Set();
-            // This while is used to stash blobs created while attaching and getting blobs
-            while (localBlobs.size < this.pendingBlobs.size) {
-                const attachHandlesP = [];
-                for (const [localId, entry] of this.pendingBlobs) {
-                    if (!localBlobs.has(entry)) {
-                        localBlobs.add(entry);
-                        // In order to follow natural blob creation flow we need to:
-                        // 1 send the blob attach op
-                        // 2 resolve the blob handle
-                        // 3 wait for op referencing the blob
-                        if (!entry.opsent) {
-                            this.sendBlobAttachOp(localId, entry.storageId);
-                        }
-                        // Resolving the blob handle to let hosts continue with their operations (it will resolve
-                        // original createBlob call) and let them attach the blob. This is a lie we told since the upload
-                        // hasn't finished yet, but it's fine since we will retry on rehydration.
-                        entry.handleP.resolve(this.getBlobHandle(localId));
-                        // Array of promises that will resolve when handles get attached.
-                        attachHandlesP.push(new Promise((resolve, reject) => {
-                            stopBlobAttachingSignal?.addEventListener("abort", () => {
-                                this.stopAttaching = true;
-                                reject(new Error("Operation aborted"));
-                            }, { once: true });
-                            const onHandleAttached = (attachedEntry) => {
-                                if (attachedEntry === entry) {
-                                    this.internalEvents.off("handleAttached", onHandleAttached);
-                                    resolve();
-                                }
-                            };
-                            if (entry.attached) {
-                                resolve();
-                            }
-                            else {
-                                this.internalEvents.on("handleAttached", onHandleAttached);
-                            }
-                        }));
-                    }
-                }
-                // Wait for all blobs to be attached. This is important, otherwise serialized container
-                // could send the blobAttach op without any op that references the blob, making it useless.
-                await Promise.allSettled(attachHandlesP);
-            }
-            for (const [localId, entry] of this.pendingBlobs) {
-                if (stopBlobAttachingSignal?.aborted && !entry.attached) {
-                    this.mc.logger.sendTelemetryEvent({
-                        eventName: "UnableToStashBlob",
-                        id: localId,
-                    });
-                    continue;
-                }
-                assert(entry.attached === true, 0x790 /* stashed blob should be attached */);
-                blobs[localId] = {
-                    blob: bufferToString(entry.blob, "base64"),
-                    storageId: entry.storageId,
-                    acked: entry.acked,
-                    minTTLInSeconds: entry.minTTLInSeconds,
-                    uploadTime: entry.uploadTime,
-                };
-            }
-            return Object.keys(blobs).length > 0 ? blobs : undefined;
-        });
+        throw new UsageError("attachAndGetPendingBlobs is no longer supported");
     }
 }
 /**