diff --git a/packages/runtime/container-runtime/src/containerRuntime.ts b/packages/runtime/container-runtime/src/containerRuntime.ts index bcd9ce200648..d5081ae994c2 100644 --- a/packages/runtime/container-runtime/src/containerRuntime.ts +++ b/packages/runtime/container-runtime/src/containerRuntime.ts @@ -1675,9 +1675,6 @@ export class ContainerRuntime groupedBatchingEnabled: this.groupedBatchingEnabled, opCountThreshold: this.mc.config.getNumber("Fluid.ContainerRuntime.GroupedBatchingOpCount") ?? 2, - reentrantBatchGroupingEnabled: - this.mc.config.getBoolean("Fluid.ContainerRuntime.GroupedBatchingReentrancy") ?? - true, }, this.mc.logger, ); diff --git a/packages/runtime/container-runtime/src/opLifecycle/opGroupingManager.ts b/packages/runtime/container-runtime/src/opLifecycle/opGroupingManager.ts index 918a82f516af..622bb470db8a 100644 --- a/packages/runtime/container-runtime/src/opLifecycle/opGroupingManager.ts +++ b/packages/runtime/container-runtime/src/opLifecycle/opGroupingManager.ts @@ -35,7 +35,6 @@ export function isGroupedBatch(op: ISequencedDocumentMessage): boolean { export interface OpGroupingManagerConfig { readonly groupedBatchingEnabled: boolean; readonly opCountThreshold: number; - readonly reentrantBatchGroupingEnabled: boolean; } export class OpGroupingManager { @@ -156,9 +155,8 @@ export class OpGroupingManager { this.config.groupedBatchingEnabled && // The number of ops in the batch must surpass the configured threshold // or be empty (to allow for empty batches to be grouped) - (batch.messages.length === 0 || batch.messages.length >= this.config.opCountThreshold) && - // Support for reentrant batches must be explicitly enabled - (this.config.reentrantBatchGroupingEnabled || batch.hasReentrantOps !== true) + (batch.messages.length === 0 || batch.messages.length >= this.config.opCountThreshold) + // Support for reentrant batches will be on by default ); } } diff --git a/packages/runtime/container-runtime/src/test/opLifecycle/OpGroupingManager.spec.ts b/packages/runtime/container-runtime/src/test/opLifecycle/OpGroupingManager.spec.ts index 8cf41ab8754a..2fcbd3d4c4b8 100644 --- a/packages/runtime/container-runtime/src/test/opLifecycle/OpGroupingManager.spec.ts +++ b/packages/runtime/container-runtime/src/test/opLifecycle/OpGroupingManager.spec.ts @@ -73,7 +73,6 @@ describe("OpGroupingManager", () => { { groupedBatchingEnabled: option.enabled, opCountThreshold: option.tooSmall === true ? 10 : 2, - reentrantBatchGroupingEnabled: option.reentryEnabled ?? false, }, mockLogger, ).shouldGroup(createBatch(5, option.reentrant)), @@ -90,7 +89,6 @@ describe("OpGroupingManager", () => { { groupedBatchingEnabled: false, opCountThreshold: 2, - reentrantBatchGroupingEnabled: false, }, mockLogger, ).groupBatch(createBatch(5)); @@ -102,7 +100,6 @@ describe("OpGroupingManager", () => { { groupedBatchingEnabled: true, opCountThreshold: 2, - reentrantBatchGroupingEnabled: false, }, mockLogger, ).groupBatch(createBatch(5)); @@ -123,7 +120,6 @@ describe("OpGroupingManager", () => { { groupedBatchingEnabled: true, opCountThreshold: 2, - reentrantBatchGroupingEnabled: false, }, mockLogger, ).groupBatch(createBatch(5, false, false, batchId)); @@ -137,7 +133,6 @@ describe("OpGroupingManager", () => { { groupedBatchingEnabled: false, opCountThreshold: 2, - reentrantBatchGroupingEnabled: false, }, mockLogger, ).createEmptyGroupedBatch("resubmittingBatchId", 0); @@ -150,7 +145,6 @@ describe("OpGroupingManager", () => { { groupedBatchingEnabled: true, opCountThreshold: 2, - reentrantBatchGroupingEnabled: false, }, mockLogger, ).createEmptyGroupedBatch(batchId, 0); @@ -169,7 +163,6 @@ describe("OpGroupingManager", () => { { groupedBatchingEnabled: true, opCountThreshold: 2, - reentrantBatchGroupingEnabled: false, }, mockLogger, ).shouldGroup({ @@ -187,7 +180,6 @@ describe("OpGroupingManager", () => { { groupedBatchingEnabled: true, opCountThreshold: 10, - reentrantBatchGroupingEnabled: false, }, mockLogger, ).groupBatch(createBatch(5)); @@ -200,7 +192,6 @@ describe("OpGroupingManager", () => { { groupedBatchingEnabled: true, opCountThreshold: 2, - reentrantBatchGroupingEnabled: false, }, mockLogger, ).groupBatch(createBatch(5, false, true)); @@ -213,7 +204,6 @@ describe("OpGroupingManager", () => { { groupedBatchingEnabled: true, opCountThreshold: 2, - reentrantBatchGroupingEnabled: false, }, mockLogger, ).groupBatch(createBatch(5, false, true, "batchId")); @@ -227,7 +217,6 @@ describe("OpGroupingManager", () => { { groupedBatchingEnabled: true, opCountThreshold: 2, - reentrantBatchGroupingEnabled: true, }, mockLogger, ); @@ -280,7 +269,6 @@ describe("OpGroupingManager", () => { { groupedBatchingEnabled: true, opCountThreshold: 2, - reentrantBatchGroupingEnabled: true, }, mockLogger, ); @@ -299,7 +287,6 @@ describe("OpGroupingManager", () => { { groupedBatchingEnabled: false, opCountThreshold: 2, - reentrantBatchGroupingEnabled: true, }, mockLogger, ); @@ -344,7 +331,6 @@ describe("OpGroupingManager", () => { { groupedBatchingEnabled: false, opCountThreshold: 2, - reentrantBatchGroupingEnabled: true, }, mockLogger, ); diff --git a/packages/runtime/container-runtime/src/test/opLifecycle/outbox.spec.ts b/packages/runtime/container-runtime/src/test/opLifecycle/outbox.spec.ts index 0038e66472b0..204f2293af66 100644 --- a/packages/runtime/container-runtime/src/test/opLifecycle/outbox.spec.ts +++ b/packages/runtime/container-runtime/src/test/opLifecycle/outbox.spec.ts @@ -232,7 +232,6 @@ describe("Outbox", () => { params.opGroupingConfig ?? { groupedBatchingEnabled: false, opCountThreshold: Infinity, - reentrantBatchGroupingEnabled: false, }, mockLogger, ), @@ -326,7 +325,6 @@ describe("Outbox", () => { opGroupingConfig: { groupedBatchingEnabled: true, opCountThreshold: 2, - reentrantBatchGroupingEnabled: true, }, }); currentSeqNumbers.referenceSequenceNumber = 0; @@ -358,7 +356,6 @@ describe("Outbox", () => { opGroupingConfig: { groupedBatchingEnabled: true, opCountThreshold: 3, - reentrantBatchGroupingEnabled: true, }, }); // Flush 1 - resubmit multi-message batch including ID Allocation @@ -1009,7 +1006,6 @@ describe("Outbox", () => { opGroupingConfig: { groupedBatchingEnabled: false, opCountThreshold: 2, - reentrantBatchGroupingEnabled: true, }, }); @@ -1032,7 +1028,6 @@ describe("Outbox", () => { opGroupingConfig: { groupedBatchingEnabled: true, opCountThreshold: 2, - reentrantBatchGroupingEnabled: true, }, }); @@ -1057,7 +1052,6 @@ describe("Outbox", () => { opGroupingConfig: { groupedBatchingEnabled: true, opCountThreshold: 2, - reentrantBatchGroupingEnabled: true, }, }); @@ -1080,7 +1074,6 @@ describe("Outbox", () => { opGroupingConfig: { groupedBatchingEnabled: false, opCountThreshold: 2, - reentrantBatchGroupingEnabled: true, }, }); @@ -1103,7 +1096,6 @@ describe("Outbox", () => { opGroupingConfig: { groupedBatchingEnabled: true, opCountThreshold: 2, - reentrantBatchGroupingEnabled: true, }, }); diff --git a/packages/runtime/container-runtime/src/test/opLifecycle/remoteMessageProcessor.spec.ts b/packages/runtime/container-runtime/src/test/opLifecycle/remoteMessageProcessor.spec.ts index 5a3e5f88d7c2..f2c965b51430 100644 --- a/packages/runtime/container-runtime/src/test/opLifecycle/remoteMessageProcessor.spec.ts +++ b/packages/runtime/container-runtime/src/test/opLifecycle/remoteMessageProcessor.spec.ts @@ -39,7 +39,6 @@ describe("RemoteMessageProcessor", () => { { groupedBatchingEnabled: true, opCountThreshold: Infinity, - reentrantBatchGroupingEnabled: false, }, logger, ), @@ -130,7 +129,6 @@ describe("RemoteMessageProcessor", () => { { groupedBatchingEnabled: true, opCountThreshold: 2, - reentrantBatchGroupingEnabled: false, }, mockLogger, );