@fluidframework/container-runtime 0.58.2002 → 0.58.3000-61081

package/dist/containerRuntime.js

@@ -30,6 +30,7 @@ const runWhileConnectedCoordinator_1 = require("./runWhileConnectedCoordinator")
 const garbageCollection_1 = require("./garbageCollection");
 const dataStore_1 = require("./dataStore");
 const batchTracker_1 = require("./batchTracker");
+const opTelemetry_1 = require("./opTelemetry");
 var ContainerMessageType;
 (function (ContainerMessageType) {
     // An op to be delivered to store
@@ -82,6 +83,11 @@ const maxOpSizeInBytesKey = "Fluid.ContainerRuntime.MaxOpSizeInBytes";
 // in order to account for some extra overhead from serialization
 // to not reach the 1MB limits in socket.io and Kafka.
 const defaultMaxOpSizeInBytes = 768000;
+// By default, the size of the contents for the incoming ops is tracked.
+// However, in certain situations, this may incur a performance hit.
+// The feature-gate below can be used to disable this feature.
+const disableOpTrackingKey = "Fluid.ContainerRuntime.DisableOpTracking";
+const defaultFlushMode = runtime_definitions_1.FlushMode.TurnBased;
 var RuntimeMessage;
 (function (RuntimeMessage) {
     RuntimeMessage["FluidDataStoreOp"] = "component";
@@ -132,6 +138,7 @@ class ScheduleManagerCore {
         this.logger = logger;
         this.localPaused = false;
         this.timePaused = 0;
+        this.batchCount = 0;
         // Listen for delta manager sends and add batch metadata to messages
         this.deltaManager.on("prepareSend", (messages) => {
             if (messages.length === 0) {
@@ -198,13 +205,26 @@ class ScheduleManagerCore {
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         this.deltaManager.inbound.pause();
     }
-    resumeQueue(startBatch, endBatch) {
+    resumeQueue(startBatch, messageEndBatch) {
+        const endBatch = messageEndBatch.sequenceNumber;
+        const duration = common_utils_1.performance.now() - this.timePaused;
+        this.batchCount++;
+        if (this.batchCount % 1000 === 1) {
+            this.logger.sendTelemetryEvent({
+                eventName: "BatchStats",
+                sequenceNumber: endBatch,
+                length: endBatch - startBatch + 1,
+                msnDistance: endBatch - messageEndBatch.minimumSequenceNumber,
+                duration,
+                batchCount: this.batchCount,
+                interrupted: this.localPaused,
+            });
+        }
         // Return early if no change in value
         if (!this.localPaused) {
             return;
         }
         this.localPaused = false;
-        const duration = common_utils_1.performance.now() - this.timePaused;
         // Random round number - we want to know when batch waiting paused op processing.
         if (duration > connectionTelemetry_1.latencyThreshold) {
             this.logger.sendErrorEvent({
@@ -265,7 +285,7 @@ class ScheduleManagerCore {
         else if (batchMetadata === false) {
             common_utils_1.assert(this.pauseSequenceNumber !== undefined, 0x2a0 /* "batch presence was validated above" */);
             // Batch is complete, we can process it!
-            this.resumeQueue(this.pauseSequenceNumber, message.sequenceNumber);
+            this.resumeQueue(this.pauseSequenceNumber, message);
             this.pauseSequenceNumber = undefined;
             this.currentBatchClientId = undefined;
         }
@@ -370,7 +390,6 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         this._storage = _storage;
         this.defaultMaxConsecutiveReconnects = 15;
         this._orderSequentiallyCalls = 0;
-        this._flushMode = runtime_definitions_1.FlushMode.TurnBased;
         this.needsFlush = false;
         this.flushTrigger = false;
         this.paused = false;
@@ -453,6 +472,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 ((_c = runtimeOptions.useDataStoreAliasing) !== null && _c !== void 0 ? _c : false);
         this._maxOpSizeInBytes = ((_d = this.mc.config.getNumber(maxOpSizeInBytesKey)) !== null && _d !== void 0 ? _d : defaultMaxOpSizeInBytes);
         this.maxConsecutiveReconnects = (_e = this.mc.config.getNumber(maxConsecutiveReconnectsKey)) !== null && _e !== void 0 ? _e : this.defaultMaxConsecutiveReconnects;
+        this._flushMode = runtimeOptions.flushMode;
         this.garbageCollector = garbageCollection_1.GarbageCollector.create(this, this.runtimeOptions.gcOptions, (unusedRoutes) => this.dataStores.deleteUnusedRoutes(unusedRoutes), (nodePath) => this.dataStores.getNodePackagePath(nodePath), 
         /**
          * Returns the timestamp of the last message seen by this client. This is used by garbage collector as
@@ -567,6 +587,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         this.logger.sendTelemetryEvent(Object.assign(Object.assign(Object.assign({ eventName: "ContainerLoadStats" }, this.createContainerMetadata), this.dataStores.containerLoadStats), { summaryCount: this.summaryCount, summaryFormatVersion: metadata === null || metadata === void 0 ? void 0 : metadata.summaryFormatVersion, disableIsolatedChannels: metadata === null || metadata === void 0 ? void 0 : metadata.disableIsolatedChannels, gcVersion: metadata === null || metadata === void 0 ? void 0 : metadata.gcFeature }));
         connectionTelemetry_1.ReportOpPerfTelemetry(this.context.clientId, this.deltaManager, this.logger);
         batchTracker_1.BindBatchTracker(this, this.logger);
+        this.opTracker = new opTelemetry_1.OpTracker(this.deltaManager, this.mc.config.getBoolean(disableOpTrackingKey) === true);
     }
     get IContainerRuntime() { return this; }
     get IFluidRouter() { return this; }
@@ -589,7 +610,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 runtimeVersion: packageVersion_1.pkgVersion,
             },
         });
-        const { summaryOptions = {}, gcOptions = {}, loadSequenceNumberVerification = "close", useDataStoreAliasing = false, } = runtimeOptions;
+        const { summaryOptions = {}, gcOptions = {}, loadSequenceNumberVerification = "close", useDataStoreAliasing = false, flushMode = defaultFlushMode, } = runtimeOptions;
         // We pack at data store level only. If isolated channels are disabled,
         // then there are no .channel layers, we pack at level 1, otherwise we pack at level 2
         const packingLevel = summaryOptions.disableIsolatedChannels ? 1 : 2;
@@ -660,6 +681,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             gcOptions,
             loadSequenceNumberVerification,
             useDataStoreAliasing,
+            flushMode,
         }, containerScope, logger, loadExisting, blobManagerSnapshot, requestHandler, storage);
         return runtime;
     }
@@ -878,12 +900,11 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             const electedSummarizerContent = JSON.stringify((_a = this.summarizerClientElection) === null || _a === void 0 ? void 0 : _a.serialize());
             runtime_utils_1.addBlobToSummary(summaryTree, summaryFormat_1.electedSummarizerBlobName, electedSummarizerContent);
         }
-        const snapshot = this.blobManager.snapshot();
+        const summary = this.blobManager.summarize();
         // Some storage (like git) doesn't allow empty tree, so we can omit it.
         // and the blob manager can handle the tree not existing when loading
-        if (snapshot.entries.length !== 0) {
-            const blobsTree = runtime_utils_1.convertToSummaryTree(snapshot, false);
-            runtime_utils_1.addTreeToSummary(summaryTree, summaryFormat_1.blobsTreeName, blobsTree);
+        if (Object.keys(summary.summary.tree).length > 0) {
+            runtime_utils_1.addTreeToSummary(summaryTree, summaryFormat_1.blobsTreeName, summary);
         }
         if (this.garbageCollector.writeDataAtRoot) {
             const gcSummary = this.garbageCollector.summarize();
@@ -1072,6 +1093,11 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         if (mode === this._flushMode) {
             return;
         }
+        this.mc.logger.sendTelemetryEvent({
+            eventName: "FlushMode Updated",
+            old: this._flushMode,
+            new: mode,
+        });
         // Flush any pending batches if switching to immediate
         if (mode === runtime_definitions_1.FlushMode.Immediate) {
             this.flush();
@@ -1199,6 +1225,10 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         const fluidDataStore = await this.dataStores._createFluidDataStoreContext(Array.isArray(pkg) ? pkg : [pkg], id, isRoot, props).realize();
         if (isRoot) {
             fluidDataStore.bindToContext();
+            this.logger.sendTelemetryEvent({
+                eventName: "Root datastore with props",
+                hasProps: props !== undefined,
+            });
         }
         return dataStore_1.channelToDataStore(fluidDataStore, id, this, this.dataStores, this.mc.logger);
     }
@@ -1322,9 +1352,9 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         if (runGC) {
             gcStats = await this.collectGarbage({ logger: summaryLogger, runSweep, fullGC });
         }
-        const summarizeResult = await this.summarizerNode.summarize(fullTree, trackState);
-        common_utils_1.assert(summarizeResult.summary.type === protocol_definitions_1.SummaryType.Tree, 0x12f /* "Container Runtime's summarize should always return a tree" */);
-        return Object.assign(Object.assign({}, summarizeResult), { gcStats });
+        const { stats, summary } = await this.summarizerNode.summarize(fullTree, trackState);
+        common_utils_1.assert(summary.type === protocol_definitions_1.SummaryType.Tree, 0x12f /* "Container Runtime's summarize should always return a tree" */);
+        return { stats, summary, gcStats };
     }
     /**
      * Implementation of IGarbageCollectionRuntime::updateStateBeforeGC.
@@ -1399,6 +1429,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         try {
             await this.deltaManager.inbound.pause();
             const summaryRefSeqNum = this.deltaManager.lastSequenceNumber;
+            const minimumSequenceNumber = this.deltaManager.minimumSequenceNumber;
             const message = `Summary @${summaryRefSeqNum}:${this.deltaManager.minimumSequenceNumber}`;
             // We should be here is we haven't processed be here. If we are of if the last message's sequence number
             // doesn't match the last processed sequence number, log an error.
@@ -1438,7 +1469,12 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             };
             let continueResult = checkContinue();
             if (!continueResult.continue) {
-                return { stage: "base", referenceSequenceNumber: summaryRefSeqNum, error: continueResult.error };
+                return {
+                    stage: "base",
+                    referenceSequenceNumber: summaryRefSeqNum,
+                    minimumSequenceNumber,
+                    error: continueResult.error,
+                };
             }
             // increment summary count
             if (this.summaryCount !== undefined) {
@@ -1461,7 +1497,12 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 });
             }
             catch (error) {
-                return { stage: "base", referenceSequenceNumber: summaryRefSeqNum, error };
+                return {
+                    stage: "base",
+                    referenceSequenceNumber: summaryRefSeqNum,
+                    minimumSequenceNumber,
+                    error,
+                };
             }
             const { summary: summaryTree, stats: partialStats } = summarizeResult;
             // Now that we have generated the summary, update the message at last summary to the last message processed.
@@ -1472,9 +1513,13 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             const dataStoreTree = this.disableIsolatedChannels ? summaryTree : summaryTree.tree[runtime_definitions_1.channelsTreeName];
             common_utils_1.assert(dataStoreTree.type === protocol_definitions_1.SummaryType.Tree, 0x1fc /* "summary is not a tree" */);
             const handleCount = Object.values(dataStoreTree.tree).filter((value) => value.type === protocol_definitions_1.SummaryType.Handle).length;
-            const summaryStats = Object.assign({ dataStoreCount: this.dataStores.size, summarizedDataStoreCount: this.dataStores.size - handleCount, gcStateUpdatedDataStoreCount: (_b = summarizeResult.gcStats) === null || _b === void 0 ? void 0 : _b.updatedDataStoreCount }, partialStats);
+            const gcSummaryTreeStats = summaryTree.tree[garbageCollection_1.gcTreeKey]
+                ? runtime_utils_1.calculateStats(summaryTree.tree[garbageCollection_1.gcTreeKey])
+                : undefined;
+            const summaryStats = Object.assign({ dataStoreCount: this.dataStores.size, summarizedDataStoreCount: this.dataStores.size - handleCount, gcStateUpdatedDataStoreCount: (_b = summarizeResult.gcStats) === null || _b === void 0 ? void 0 : _b.updatedDataStoreCount, gcBlobNodeCount: gcSummaryTreeStats === null || gcSummaryTreeStats === void 0 ? void 0 : gcSummaryTreeStats.blobNodeCount, gcTotalBlobsSize: gcSummaryTreeStats === null || gcSummaryTreeStats === void 0 ? void 0 : gcSummaryTreeStats.totalBlobSize, opsSizesSinceLastSummary: this.opTracker.opsSizeAccumulator, nonSystemOpsSinceLastSummary: this.opTracker.nonSystemOpCount }, partialStats);
             const generateSummaryData = {
                 referenceSequenceNumber: summaryRefSeqNum,
+                minimumSequenceNumber,
                 summaryTree,
                 summaryStats,
                 generateDuration: trace.trace().duration,
@@ -1525,6 +1570,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             }
             const submitData = Object.assign(Object.assign({ stage: "submit" }, uploadData), { clientSequenceNumber, submitOpDuration: trace.trace().duration });
             this.summarizerNode.completeSummary(handle);
+            this.opTracker.reset();
             return submitData;
         }
         finally {