From a82f1034a7a7ec7b013e7075e9d966a7c3959c88 Mon Sep 17 00:00:00 2001 From: Flavien David Date: Fri, 31 Jan 2025 18:04:00 +0100 Subject: [PATCH] Do not use connectors replica in relocation worker (#10446) --- .../activities/source_region/connectors/sql.ts | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/front/temporal/relocation/activities/source_region/connectors/sql.ts b/front/temporal/relocation/activities/source_region/connectors/sql.ts index f2712e1a4b5d..e496601771f0 100644 --- a/front/temporal/relocation/activities/source_region/connectors/sql.ts +++ b/front/temporal/relocation/activities/source_region/connectors/sql.ts @@ -1,7 +1,7 @@ import type { ModelId } from "@dust-tt/types"; import { QueryTypes } from "sequelize"; -import { getConnectorsReplicaDbConnection } from "@app/lib/production_checks/utils"; +import { getConnectorsPrimaryDbConnection } from "@app/lib/production_checks/utils"; import logger from "@app/logger/logger"; import type { ReadTableChunkParams, @@ -17,9 +17,7 @@ export async function getAllConnectorsForWorkspace({ workspaceId: string; }) { // TODO: Use the front databases to get the connectorIds. - - // We can use the replica db because we don't need to write to it. - const connectorReplicaDb = getConnectorsReplicaDbConnection(); + const connectorsDb = getConnectorsPrimaryDbConnection(); const localLogger = logger.child({ workspaceId, @@ -27,7 +25,7 @@ export async function getAllConnectorsForWorkspace({ localLogger.info("[SQL] Getting all connectors for workspace"); - const rows = await connectorReplicaDb.query<{ id: ModelId }>( + const rows = await connectorsDb.query<{ id: ModelId }>( `SELECT * FROM "connectors" WHERE "workspaceId" = :workspaceId`, { replacements: { workspaceId }, @@ -64,10 +62,9 @@ export async function getAllConnectorsForWorkspace({ } export async function getTablesWithConnectorIdOrder() { - // We can use the replica db because we don't need to write to it. - const connectorReplicaDb = getConnectorsReplicaDbConnection(); + const connectorsDb = getConnectorsPrimaryDbConnection(); - return getTopologicalOrder(connectorReplicaDb, { + return getTopologicalOrder(connectorsDb, { columnName: "connectorId", }); } @@ -93,11 +90,11 @@ export async function readConnectorsTableChunk({ localLogger.info("[SQL Table] Reading table chunk"); // We can use the replica db because we don't need to write to it. - const connectorReplicaDb = getConnectorsReplicaDbConnection(); + const connectorsDb = getConnectorsPrimaryDbConnection(); const idClause = lastId ? `AND id > ${lastId}` : ""; - const rows = await connectorReplicaDb.query<{ id: ModelId }>( + const rows = await connectorsDb.query<{ id: ModelId }>( `SELECT * FROM "${tableName}" WHERE "connectorId" = :connectorId ${idClause} ORDER BY id