Skip to content
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 42 additions & 3 deletions packages/data-service/src/data-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ import type {
SearchIndexDescription,
ReadPreferenceMode,
} from 'mongodb';
import { ReadPreference } from 'mongodb';
import ConnectionStringUrl from 'mongodb-connection-string-url';
import parseNamespace from 'mongodb-ns';
import type {
Expand Down Expand Up @@ -133,6 +134,26 @@ function isReadPreferenceSet(connectionString: string): boolean {
);
}

function readPreferenceWithoutTags(readPreference: ReadPreference) {
return new ReadPreference(readPreference.mode, undefined, {
maxStalenessSeconds: readPreference.maxStalenessSeconds,
hedge: readPreference.hedge,
});
}

function maybeOverrideReadPreference(
isMongos: boolean,
readPreference?: ReadPreference
): {
readPreference?: ReadPreference;
} {
if (isMongos && readPreference?.tags) {
return { readPreference: readPreferenceWithoutTags(readPreference) };
}

return {};
}

let id = 0;

type ClientType = 'CRUD' | 'META';
Expand Down Expand Up @@ -1264,7 +1285,13 @@ class DataServiceImpl extends WithLogContext implements DataService {
try {
const cursor = this._database(databaseName, 'CRUD').listCollections(
filter,
{ nameOnly }
{
nameOnly,
...maybeOverrideReadPreference(
this.isMongos(),
this._crudClient?.readPreference
),
}
);
// Iterate instead of using .toArray() so we can emit
// collection info update events as they come in.
Expand Down Expand Up @@ -1399,7 +1426,13 @@ class DataServiceImpl extends WithLogContext implements DataService {
} as {
listDatabases: 1;
},
{ enableUtf8Validation: false }
{
enableUtf8Validation: false,
...maybeOverrideReadPreference(
this.isMongos(),
this._crudClient?.readPreference
),
}
);
return databases.map((x) => ({
...x,
Expand Down Expand Up @@ -2542,7 +2575,13 @@ class DataServiceImpl extends WithLogContext implements DataService {
const stats = await runCommand(
db,
{ dbStats: 1 },
{ enableUtf8Validation: false }
{
enableUtf8Validation: false,
...maybeOverrideReadPreference(
this.isMongos(),
this._crudClient?.readPreference
),
}
);
const normalized = adaptDatabaseInfo(stats);
return { name, ...normalized };
Expand Down
Loading