@fluidframework/container-runtime 2.0.0-internal.7.1.1 → 2.0.0-internal.7.2.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @fluidframework/container-runtime
 
+## 2.0.0-internal.7.2.0
+
+Dependency updates only.
+
 ## 2.0.0-internal.7.1.0
 
 ### Minor Changes

package/api-extractor.json

@@ -1,16 +1,4 @@
 {
 	"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-	"extends": "@fluidframework/build-common/api-extractor-base.json",
-
-	// TODO: Fix violations and remove these rule overrides
-	"messages": {
-		"extractorMessageReporting": {
-			"ae-missing-release-tag": {
-				"logLevel": "none"
-			},
-			"ae-forgotten-export": {
-				"logLevel": "none"
-			}
-		}
-	}
+	"extends": "@fluidframework/build-common/api-extractor-base.json"
 }

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

@@ -28,6 +28,7 @@ import { IFluidHandle } from '@fluidframework/core-interfaces';
 import { IFluidHandleContext } from '@fluidframework/core-interfaces';
 import { IFluidRouter } from '@fluidframework/core-interfaces';
 import { IGarbageCollectionData } from '@fluidframework/runtime-definitions';
+import { IGetPendingLocalStateProps } from '@fluidframework/container-definitions';
 import { IIdCompressor } from '@fluidframework/runtime-definitions';
 import { IIdCompressorCore } from '@fluidframework/runtime-definitions';
 import { ILoader } from '@fluidframework/container-definitions';
@@ -154,9 +155,7 @@ export class ContainerRuntime extends TypedEventEmitter<IContainerRuntimeEvents
     getGCNodePackagePath(nodePath: string): Promise<readonly string[] | undefined>;
     getNodeType(nodePath: string): GCNodeType;
     // (undocumented)
-    getPendingLocalState(props?: {
-        notifyImminentClosure: boolean;
-    }): Promise<unknown>;
+    getPendingLocalState(props?: IGetPendingLocalStateProps): Promise<unknown>;
     // (undocumented)
     getQuorum(): IQuorumClients;
     // @deprecated
@@ -212,9 +211,8 @@ export class ContainerRuntime extends TypedEventEmitter<IContainerRuntimeEvents
     submitDataStoreAliasOp(contents: any, localOpMetadata: unknown): void;
     // (undocumented)
     submitDataStoreOp(id: string, contents: any, localOpMetadata?: unknown): void;
