Add the session unit tests fix

server/routerlicious/packages/lambdas/src/nexus/networkHelper.ts

@@ -2,14 +2,16 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-/* eslint-disable unicorn/prefer-ternary */
 
 import * as core from "@fluidframework/server-services-core";
 import { getNetworkInformationFromIP } from "@fluidframework/server-services-client";
 
-// eslint-disable-next-line jsdoc/require-description
 /**
- * @returns NetworkInformation
+ * Check the network information to determine if the socket should connect.
+ *
+ * @param tenantManager - The tenant manager to use to get the tenant information.
+ * @param socket - The socket to check the network information for.
+ * @returns A promise that resolves to an object containing a message and a boolean indicating if the socket should connect.
  */
 export async function checkNetworkInformation(
 	tenantManager: core.ITenantManager,
@@ -23,13 +25,15 @@ export async function checkNetworkInformation(
 	const networkInfo = getNetworkInformationFromIP(clientIPAddress);
 	if (networkInfo.isPrivateLink) {
 		const accountLinkID = tenantInfo?.customData?.accountLinkID;
+		// eslint-disable-next-line unicorn/prefer-ternary
 		if (networkInfo.privateLinkId === accountLinkID) {
 			return { message: "This is a private link socket connection", shouldConnect: true };
 		} else {
 			return { message: "private link should not connect", shouldConnect: false };
 		}
 	} else {
 		const accountLinkID = tenantInfo?.customData?.accountLinkID;
+		// eslint-disable-next-line unicorn/prefer-ternary
 		if (accountLinkID) {
 			return {
 				message:

server/routerlicious/packages/routerlicious-base/src/alfred/customizations.ts

@@ -12,10 +12,10 @@ import {
 	IWebSocketTracker,
 	IServiceMessageResourceManager,
 	IFluidAccessTokenGenerator,
+	IReadinessCheck,
 } from "@fluidframework/server-services-core";
 import { IRedisClientConnectionManager } from "@fluidframework/server-services-utils";
 import { IDocumentDeleteService } from "./services";
-import { IReadinessCheck } from "@fluidframework/server-services-core";
 import { ITenantRepository } from "../riddler";
 
 /**

server/routerlicious/packages/routerlicious-base/src/alfred/routes/api/documents.ts

@@ -415,6 +415,35 @@ export function create(
 		async (request, response, next) => {
 			const documentId = request.params.id;
 			const tenantId = request.params.tenantId;
+
+			const lumberjackProperties = getLumberBaseProperties(documentId, tenantId);
+			const getSessionMetric: Lumber<LumberEventName.GetSession> = Lumberjack.newLumberMetric(
+				LumberEventName.GetSession,
+				lumberjackProperties,
+			);
+			// Tracks the different stages of getSessionMetric
+			const connectionTrace = new StageTrace<string>("GetSession");
+
+			// Reject get session request on existing, inactive sessions if cluster is in draining process.
+			if (
+				clusterDrainingChecker &&
+				(await clusterDrainingChecker.isClusterDraining().catch((error) => {
+					Lumberjack.error("Failed to get cluster draining status", undefined, error);
+					return false;
+				}))
+			) {
+				Lumberjack.info("Cluster is in draining process. Reject get session request.");
+				connectionTrace?.stampStage("ClusterIsDraining");
+				const error = createFluidServiceNetworkError(503, {
+					message: "Server is unavailable. Please retry session discovery later.",
+					internalErrorCode: InternalErrorCode.ClusterDraining,
+				});
+				handleResponse(Promise.reject(error), response);
+			}
+			connectionTrace?.stampStage("ClusterDrainingChecked");
+			const readDocumentRetryDelay: number = config.get("getSession:readDocumentRetryDelay");
+			const readDocumentMaxRetries: number = config.get("getSession:readDocumentMaxRetries");
+
 			const clientIPAddress = request.ip ? request.ip : "";
 			const networkInfo = getNetworkInformationFromIP(clientIPAddress);
 			const documentUrls = getDocumentUrlsfromNetworkInfo(
@@ -425,14 +454,6 @@ export function create(
 				networkInfo.isPrivateLink,
 			);
 
-			const lumberjackProperties = getLumberBaseProperties(documentId, tenantId);
-			const getSessionMetric: Lumber<LumberEventName.GetSession> = Lumberjack.newLumberMetric(
-				LumberEventName.GetSession,
-				lumberjackProperties,
-			);
-			// Tracks the different stages of getSessionMetric
-			const connectionTrace = new StageTrace<string>("GetSession");
-
 			const session = getSession(
 				documentUrls.documentOrdererUrl,
 				documentUrls.documentHistorianUrl,
@@ -445,6 +466,8 @@ export function create(
 				clusterDrainingChecker,
 				ephemeralDocumentTTLSec,
 				connectionTrace,
+				readDocumentRetryDelay,
+				readDocumentMaxRetries,
 			);
 
 			const onSuccess = (result: ISession): void => {

server/routerlicious/packages/routerlicious/config/config.json

@@ -431,5 +431,9 @@
 	},
 	"clusterDraining": {
 		"enable": false
+	},
+	"getSession": {
+		"readDocumentRetryDelay": 150,
+		"readDocumentMaxRetries": 2
 	}
 }