Skip to content

Commit 41ea187

Browse files
committed
test(NODE-3684): skip tests on serverless
1 parent ec58e76 commit 41ea187

File tree

6 files changed

+28
-18
lines changed

6 files changed

+28
-18
lines changed

src/operations/execute_operation.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import type { Topology } from '../sdam/topology';
1717
import type { ClientSession } from '../sessions';
1818
import type { Document } from '../bson';
1919
import { supportsRetryableWrites } from '../utils';
20-
import { secondaryWritableServerSelector } from '../sdam/server_selection';
20+
import { secondaryWritableServerSelector, ServerSelector } from '../sdam/server_selection';
2121

2222
const MMAPv1_RETRY_WRITES_ERROR_CODE = MONGODB_ERROR_CODES.IllegalOperation;
2323
const MMAPv1_RETRY_WRITES_ERROR_MESSAGE =
@@ -151,6 +151,16 @@ function executeWithServerSelection(
151151
session.unpin();
152152
}
153153

154+
let selector: ReadPreference | ServerSelector;
155+
156+
// If operation should try to write to secondary use the custom server selector
157+
// otherwise provide the read preference.
158+
if (operation.trySecondaryWrite) {
159+
selector = secondaryWritableServerSelector(topology.commonWireVersion, readPreference);
160+
} else {
161+
selector = readPreference;
162+
}
163+
154164
const serverSelectionOptions = { session };
155165
function callbackWithRetry(err?: any, result?: any) {
156166
if (err == null) {
@@ -182,16 +192,6 @@ function executeWithServerSelection(
182192
return;
183193
}
184194

185-
let selector;
186-
187-
// If operation should try to write to secondary use the custom server selector
188-
// otherwise provide the read preference.
189-
if (operation.trySecondaryWrite) {
190-
selector = secondaryWritableServerSelector(topology.commonWireVersion, readPreference);
191-
} else {
192-
selector = readPreference;
193-
}
194-
195195
// select a new server, and attempt to retry the operation
196196
topology.selectServer(selector, serverSelectionOptions, (e?: any, server?: any) => {
197197
if (
@@ -238,7 +238,7 @@ function executeWithServerSelection(
238238
}
239239

240240
// select a server, and execute the operation against it
241-
topology.selectServer(readPreference, serverSelectionOptions, (err?: any, server?: any) => {
241+
topology.selectServer(selector, serverSelectionOptions, (err?: any, server?: any) => {
242242
if (err) {
243243
callback(err);
244244
return;

src/sdam/server_selection.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ export function secondaryWritableServerSelector(
4343
// If server version >= 5.0...
4444
// - If read preference is supplied, use that.
4545
// - If no read preference is supplied, use primary.
46+
/* eslint no-console: 0 */
47+
console.log('select', readPreference, wireVersion);
4648
if (!readPreference || (wireVersion && wireVersion < MIN_SECONDARY_WRITE_WIRE_VERSION)) {
4749
return readPreferenceServerSelector(ReadPreference.primary);
4850
}

test/spec/crud/unified/aggregate-write-readPreference.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"description": "aggregate-write-readPreference",
3-
"schemaVersion": "1.3",
3+
"schemaVersion": "1.4",
44
"runOnRequirements": [
55
{
66
"minServerVersion": "3.6",
@@ -90,7 +90,8 @@
9090
"description": "Aggregate with $out includes read preference for 5.0+ server",
9191
"runOnRequirements": [
9292
{
93-
"minServerVersion": "5.0"
93+
"minServerVersion": "5.0",
94+
"serverless": "forbid"
9495
}
9596
],
9697
"operations": [
@@ -181,7 +182,8 @@
181182
"runOnRequirements": [
182183
{
183184
"minServerVersion": "4.2",
184-
"maxServerVersion": "4.4.99"
185+
"maxServerVersion": "4.4.99",
186+
"serverless": "forbid"
185187
}
186188
],
187189
"operations": [

test/spec/crud/unified/aggregate-write-readPreference.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
description: aggregate-write-readPreference
22

3-
schemaVersion: '1.3'
3+
schemaVersion: '1.4'
44

55
runOnRequirements:
66
# 3.6+ non-standalone is needed to utilize $readPreference in OP_MSG
@@ -59,6 +59,7 @@ tests:
5959
- description: "Aggregate with $out includes read preference for 5.0+ server"
6060
runOnRequirements:
6161
- minServerVersion: "5.0"
62+
serverless: "forbid"
6263
operations:
6364
- object: *collection0
6465
name: aggregate
@@ -91,6 +92,7 @@ tests:
9192
# drivers may avoid inheriting a client-level read concern for pre-4.2.
9293
- minServerVersion: "4.2"
9394
maxServerVersion: "4.4.99"
95+
serverless: "forbid"
9496
operations:
9597
- object: *collection0
9698
name: aggregate

test/spec/crud/unified/db-aggregate-write-readPreference.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@
6464
"description": "Database-level aggregate with $out includes read preference for 5.0+ server",
6565
"runOnRequirements": [
6666
{
67-
"minServerVersion": "5.0"
67+
"minServerVersion": "5.0",
68+
"serverless": "forbid"
6869
}
6970
],
7071
"operations": [
@@ -158,7 +159,8 @@
158159
"runOnRequirements": [
159160
{
160161
"minServerVersion": "4.2",
161-
"maxServerVersion": "4.4.99"
162+
"maxServerVersion": "4.4.99",
163+
"serverless": "forbid"
162164
}
163165
],
164166
"operations": [

test/spec/crud/unified/db-aggregate-write-readPreference.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ tests:
5252
- description: "Database-level aggregate with $out includes read preference for 5.0+ server"
5353
runOnRequirements:
5454
- minServerVersion: "5.0"
55+
serverless: "forbid"
5556
operations:
5657
- object: *database0
5758
name: aggregate
@@ -85,6 +86,7 @@ tests:
8586
# drivers may avoid inheriting a client-level read concern for pre-4.2.
8687
- minServerVersion: "4.2"
8788
maxServerVersion: "4.4.99"
89+
serverless: "forbid"
8890
operations:
8991
- object: *database0
9092
name: aggregate

0 commit comments

Comments
 (0)