@fluidframework/container-runtime 2.10.0-306579 → 2.10.0-307399

package/src/blobManager/blobManager.ts

@@ -17,7 +17,7 @@ import {
 	IFluidHandleContext,
 	type IFluidHandleInternal,
 } from "@fluidframework/core-interfaces/internal";
-import { assert, Deferred } from "@fluidframework/core-utils/internal";
+import { assert, Deferred, LazyPromise } from "@fluidframework/core-utils/internal";
 import {
 	IDocumentStorageService,
 	ICreateBlobResponse,
@@ -181,10 +181,9 @@ export class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
 	private readonly runtime: IBlobManagerRuntime;
 	private readonly closeContainer: (error?: ICriticalContainerError) => void;
 	private readonly localBlobIdGenerator: () => string;
-	// TODO: consider to replace with a lazy promise
 	private readonly pendingStashedBlobs: Map<string, Promise<ICreateBlobResponse | void>> =
 		new Map();
-	private stashedBlobsUploadP: Promise<(void | ICreateBlobResponse)[]> | undefined = undefined;
+	public readonly stashedBlobsUploadP: Promise<(void | ICreateBlobResponse)[]>;
 
 	constructor(props: {
 		readonly routeContext: IFluidHandleContext;
@@ -271,11 +270,18 @@ export class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
 				uploadP: this.pendingStashedBlobs.get(localId),
 			});
 		});
-		this.waitForStashedBlobs()
-			.catch(() => {})
-			.finally(() => {
-				this.pendingStashedBlobs.clear();
-			});
+
+		this.stashedBlobsUploadP = new LazyPromise(async () =>
+			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: string, blobId?: string) => {
 			const pendingEntry = this.pendingBlobs.get(localId);
 			assert(
@@ -307,17 +313,6 @@ export class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
 		};
 	}
 
-	public async waitForStashedBlobs(): Promise<(void | ICreateBlobResponse)[]> {
-		if (!this.stashedBlobsUploadP) {
-			this.stashedBlobsUploadP = Promise.all(this.pendingStashedBlobs.values()).finally(() => {
-				this.stashedBlobsUploadP = undefined;
-				return;
-			});
-		}
-
-		return this.stashedBlobsUploadP;
-	}
-
 	public get allBlobsAttached(): boolean {
 		for (const [, entry] of this.pendingBlobs) {
 			if (entry.attached === false) {
@@ -344,26 +339,6 @@ export class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
 	public hasPendingStashedUploads(): boolean {
 		return Array.from(this.pendingBlobs.values()).some((e) => e.stashedUpload === true);
 	}
-	/**
-	 * Upload blobs added while offline. This must be completed before connecting and resubmitting ops.
-	 */
-	public async trackPendingStashedUploads(): Promise<void> {
-		const pendingUploads = Array.from(this.pendingBlobs.values())
-			.filter((e) => e.stashedUpload === true)
-			.map(async (e) => e.uploadP);
-		if (pendingUploads.length === 0) {
-			return;
-		}
-		await PerformanceEvent.timedExecAsync(
-			this.mc.logger,
-			{
-				eventName: "BlobUploadProcessStashedChanges",
-				count: pendingUploads.length,
-			},
-			async () => Promise.all(pendingUploads),
-			{ start: true, end: true },
-		);
-	}
 
 	public async getBlob(blobId: string): Promise<ArrayBufferLike> {
 		// Verify that the blob is not deleted, i.e., it has not been garbage collected. If it is, this will throw
@@ -552,6 +527,16 @@ export class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
 
 	private onUploadResolve(localId: string, response: ICreateBlobResponseWithTTL) {
 		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) {
 			this.mc.logger.sendTelemetryEvent({

package/src/channelCollection.ts

@@ -171,10 +171,6 @@ export function wrapContext(context: IFluidParentContext): IFluidParentContext {
 		getAudience: (...args) => {
 			return context.getAudience(...args);
 		},
-		// back-compat, to be removed in 2.0
-		ensureNoDataModelChanges: (...args) => {
-			return context.ensureNoDataModelChanges(...args);
-		},
 		submitMessage: (...args) => {
 			return context.submitMessage(...args);
 		},

package/src/containerRuntime.ts

@@ -1116,7 +1116,7 @@ export class ContainerRuntime
 			undefined, // summaryConfiguration
 		);
 
-		runtime.blobManager.trackPendingStashedUploads().then(
+		runtime.blobManager.stashedBlobsUploadP.then(
 			() => {
 				// make sure we didn't reconnect before the promise resolved
 				if (runtime.delayConnectClientId !== undefined && !runtime.disposed) {

package/src/dataStoreContext.ts

@@ -224,12 +224,6 @@ export abstract class FluidDataStoreContext
 	public get containerRuntime(): IContainerRuntimeBase {
 		return this._containerRuntime;
 	}
-
-	// back-compat, to be removed in 2.0
-	public ensureNoDataModelChanges<T>(callback: () => T): T {
-		return this.parentContext.ensureNoDataModelChanges(callback);
-	}
-
 	public get isLoaded(): boolean {
 		return this.loaded;
 	}

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-runtime";
-export const pkgVersion = "2.10.0-306579";
+export const pkgVersion = "2.10.0-307399";