@fluidframework/container-runtime 2.0.0-internal.5.4.0 → 2.0.0-internal.6.1.0

package/src/index.ts

@@ -12,7 +12,6 @@ export {
 	ISummaryConfigurationDisableSummarizer,
 	ISummaryConfigurationDisableHeuristics,
 	IContainerRuntimeOptions,
-	IRootSummaryTreeWithStats,
 	isRuntimeMessage,
 	RuntimeMessage,
 	agentSchedulerId,

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-runtime";
-export const pkgVersion = "2.0.0-internal.5.4.0";
+export const pkgVersion = "2.0.0-internal.6.1.0";

package/src/pendingStateManager.ts

@@ -16,7 +16,7 @@ import { pkgVersion } from "./packageVersion";
 import { IBatchMetadata } from "./metadata";
 
 /**
- * ! TODO: Remove this interface in "2.0.0-internal.7.0.0" once we only read IPendingMessageNew
+ * ! TODO: Remove this interface in "2.0.0-internal.7.0.0" once we only read IPendingMessageNew (AB#4763)
  */
 export interface IPendingMessageOld {
 	type: "message";
@@ -42,7 +42,7 @@ export interface IPendingMessageNew {
 }
 
 /**
- * ! TODO: Remove this type in "2.0.0-internal.7.0.0"
+ * ! TODO: Remove this type in "2.0.0-internal.7.0.0" (AB#4763)
  */
 export type IPendingState = IPendingMessageOld | IPendingMessageNew;
 
@@ -115,21 +115,18 @@ export class PendingStateManager implements IDisposable {
 		if (!this.pendingMessages.isEmpty()) {
 			return {
 				pendingStates: this.pendingMessages.toArray().map((message) => {
-					// ! TODO: Remove conversion to IPendingMessageOld in "2.0.0-internal.6.0.0" AB#3826
-					const content = JSON.parse(message.content);
+					let content = message.content;
+					const parsedContent = JSON.parse(content);
 					// IdAllocations need their localOpMetadata stashed in the contents
 					// of the op to correctly resume the session when processing stashed ops
-					if (content.type === ContainerMessageType.IdAllocation) {
-						content.contents.stashedState = message.localOpMetadata;
+					if (parsedContent.type === ContainerMessageType.IdAllocation) {
+						parsedContent.contents.stashedState = message.localOpMetadata;
+						content = JSON.stringify(parsedContent);
 					}
-					return {
-						...message,
-						messageType: content.type,
-						content: content.contents,
-						// delete localOpMetadata since it may not be serializable
-						// and will be regenerated by applyStashedOp()
-						localOpMetadata: undefined,
-					};
+
+					// delete localOpMetadata since it may not be serializable
+					// and will be regenerated by applyStashedOp()
+					return { ...message, content, localOpMetadata: undefined };
 				}),
 			};
 		}
@@ -142,7 +139,7 @@ export class PendingStateManager implements IDisposable {
 	) {
 		/**
 		 * Convert old local state format to the new format (IPendingMessageOld to IPendingMessageNew)
-		 * ! TODO: Remove this conversion in "2.0.0-internal.7.0.0"
+		 * ! TODO: Remove this conversion in "2.0.0-internal.7.0.0" (AB#4763)
 		 */
 		if (initialLocalState?.pendingStates) {
 			for (const initialState of initialLocalState.pendingStates) {

package/src/summary/orderedClientElection.ts

@@ -9,6 +9,7 @@ import { assert, TypedEventEmitter } from "@fluidframework/common-utils";
 import { IDeltaManager } from "@fluidframework/container-definitions";
 import { UsageError } from "@fluidframework/container-utils";
 import { IClient, IQuorumClients, ISequencedClient } from "@fluidframework/protocol-definitions";
+import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
 import { summarizerClientType } from "./summarizerClientElection";
 
 // helper types for recursive readonly.
@@ -101,7 +102,7 @@ export class OrderedClientCollection
 	}
 
 	constructor(
-		logger: ITelemetryLoggerExt,
+		logger: ITelemetryBaseLogger,
 		deltaManager: Pick<IDeltaManager<unknown, unknown>, "lastSequenceNumber">,
 		quorum: Pick<IQuorumClients, "getMembers" | "on">,
 	) {

package/src/summary/runningSummarizer.ts

@@ -44,8 +44,6 @@ import {
 
 const maxSummarizeAckWaitTime = 10 * 60 * 1000; // 10 minutes
 
-const defaultNumberSummarizationAttempts = 2; // only up to 2 attempts
-
 /**
  * An instance of RunningSummarizer manages the heuristics for summarizing.
  * Until disposed, the instance of RunningSummarizer can assume that it is
@@ -573,31 +571,15 @@ export class RunningSummarizer implements IDisposable {
 				this.beforeSummaryAction();
 			},
 			async () => {
-				const attempts: (ISummarizeOptions & { delaySeconds?: number })[] = [
+				const attempts: ISummarizeOptions[] = [
 					{ refreshLatestAck: false, fullTree: false },
 					{ refreshLatestAck: true, fullTree: false },
-					{ refreshLatestAck: true, fullTree: false, delaySeconds: 2 * 60 },
-					{ refreshLatestAck: true, fullTree: true, delaySeconds: 10 * 60 },
 				];
 				let overrideDelaySeconds: number | undefined;
 				let summaryAttempts = 0;
 				let summaryAttemptsPerPhase = 0;
-				// Reducing the default number of attempts to defaultNumberofSummarizationAttempts.
-				let totalAttempts =
-					this.mc.config.getNumber("Fluid.Summarizer.Attempts") ??
-					defaultNumberSummarizationAttempts;
-
-				if (totalAttempts > attempts.length) {
-					this.mc.logger.sendTelemetryEvent({
-						eventName: "InvalidSummarizerAttempts",
-						attempts: totalAttempts,
-					});
-					totalAttempts = defaultNumberSummarizationAttempts;
-				} else if (totalAttempts < 1) {
-					throw new UsageError("Invalid number of attempts.");
-				}
-
-				for (let summaryAttemptPhase = 0; summaryAttemptPhase < totalAttempts; ) {
+				let summaryAttemptPhase = 0;
+				while (summaryAttemptPhase < attempts.length) {
 					if (this.cancellationToken.cancelled) {
 						return;
 					}
@@ -609,22 +591,20 @@ export class RunningSummarizer implements IDisposable {
 
 					summaryAttemptsPerPhase++;
 
-					const { delaySeconds: regularDelaySeconds = 0, ...options } =
-						attempts[summaryAttemptPhase];
-
+					const summarizeOptions = attempts[summaryAttemptPhase];
 					const summarizeProps: ISummarizeTelemetryProperties = {
 						reason,
 						summaryAttempts,
 						summaryAttemptsPerPhase,
 						summaryAttemptPhase: summaryAttemptPhase + 1, // make everything 1-based
-						...options,
+						...summarizeOptions,
 					};
 
 					// Note: no need to account for cancellationToken.waitCancelled here, as
 					// this is accounted SummaryGenerator.summarizeCore that controls receivedSummaryAckOrNack.
 					const resultSummarize = this.generator.summarize(
 						summarizeProps,
-						options,
+						summarizeOptions,
 						cancellationToken,
 					);
 					const result = await resultSummarize.receivedSummaryAckOrNack;
@@ -635,15 +615,13 @@ export class RunningSummarizer implements IDisposable {
 
 					// Check for retryDelay that can come from summaryNack or upload summary flow.
 					// Retry the same step only once per retryAfter response.
-					overrideDelaySeconds = result.retryAfterSeconds;
-					if (overrideDelaySeconds === undefined || summaryAttemptsPerPhase > 1) {
+					const delaySeconds = result.retryAfterSeconds;
+					if (delaySeconds === undefined || summaryAttemptsPerPhase > 1) {
 						summaryAttemptPhase++;
 						summaryAttemptsPerPhase = 0;
 					}
 
-					const delaySeconds = overrideDelaySeconds ?? regularDelaySeconds;
-
-					if (delaySeconds > 0) {
+					if (delaySeconds !== undefined) {
 						this.mc.logger.sendPerformanceEvent({
 							eventName: "SummarizeAttemptDelay",
 							duration: delaySeconds,

package/src/summary/summaryGenerator.ts

@@ -242,7 +242,6 @@ export class SummaryGenerator {
 		const { refreshLatestAck, fullTree } = options;
 		const logger = createChildLogger({
 			logger: this.logger,
-			namespace: undefined,
 			properties: { all: summarizeProps },
 		});