Skip to content

Commit 1b6c2da

Browse files
agarwal-navinagarwal-navin
authored
Make summarizer feature flag names consistent (#17159)
The feature flag name for couple of the recent features are inconsstent. This PR updates them to all have the "Fluid.Summarizer" prefix to make it consistent with other related feature flag names. - `Fluid.ContainerRuntime.Test.ValidateSummaryBeforeUpload` -> `Fluid.Summarizer.ValidateSummaryBeforeUpload`. - `Fluid.ContainerRuntime.SubmitSummary.waitForPendingOpsTimeoutMs` -> `Fluid.Summarizer.waitForPendingOpsTimeoutMs`
1 parent 8673f18 commit 1b6c2da

File tree

6 files changed

+23
-26
lines changed

6 files changed

+23
-26
lines changed

‎packages/runtime/container-runtime/src/containerRuntime.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1555,8 +1555,7 @@ export class ContainerRuntime
15551555
);
15561556
this.closeSummarizerDelayMs = closeSummarizerDelayOverride ?? defaultCloseSummarizerDelayMs;
15571557
this.validateSummaryBeforeUpload =
1558-
this.mc.config.getBoolean("Fluid.ContainerRuntime.Test.ValidateSummaryBeforeUpload") ??
1559-
false;
1558+
this.mc.config.getBoolean("Fluid.Summarizer.ValidateSummaryBeforeUpload") ?? false;
15601559

15611560
this.summaryCollection = new SummaryCollection(this.deltaManager, this.logger);
15621561

