@fluidframework/container-runtime 2.0.0-internal.7.0.0 → 2.0.0-internal.7.0.2

package/dist/containerRuntime.js

@@ -105,6 +105,7 @@ exports.defaultRuntimeHeaderData = {
     wait: true,
     viaHandle: false,
     allowTombstone: false,
+    allowInactive: false,
 };
 /**
  * Available compression algorithms for op compression.
@@ -408,6 +409,14 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
             ? this.summaryConfiguration.initialSummarizerDelayMs
             : 0;
     }
+    /** If false, loading or using a Tombstoned object should merely log, not fail */
+    get gcTombstoneEnforcementAllowed() {
+        return this.garbageCollector.tombstoneEnforcementAllowed;
+    }
+    /** If true, throw an error when a tombstone data store is used. */
+    get gcThrowOnTombstoneUsage() {
+        return this.garbageCollector.throwOnTombstoneUsage;
+    }
     /**
      * @internal
      */
@@ -512,7 +521,6 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         // Note that we only need to pull the *initial* connected state from the context.
         // Later updates come through calls to setConnectionState.
         this._connected = connected;
-        this.gcTombstoneEnforcementAllowed = (0, gc_1.shouldAllowGcTombstoneEnforcement)(metadata?.gcFeatureMatrix?.tombstoneGeneration /* persisted */, this.runtimeOptions.gcOptions[gc_1.gcTombstoneGenerationOptionName] /* current */);
         this.mc.logger.sendTelemetryEvent({
             eventName: "GCFeatureMatrix",
             metadataValue: JSON.stringify(metadata?.gcFeatureMatrix),
@@ -523,7 +531,12 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         this.telemetryDocumentId = metadata?.telemetryDocumentId ?? (0, uuid_1.v4)();
         this.disableAttachReorder = this.mc.config.getBoolean("Fluid.ContainerRuntime.disableAttachOpReorder");
         const disableChunking = this.mc.config.getBoolean("Fluid.ContainerRuntime.CompressionChunkingDisabled");
-        const opGroupingManager = new opLifecycle_1.OpGroupingManager(this.groupedBatchingEnabled);
+        const opGroupingManager = new opLifecycle_1.OpGroupingManager({
+            groupedBatchingEnabled: this.groupedBatchingEnabled,
+            opCountThreshold: this.mc.config.getNumber("Fluid.ContainerRuntime.GroupedBatchingOpCount") ?? 2,
+            reentrantBatchGroupingEnabled: this.mc.config.getBoolean("Fluid.ContainerRuntime.GroupedBatchingReentrancy") ??
+                true,
+        }, this.mc.logger);
         const opSplitter = new opLifecycle_1.OpSplitter(chunks, this.submitBatchFn, disableChunking === true ? Number.POSITIVE_INFINITY : runtimeOptions.chunkSizeInBytes, runtimeOptions.maxBatchSizeInBytes, this.mc.logger);
         this.remoteMessageProcessor = new opLifecycle_1.RemoteMessageProcessor(opSplitter, new opLifecycle_1.OpDecompressor(this.mc.logger), opGroupingManager);
         this.handleContext = new containerHandleContext_1.ContainerFluidHandleContext("", this);
@@ -642,7 +655,6 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                 compressionOptions,
                 maxBatchSizeInBytes: runtimeOptions.maxBatchSizeInBytes,
                 disablePartialFlush: disablePartialFlush === true,
-                enableGroupedBatching: this.groupedBatchingEnabled,
             },
             logger: this.mc.logger,
             groupingManager: opGroupingManager,
@@ -833,7 +845,9 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
                     : (0, runtime_utils_1.create404Response)(request);
             }
             else if (requestParser.pathParts.length > 0) {
-                const dataStore = await this.getDataStoreFromRequest(id, request);
+                // Differentiate between requesting the dataStore directly, or one of its children
+                const requestForChild = !requestParser.isLeaf(1);
+                const dataStore = await this.getDataStoreFromRequest(id, request, requestForChild);
                 const subRequest = requestParser.createSubRequest(1);
                 // We always expect createSubRequest to include a leading slash, but asserting here to protect against
                 // unintentionally modifying the url if that changes.
@@ -855,7 +869,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
     internalId(maybeAlias) {
         return this.dataStores.aliases.get(maybeAlias) ?? maybeAlias;
     }
-    async getDataStoreFromRequest(id, request) {
+    async getDataStoreFromRequest(id, request, requestForChild) {
         const headerData = {};
         if (typeof request.headers?.[RuntimeHeaders.wait] === "boolean") {
             headerData.wait = request.headers[RuntimeHeaders.wait];
@@ -866,15 +880,25 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         if (typeof request.headers?.[exports.AllowTombstoneRequestHeaderKey] === "boolean") {
             headerData.allowTombstone = request.headers[exports.AllowTombstoneRequestHeaderKey];
         }
+        if (typeof request.headers?.[exports.AllowInactiveRequestHeaderKey] === "boolean") {
+            headerData.allowInactive = request.headers[exports.AllowInactiveRequestHeaderKey];
+        }
+        // We allow Tombstone requests for sub-DataStore objects
+        if (requestForChild) {
+            headerData.allowTombstone = true;
+        }
         await this.dataStores.waitIfPendingAlias(id);
         const internalId = this.internalId(id);
         const dataStoreContext = await this.dataStores.getDataStore(internalId, headerData);
-        const dataStoreChannel = await dataStoreContext.realize();
         // 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, gc_1.trimLeadingAndTrailingSlashes)(request.url.split("?")[0]);
-        this.garbageCollector.nodeUpdated(`/${urlWithoutQuery}`, "Loaded", undefined /* timestampMs */, dataStoreContext.packagePath, request?.headers);
-        return dataStoreChannel;
+        // 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.garbageCollector.nodeUpdated(`/${urlWithoutQuery}`, "Loaded", undefined /* timestampMs */, details.pkg, request, headerData);
+        return dataStoreContext.realize();
     }
     /** Adds the container's metadata to the given summary tree. */
     addMetadataToSummary(summaryTree) {
@@ -1378,6 +1402,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         if (channel.entryPoint === undefined) {
             throw new telemetry_utils_1.UsageError("entryPoint must be defined on data store runtime for using getAliasedDataStoreEntryPoint");
         }
+        this.garbageCollector.nodeUpdated(`/${internalId}`, "Loaded", undefined /* timestampMs */, context.packagePath);
         return channel.entryPoint;
     }
     createDetachedRootDataStore(pkg, rootDataStoreId) {