-    // (undocumented)
-    submitDataStoreSignal(address: string, type: string, content: any): void;
-    submitSignal(type: string, content: any): void;
+    submitDataStoreSignal(address: string, type: string, content: any, targetClientId?: string): void;
+    submitSignal(type: string, content: any, targetClientId?: string): void;
     submitSummary(options: ISubmitSummaryOptions): Promise<SubmitSummaryResult>;
     summarize(options: {
         fullTree?: boolean;
@@ -265,6 +263,26 @@ export class FluidDataStoreRegistry implements IFluidDataStoreRegistry {
     get IFluidDataStoreRegistry(): this;
 }
 
+// @public (undocumented)
+export interface GCFeatureMatrix {
+    sweepGeneration?: number;
+    tombstoneGeneration?: number;
+}
+
+// @public
+export const GCNodeType: {
+    DataStore: string;
+    SubDataStore: string;
+    Blob: string;
+    Other: string;
+};
+
+// @public (undocumented)
+export type GCNodeType = (typeof GCNodeType)[keyof typeof GCNodeType];
+
+// @public (undocumented)
+export type GCVersion = number;
+
 // @public
 export function generateStableId(): StableId;
 
@@ -294,6 +312,14 @@ export interface IBaseSummarizeResult {
     readonly stage: "base";
 }
 
+// @public
+export interface IBlobManagerLoadInfo {
+    // (undocumented)
+    ids?: string[];
+    // (undocumented)
+    redirectTable?: [string, string][];
+}
+
 // @public (undocumented)
 export interface IBroadcastSummaryResult {
     // (undocumented)
@@ -302,7 +328,7 @@ export interface IBroadcastSummaryResult {
     readonly summarizeOp: ISummaryOpMessage;
 }
 
-// @public (undocumented)
+// @public
 export interface ICancellableSummarizerController extends ISummaryCancellationToken {
     // (undocumented)
     stop(reason: SummarizerStopReason): void;
@@ -361,6 +387,17 @@ export interface IContainerRuntimeMessageCompatDetails {
     behavior: CompatModeBehavior;
 }
 
+// @public (undocumented)
+export interface IContainerRuntimeMetadata extends ICreateContainerMetadata, IGCMetadata {
+    readonly disableIsolatedChannels?: true;
+    readonly idCompressorEnabled?: boolean;
+    readonly message: ISummaryMetadataMessage | undefined;
+    // (undocumented)
+    readonly summaryFormatVersion: 1;
+    readonly summaryNumber?: number;
+    readonly telemetryDocumentId?: string;
+}
+
 // @public
 export interface IContainerRuntimeOptions {
     readonly chunkSizeInBytes?: number;
@@ -377,12 +414,28 @@ export interface IContainerRuntimeOptions {
     readonly summaryOptions?: ISummaryRuntimeOptions;
 }
 
+// @public (undocumented)
+export interface ICreateContainerMetadata {
+    createContainerRuntimeVersion?: string;
+    createContainerTimestamp?: number;
+}
+
 // @public
 export interface IEnqueueSummarizeOptions extends IOnDemandSummarizeOptions {
     readonly afterSequenceNumber?: number;
     readonly override?: boolean;
 }
 
+// @public (undocumented)
+export interface IGCMetadata {
+    readonly gcFeature?: GCVersion;
+    readonly gcFeatureMatrix?: GCFeatureMatrix;
+    readonly sessionExpiryTimeoutMs?: number;
+    // @deprecated
+    readonly sweepEnabled?: boolean;
+    readonly sweepTimeoutMs?: number;
+}
+
 // @public (undocumented)
 export interface IGCRuntimeOptions {
     [key: string]: any;
@@ -455,6 +508,13 @@ export interface IRetriableFailureResult {
     readonly retryAfterSeconds?: number;
 }
 
+// @public
+export interface ISerializedElection {
+    readonly electedClientId: string | undefined;
+    readonly electedParentId: string | undefined;
+    readonly electionSequenceNumber: number;
+}
+
 // @public @deprecated (undocumented)
 export function isRuntimeMessage(message: ISequencedDocumentMessage): boolean;
 
@@ -579,7 +639,7 @@ export interface ISummaryBaseConfiguration {
     maxOpsSinceLastSummary: number;
 }
 
-// @public (undocumented)
+// @public
 export type ISummaryCancellationToken = ICancellationToken<SummarizerStopReason>;
 
 // @public (undocumented)
@@ -617,6 +677,9 @@ export interface ISummaryConfigurationHeuristics extends ISummaryBaseConfigurati
     state: "enabled";
 }
 
+// @public
+export type ISummaryMetadataMessage = Pick<ISequencedDocumentMessage, "clientId" | "clientSequenceNumber" | "minimumSequenceNumber" | "referenceSequenceNumber" | "sequenceNumber" | "timestamp" | "type">;
+
 // @public
 export interface ISummaryNackMessage extends ISequencedDocumentMessage {
     // (undocumented)
@@ -786,7 +849,7 @@ export class SummaryCollection extends TypedEventEmitter<ISummaryCollectionOpEve
 // @public
 export type SummaryStage = SubmitSummaryResult["stage"] | "unknown";
 
-// @public
+// @internal
 export function TEST_requestSummarizer(loader: ILoader, url: string): Promise<ISummarizer>;
 
 // @public

package/dist/blobManager.d.ts

@@ -31,6 +31,7 @@ export declare class BlobHandle implements IFluidHandle<ArrayBufferLike> {
 }
 /**
  * Information from a snapshot needed to load BlobManager
+ * @public
  */
 export interface IBlobManagerLoadInfo {
     ids?: string[];
@@ -78,13 +79,13 @@ export declare class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
      * because we know that the server will not delete the blob corresponding to that storage ID.
      */
     private readonly opsInFlight;
-    private readonly retryThrottler;
     /**
      * This stores IDs of tombstoned blobs.
      * Tombstone is a temporary feature that imitates a blob getting swept by garbage collection.
      */
     private readonly tombstonedBlobs;
     private readonly sendBlobAttachOp;
+    private stopAttaching;
     constructor(routeContext: IFluidHandleContext, snapshot: IBlobManagerLoadInfo, getStorage: () => IDocumentStorageService, 
     /**
      * Submit a BlobAttach op. When a blob is uploaded, there is a short grace period before which the blob is
@@ -123,7 +124,6 @@ export declare class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
     private deletePendingBlobMaybe;
     private deletePendingBlob;
     private onUploadResolve;
-    private onUploadReject;
     /**
      * Resubmit a BlobAttach op. Used to add storage IDs to ops that were
      * submitted to runtime while disconnected.
@@ -186,6 +186,6 @@ export declare class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
      */
     private verifyBlobNotDeleted;
     setRedirectTable(table: Map<string, string>): void;
-    attachAndGetPendingBlobs(): Promise<IPendingBlobs | undefined>;
+    attachAndGetPendingBlobs(stopBlobAttachingSignal?: AbortSignal): Promise<IPendingBlobs | undefined>;
 }
 //# sourceMappingURL=blobManager.d.ts.map

package/dist/blobManager.d.ts.map

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

package/dist/blobManager.js

@@ -11,8 +11,8 @@ const core_utils_1 = require("@fluidframework/core-utils");
 const client_utils_1 = require("@fluid-internal/client-utils");
 const container_definitions_1 = require("@fluidframework/container-definitions");
 const telemetry_utils_1 = require("@fluidframework/telemetry-utils");
+const driver_utils_1 = require("@fluidframework/driver-utils");
 const gc_1 = require("./gc");
-const throttler_1 = require("./throttler");
 /**
  * This class represents blob (long string)
  * This object is used only when creating (writing) new blob and serialization purposes.
@@ -46,22 +46,6 @@ class BlobHandle {
     }
 }
 exports.BlobHandle = BlobHandle;
-class CancellableThrottler {
-    constructor(throttler) {
-        this.throttler = throttler;
-        this.cancelP = new core_utils_1.Deferred();
-    }
-    async getDelay() {
-        return Promise.race([
-            this.cancelP.promise,
-            new Promise((resolve) => setTimeout(resolve, this.throttler.getDelay())),
-        ]);
-    }
-    cancel() {
-        this.cancelP.resolve();
-        this.cancelP = new core_utils_1.Deferred();
-    }
-}
 class BlobManager extends client_utils_1.TypedEventEmitter {
     constructor(routeContext, snapshot, getStorage, 
     /**
@@ -98,15 +82,12 @@ class BlobManager extends client_utils_1.TypedEventEmitter {
          * because we know that the server will not delete the blob corresponding to that storage ID.
          */
         this.opsInFlight = new Map();
-        this.retryThrottler = new CancellableThrottler(new throttler_1.Throttler(60 * 1000, // 60 sec delay window
-        30 * 1000, // 30 sec max delay
-        // throttling function increases exponentially (0ms, 40ms, 80ms, 160ms, etc)
-        (0, throttler_1.formExponentialFn)({ coefficient: 20, initialDelay: 0 })));
         /**
          * This stores IDs of tombstoned blobs.
          * Tombstone is a temporary feature that imitates a blob getting swept by garbage collection.
          */
         this.tombstonedBlobs = new Set();
+        this.stopAttaching = false;
         this.mc = (0, telemetry_utils_1.createChildMonitoringContext)({
             logger: this.runtime.logger,
             namespace: "BlobManager",
@@ -198,7 +179,6 @@ class BlobManager extends client_utils_1.TypedEventEmitter {
      * Upload blobs added while offline. This must be completed before connecting and resubmitting ops.
      */
     async processStashedChanges() {
-        this.retryThrottler.cancel();
         const pendingUploads = Array.from(this.pendingBlobs.values())
             .filter((e) => e.pendingStashed === true)
             .map(async (e) => e.uploadP);
@@ -306,7 +286,27 @@ class BlobManager extends client_utils_1.TypedEventEmitter {
         });
     }
     async uploadBlob(localId, blob) {
-        return telemetry_utils_1.PerformanceEvent.timedExecAsync(this.mc.logger, { eventName: "createBlob" }, async () => this.getStorage().createBlob(blob), { end: true, cancel: this.runtime.connected ? "error" : "generic" }).then((response) => this.onUploadResolve(localId, response), async (err) => this.onUploadReject(localId, err));
+        return (0, driver_utils_1.runWithRetry)(async () => {
+            try {
+                return await this.getStorage().createBlob(blob);
+            }
+            catch (error) {
+                const entry = this.pendingBlobs.get(localId);
+                (0, core_utils_1.assert)(!!entry, 0x387 /* Must have pending blob entry for blob which failed to upload */);
+                if (entry.opsent && !(0, driver_utils_1.canRetryOnError)(error)) {
+                    throw (0, telemetry_utils_1.wrapError)(error, () => new telemetry_utils_1.LoggingError(`uploadBlob error`, { canRetry: true }));
+                }
+                throw error;
+            }
+        }, "createBlob", this.mc.logger, {
+            cancel: this.pendingBlobs.get(localId)?.abortSignal,
+        }).then((response) => this.onUploadResolve(localId, response), (error) => {
+            // it will only reject if we haven't sent an op
+            // and is a non-retriable error. It will only reject
+            // the promise but not throw any error outside.
+            this.pendingBlobs.get(localId)?.handleP.reject(error);
+            this.deletePendingBlob(localId);
+        });
     }
     /**
      * Set up a mapping in the redirect table from fromId to toId. Also, notify the runtime that a reference is added
@@ -331,7 +331,7 @@ class BlobManager extends client_utils_1.TypedEventEmitter {
     onUploadResolve(localId, response) {
         const entry = this.pendingBlobs.get(localId);
         (0, core_utils_1.assert)(entry !== undefined, 0x6c8 /* pending blob entry not found for uploaded blob */);
-        if (entry.abortSignal?.aborted === true && !entry.opsent) {
+        if ((entry.abortSignal?.aborted === true && !entry.opsent) || this.stopAttaching) {
             this.deletePendingBlob(localId);
             return;
         }
@@ -363,25 +363,6 @@ class BlobManager extends client_utils_1.TypedEventEmitter {
         }
         return response;
     }
-    async onUploadReject(localId, error) {
-        const entry = this.pendingBlobs.get(localId);
-        (0, core_utils_1.assert)(!!entry, 0x387 /* Must have pending blob entry for blob which failed to upload */);
-        if (entry.abortSignal?.aborted === true && !entry.opsent) {
-            this.deletePendingBlob(localId);
-            return;
-        }
-        if (!this.runtime.connected) {
-            // we are probably not connected to storage but start another upload request in case we are
-            entry.uploadP = this.retryThrottler
-                .getDelay()
-                .then(async () => this.uploadBlob(localId, entry.blob));
-            return entry.uploadP;
-        }
-        else {
-            this.deletePendingBlob(localId);
-            entry.handleP.reject(error);
-        }
-    }
     /**
      * Resubmit a BlobAttach op. Used to add storage IDs to ops that were
      * submitted to runtime while disconnected.
@@ -641,7 +622,7 @@ class BlobManager extends client_utils_1.TypedEventEmitter {
             this.setRedirection(storageId, storageId);
         }
     }
-    async attachAndGetPendingBlobs() {
+    async attachAndGetPendingBlobs(stopBlobAttachingSignal) {
         return telemetry_utils_1.PerformanceEvent.timedExecAsync(this.mc.logger, { eventName: "GetPendingBlobs" }, async () => {
             if (this.pendingBlobs.size === 0) {
                 return;
@@ -653,11 +634,12 @@ class BlobManager extends client_utils_1.TypedEventEmitter {
                 for (const [id, entry] of this.pendingBlobs) {
                     if (!localBlobs.has(entry)) {
                         localBlobs.add(entry);
-                        if (!entry.opsent) {
-                            this.sendBlobAttachOp(id, entry.storageId);
-                        }
                         entry.handleP.resolve(this.getBlobHandle(id));
-                        attachBlobsP.push(new Promise((resolve) => {
+                        attachBlobsP.push(new Promise((resolve, reject) => {
+                            stopBlobAttachingSignal?.addEventListener("abort", () => {
+                                this.stopAttaching = true;
+                                reject(new Error("Operation aborted"));
+                            }, { once: true });
                             const onBlobAttached = (attachedEntry) => {
                                 if (attachedEntry === entry) {
                                     this.off("blobAttached", onBlobAttached);
@@ -673,10 +655,20 @@ class BlobManager extends client_utils_1.TypedEventEmitter {
                         }));
                     }
                 }
-                await Promise.all(attachBlobsP);
+                await Promise.allSettled(attachBlobsP).catch(() => { });
             }
             for (const [id, entry] of this.pendingBlobs) {
+                if (stopBlobAttachingSignal?.aborted && !entry.attached) {
+                    this.mc.logger.sendTelemetryEvent({
+                        eventName: "UnableToStashBlob",
+                        id,
+                    });
+                    continue;
+                }
                 (0, core_utils_1.assert)(entry.attached === true, 0x790 /* stashed blob should be attached */);
+                if (!entry.opsent) {
+                    this.sendBlobAttachOp(id, entry.storageId);
+                }
                 blobs[id] = {
                     blob: (0, client_utils_1.bufferToString)(entry.blob, "base64"),
                     storageId: entry.storageId,