@@ -2974,9 +2973,8 @@ export class ContainerRuntime
29742973
const countBefore = this.pendingMessagesCount;
29752974
// The timeout for waiting for pending ops can be overridden via configurations.
29762975
const pendingOpsTimeout =
2977-
this.mc.config.getNumber(
2978-
"Fluid.ContainerRuntime.SubmitSummary.waitForPendingOpsTimeoutMs",
2979-
) ?? defaultPendingOpsWaitTimeoutMs;
2976+
this.mc.config.getNumber("Fluid.Summarizer.waitForPendingOpsTimeoutMs") ??
2977+
defaultPendingOpsWaitTimeoutMs;
29802978
await new Promise<void>((resolve, reject) => {
29812979
const timeoutId = setTimeout(() => resolve(), pendingOpsTimeout);
29822980
this.once("saved", () => {

‎packages/runtime/container-runtime/src/summary/runningSummarizer.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ export class RunningSummarizer extends TypedEventEmitter<ISummarizerEvents> impl
606606
this.beforeSummaryAction();
607607
},
608608
async () => {
609-
return this.mc.config.getBoolean("Fluid.Summarizer.TryDynamicRetries")
609+
return this.mc.config.getBoolean("Fluid.Summarizer.UseDynamicRetries")
610610
? this.trySummarizeWithRetries(reason)
611611
: this.trySummarizeWithStaticAttempts(reason);
612612
},

‎packages/runtime/container-runtime/src/test/containerRuntime.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1527,7 +1527,7 @@ describe("Runtime", () => {
15271527

15281528
beforeEach(async () => {
15291529
const settings = {};
1530-
settings["Fluid.ContainerRuntime.Test.ValidateSummaryBeforeUpload"] = true;
1530+
settings["Fluid.Summarizer.ValidateSummaryBeforeUpload"] = true;
15311531
containerRuntime = await ContainerRuntime.loadRuntime({
15321532
context: getMockContext(settings) as IContainerContext,
15331533
registryEntries: [],

‎packages/runtime/container-runtime/src/test/summary/runningSummarizer.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,7 @@ describe("Runtime", () => {
768768

769769
describe("Summarization attempts with retry", () => {
770770
beforeEach(async () => {
771-
settings["Fluid.Summarizer.TryDynamicRetries"] = true;
771+
settings["Fluid.Summarizer.UseDynamicRetries"] = true;
772772
shouldDeferGenerateSummary = false;
773773
deferGenerateSummary = undefined;
774774
});
@@ -1860,7 +1860,7 @@ describe("Runtime", () => {
18601860

18611861
beforeEach(async () => {
18621862
// Currently, summarize events are only logged with this feature.
1863-
settings["Fluid.Summarizer.TryDynamicRetries"] = true;
1863+
settings["Fluid.Summarizer.UseDynamicRetries"] = true;
18641864
});
18651865

18661866
it("should emit summarize event with success result", async () => {

‎packages/test/test-end-to-end-tests/src/test/summarizerWithLocalChanges.spec.ts‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ describeNoCompat("Summarizer with local changes", (getTestObjectProvider) => {
224224
}
225225
settings = {};
226226
settings["Fluid.ContainerRuntime.Test.CloseSummarizerDelayOverrideMs"] = 0;
227-
settings["Fluid.ContainerRuntime.Test.ValidateSummaryBeforeUpload"] = true;
227+
settings["Fluid.Summarizer.ValidateSummaryBeforeUpload"] = true;
228228
settings["Fluid.Summarizer.PendingOpsRetryDelayMs"] = 5;
229229
});
230230

@@ -285,7 +285,7 @@ describeNoCompat("Summarizer with local changes", (getTestObjectProvider) => {
285285
},
286286
],
287287
async () => {
288-
settings["Fluid.ContainerRuntime.Test.ValidateSummaryBeforeUpload"] = false;
288+
settings["Fluid.Summarizer.ValidateSummaryBeforeUpload"] = false;
289289
const container = await createContainer(provider);
290290
await waitForContainerConnection(container);
291291
const rootDataObject = await requestFluidObject<RootTestDataObject>(container, "/");
@@ -333,8 +333,7 @@ describeNoCompat("Summarizer with local changes", (getTestObjectProvider) => {
333333
async () => {
334334
// Wait for 100 ms for pending ops to be saved.
335335
const pendingOpsTimeoutMs = 100;
336-
settings["Fluid.ContainerRuntime.SubmitSummary.waitForPendingOpsTimeoutMs"] =
337-
pendingOpsTimeoutMs;
336+
settings["Fluid.Summarizer.waitForPendingOpsTimeoutMs"] = pendingOpsTimeoutMs;
338337
const mockLogger = new MockLogger();
339338
const container1 = await provider.makeTestContainer();
340339
const { summarizer, container: summarizerContainer } = await createSummarizer(
@@ -460,7 +459,7 @@ describeNoCompat("Summarizer with local changes", (getTestObjectProvider) => {
460459
},
461460
],
462461
async () => {
463-
settings["Fluid.Summarizer.TryDynamicRetries"] = tryDynamicRetry;
462+
settings["Fluid.Summarizer.UseDynamicRetries"] = tryDynamicRetry;
464463
const logger = new MockLogger();
465464
const mainContainer = await createContainer(
466465
provider,
@@ -572,7 +571,7 @@ describeNoCompat("Summarizer with local changes", (getTestObjectProvider) => {
572571
},
573572
],
574573
async () => {
575-
settings["Fluid.Summarizer.TryDynamicRetries"] = true;
574+
settings["Fluid.Summarizer.UseDynamicRetries"] = true;
576575
const container = await createContainer(provider, false /* disableSummary */);
577576
await waitForContainerConnection(container);
578577

@@ -654,7 +653,7 @@ describeNoCompat("Summarizer with local changes", (getTestObjectProvider) => {
654653
},
655654
],
656655
async () => {
657-
settings["Fluid.Summarizer.TryDynamicRetries"] = true;
656+
settings["Fluid.Summarizer.UseDynamicRetries"] = true;
658657
settings["Fluid.Summarizer.SkipFailingIncorrectSummary"] = true;
659658
settings["Fluid.Summarizer.PendingOpsRetryDelayMs"] = 5;
660659
const container = await createContainer(provider, false /* disableSummary */);

‎packages/test/test-service-load/testConfig.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,23 @@
2727
"optionOverrides": {
2828
"odsp": {
2929
"configurations": {
30-
"Fluid.ContainerRuntime.Test.ValidateSummaryBeforeUpload": [true, false],
31-
"Fluid.Summarizer.TryDynamicRetries": [true, false],
30+
"Fluid.Summarizer.ValidateSummaryBeforeUpload": [true, false],
31+
"Fluid.Summarizer.UseDynamicRetries": [true, false],
3232
"Fluid.Summarizer.PendingOpsRetryDelayMs": [true, false]
3333
}
3434
},
3535
"odsp-odsp-df": {
3636
"configurations": {
3737
"Fluid.Driver.Odsp.snapshotFormatFetchType": [2],
38-
"Fluid.ContainerRuntime.Test.ValidateSummaryBeforeUpload": [true, false],
39-
"Fluid.Summarizer.TryDynamicRetries": [true, false],
38+
"Fluid.Summarizer.ValidateSummaryBeforeUpload": [true, false],
39+
"Fluid.Summarizer.UseDynamicRetries": [true, false],
4040
"Fluid.Summarizer.PendingOpsRetryDelayMs": [true, false]
4141
}
4242
},
4343
"tinylicious": {
4444
"configurations": {
45-
"Fluid.ContainerRuntime.Test.ValidateSummaryBeforeUpload": [true, false],
46-
"Fluid.Summarizer.TryDynamicRetries": [true, false],
45+
"Fluid.Summarizer.ValidateSummaryBeforeUpload": [true, false],
46+
"Fluid.Summarizer.UseDynamicRetries": [true, false],
4747
"Fluid.Summarizer.PendingOpsRetryDelayMs": [true, false]
4848
}
4949
}
@@ -74,8 +74,8 @@
7474
"optionOverrides": {
7575
"routerlicious": {
7676
"configurations": {
77-
"Fluid.ContainerRuntime.Test.ValidateSummaryBeforeUpload": [true, false],
78-
"Fluid.Summarizer.TryDynamicRetries": [true, false],
77+
"Fluid.Summarizer.ValidateSummaryBeforeUpload": [true, false],
78+
"Fluid.Summarizer.UseDynamicRetries": [true, false],
7979
"Fluid.Summarizer.PendingOpsRetryDelayMs": [true, false]
8080
}
8181
}
@@ -105,8 +105,8 @@
105105
"optionOverrides": {
106106
"odsp": {
107107
"configurations": {
108-
"Fluid.ContainerRuntime.Test.ValidateSummaryBeforeUpload": [true, false],
109-
"Fluid.Summarizer.TryDynamicRetries": [true, false],
108+
"Fluid.Summarizer.ValidateSummaryBeforeUpload": [true, false],
109+
"Fluid.Summarizer.UseDynamicRetries": [true, false],
110110
"Fluid.Summarizer.PendingOpsRetryDelayMs": [true, false]
111111
}
112112
}

0 commit comments

Comments
 (0)