Skip to content

Commit 13e557a

Browse files
baileympearsonbaileympearson
authored
Merge branch 'main' into NODE-6747-deployed-lambda
2 parents 1d2d9c6 + 7bfce01 commit 13e557a

File tree

173 files changed

+29
-1480
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+29
-1480
lines changed

‎.evergreen/config.in.yml‎

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ command_type: system
1111
# Protect ourself against rogue test case, or curl gone wild, that runs forever
1212
# Good rule of thumb: the averageish length a task takes, times 5
1313
# That roughly accounts for variable system performance for various buildvariants
14-
exec_timeout_secs: 2100
14+
exec_timeout_secs: 7200
1515

1616
# What to do when evergreen hits the timeout (`post:` tasks are run automatically)
1717
timeout:
@@ -474,7 +474,7 @@ functions:
474474
AWS_CREDENTIAL_TYPE: regular
475475
working_dir: "src"
476476
binary: bash
477-
args:
477+
args:
478478
- .evergreen/run-mongodb-aws-test.sh
479479

480480
"run aws auth test with assume role credentials":
@@ -489,7 +489,7 @@ functions:
489489
AWS_CREDENTIAL_TYPE: assume-role
490490
working_dir: "src"
491491
binary: bash
492-
args:
492+
args:
493493
- .evergreen/run-mongodb-aws-test.sh
494494

495495
"run aws auth test with aws EC2 credentials":
@@ -520,7 +520,7 @@ functions:
520520
AWS_CREDENTIAL_TYPE: env-creds
521521
working_dir: "src"
522522
binary: bash
523-
args:
523+
args:
524524
- .evergreen/run-mongodb-aws-test.sh
525525

526526
"run aws auth test with aws credentials and session token as environment variables":
@@ -535,7 +535,7 @@ functions:
535535
AWS_CREDENTIAL_TYPE: session-creds
536536
working_dir: "src"
537537
binary: bash
538-
args:
538+
args:
539539
- .evergreen/run-mongodb-aws-test.sh
540540

541541
"run aws auth test AssumeRoleWithWebIdentity with AWS_ROLE_SESSION_NAME set":
@@ -551,7 +551,7 @@ functions:
551551
AWS_ROLE_SESSION_NAME: test
552552
working_dir: "src"
553553
binary: bash
554-
args:
554+
args:
555555
- .evergreen/run-mongodb-aws-test.sh
556556

557557
"run aws auth test AssumeRoleWithWebIdentity with AWS_ROLE_SESSION_NAME unset":
@@ -566,7 +566,7 @@ functions:
566566
AWS_CREDENTIAL_TYPE: web-identity
567567
working_dir: "src"
568568
binary: bash
569-
args:
569+
args:
570570
- .evergreen/run-mongodb-aws-test.sh
571571

572572
"run aws ECS auth test":
@@ -582,9 +582,9 @@ functions:
582582
AWS_CREDENTIAL_TYPE: web-identity
583583
working_dir: "src"
584584
binary: bash
585-
args:
585+
args:
586586
- .evergreen/prepare-mongodb-aws-ecs-auth.sh
587-
587+
588588
"run custom csfle tests":
589589
- command: subprocess.exec
590590
type: test
@@ -620,7 +620,7 @@ functions:
620620
MONGODB_AWS_SDK: 'true'
621621
working_dir: "src"
622622
binary: bash
623-
args:
623+
args:
624624
- .evergreen/run-lambda-aws-tests.sh
625625

626626
"upload test results":
@@ -708,22 +708,6 @@ functions:
708708
args:
709709
- ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh
710710

711-
# TODO(NODE-6729): Remove this task when the original tasks are using the new runner
712-
"run new spec driver benchmarks":
713-
- command: subprocess.exec
714-
type: test
715-
params:
716-
working_dir: "src"
717-
env:
718-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
719-
MONGODB_URI: ${MONGODB_URI}
720-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
721-
MONGODB_CLIENT_OPTIONS: ${MONGODB_CLIENT_OPTIONS}
722-
NEW_BENCH: "true"
723-
binary: bash
724-
args:
725-
- ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh
726-
727711
"run x509 auth tests":
728712
- command: subprocess.exec
729713
type: test

‎.evergreen/config.yml‎

Lines changed: 11 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
stepback: true
22
command_type: system
3-
exec_timeout_secs: 2100
3+
exec_timeout_secs: 7200
44
timeout:
55
- command: subprocess.exec
66
params:
@@ -633,20 +633,6 @@ functions:
633633
binary: bash
634634
args:
635635
- ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh
636-
run new spec driver benchmarks:
637-
- command: subprocess.exec
638-
type: test
639-
params:
640-
working_dir: src
641-
env:
642-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
643-
MONGODB_URI: ${MONGODB_URI}
644-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
645-
MONGODB_CLIENT_OPTIONS: ${MONGODB_CLIENT_OPTIONS}
646-
NEW_BENCH: 'true'
647-
binary: bash
648-
args:
649-
- ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh
650636
run x509 auth tests:
651637
- command: subprocess.exec
652638
type: test
@@ -2919,7 +2905,7 @@ tasks:
29192905
tags:
29202906
- run-spec-benchmark-tests
29212907
- performance
2922-
exec_timeout_secs: 3600
2908+
exec_timeout_secs: 7200
29232909
commands:
29242910
- command: expansions.update
29252911
type: setup
@@ -2935,12 +2921,12 @@ tasks:
29352921
- func: run spec driver benchmarks
29362922
- command: perf.send
29372923
params:
2938-
file: src/results.json
2924+
file: src/test/benchmarks/driver_bench/results.json
29392925
- name: run-spec-benchmark-tests-node-server-timeoutMS-120000
29402926
tags:
29412927
- run-spec-benchmark-tests
29422928
- performance
2943-
exec_timeout_secs: 3600
2929+
exec_timeout_secs: 7200
29442930
commands:
29452931
- command: expansions.update
29462932
type: setup
@@ -2956,12 +2942,12 @@ tasks:
29562942
- func: run spec driver benchmarks
29572943
- command: perf.send
29582944
params:
2959-
file: src/results.json
2945+
file: src/test/benchmarks/driver_bench/results.json
29602946
- name: run-spec-benchmark-tests-node-server-timeoutMS-0
29612947
tags:
29622948
- run-spec-benchmark-tests
29632949
- performance
2964-
exec_timeout_secs: 3600
2950+
exec_timeout_secs: 7200
29652951
commands:
29662952
- command: expansions.update
29672953
type: setup
@@ -2977,12 +2963,12 @@ tasks:
29772963
- func: run spec driver benchmarks
29782964
- command: perf.send
29792965
params:
2980-
file: src/results.json
2966+
file: src/test/benchmarks/driver_bench/results.json
29812967
- name: run-spec-benchmark-tests-node-server-monitorCommands-true
29822968
tags:
29832969
- run-spec-benchmark-tests
29842970
- performance
2985-
exec_timeout_secs: 3600
2971+
exec_timeout_secs: 7200
29862972
commands:
29872973
- command: expansions.update
29882974
type: setup
@@ -2998,12 +2984,12 @@ tasks:
29982984
- func: run spec driver benchmarks
29992985
- command: perf.send
30002986
params:
3001-
file: src/results.json
2987+
file: src/test/benchmarks/driver_bench/results.json
30022988
- name: run-spec-benchmark-tests-node-server-logging
30032989
tags:
30042990
- run-spec-benchmark-tests
30052991
- performance
3006-
exec_timeout_secs: 3600
2992+
exec_timeout_secs: 7200
30072993
commands:
30082994
- command: expansions.update
30092995
type: setup
@@ -3019,25 +3005,7 @@ tasks:
30193005
- func: run spec driver benchmarks
30203006
- command: perf.send
30213007
params:
3022-
file: src/results.json
3023-
- name: run-spec-benchmark-tests-node-server-new
3024-
tags:
3025-
- run-spec-benchmark-tests
3026-
- performance
3027-
exec_timeout_secs: 18000
3028-
commands:
3029-
- command: expansions.update
3030-
type: setup
3031-
params:
3032-
updates:
3033-
- {key: NODE_LTS_VERSION, value: v22.11.0}
3034-
- {key: VERSION, value: v6.0-perf}
3035-
- {key: TOPOLOGY, value: server}
3036-
- {key: AUTH, value: noauth}
3037-
- {key: MONGODB_CLIENT_OPTIONS, value: '{}'}
3038-
- func: install dependencies
3039-
- func: bootstrap mongo-orchestration
3040-
- func: run new spec driver benchmarks
3008+
file: src/test/benchmarks/driver_bench/results.json
30413009
- name: run-unit-tests-node-16
30423010
tags:
30433011
- unit-tests
@@ -4857,7 +4825,6 @@ buildvariants:
48574825
- run-spec-benchmark-tests-node-server-timeoutMS-0
48584826
- run-spec-benchmark-tests-node-server-monitorCommands-true
48594827
- run-spec-benchmark-tests-node-server-logging
4860-
- run-spec-benchmark-tests-node-server-new
48614828
- name: rhel8-custom-dependency-tests
48624829
display_name: Custom Dependency Version Test
48634830
run_on: rhel80-large

‎.evergreen/generate_evergreen_tasks.js‎

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ function addPerformanceTasks() {
728728
const makePerfTask = (name, MONGODB_CLIENT_OPTIONS) => ({
729729
name,
730730
tags: ['run-spec-benchmark-tests', 'performance'],
731-
exec_timeout_secs: 3600,
731+
exec_timeout_secs: 7200,
732732
commands: [
733733
updateExpansions({
734734
NODE_LTS_VERSION: 'v22.11.0',
@@ -744,33 +744,11 @@ function addPerformanceTasks() {
744744
].map(func => ({ func })),
745745
{
746746
command: 'perf.send',
747-
params: { file: 'src/results.json' }
747+
params: { file: 'src/test/benchmarks/driver_bench/results.json' }
748748
}
749749
]
750750
});
751751

752-
// TODO(NODE-6729): Remove this task when the original tasks are using the new runner
753-
const makePerfTaskNEW = (name, MONGODB_CLIENT_OPTIONS) => ({
754-
name,
755-
tags: ['run-spec-benchmark-tests', 'performance'],
756-
exec_timeout_secs: 18000,
757-
commands: [
758-
updateExpansions({
759-
NODE_LTS_VERSION: 'v22.11.0',
760-
VERSION: 'v6.0-perf',
761-
TOPOLOGY: 'server',
762-
AUTH: 'noauth',
763-
MONGODB_CLIENT_OPTIONS: JSON.stringify(MONGODB_CLIENT_OPTIONS)
764-
}),
765-
...[
766-
'install dependencies',
767-
'bootstrap mongo-orchestration',
768-
'run new spec driver benchmarks'
769-
].map(func => ({ func }))
770-
// No perf send! just testing
771-
]
772-
});
773-
774752
const tasks = [
775753
makePerfTask('run-spec-benchmark-tests-node-server', {}),
776754
makePerfTask('run-spec-benchmark-tests-node-server-timeoutMS-120000', { timeoutMS: 120000 }),
@@ -781,8 +759,7 @@ function addPerformanceTasks() {
781759
makePerfTask('run-spec-benchmark-tests-node-server-logging', {
782760
mongodbLogPath: 'stderr',
783761
mongodbLogComponentSeverities: { default: 'trace' }
784-
}),
785-
makePerfTaskNEW('run-spec-benchmark-tests-node-server-new', {})
762+
})
786763
];
787764

788765
TASKS.push(...tasks);

‎.evergreen/run-benchmarks.sh‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,6 @@ export MONGODB_CLIENT_OPTIONS=$MONGODB_CLIENT_OPTIONS
1111

1212
npm run build:ts
1313

14-
if [[ "${NEW_BENCH:-}" == "true" ]]; then
15-
pushd test/benchmarks/driver_bench
16-
npm start
17-
popd
18-
exit 0
19-
fi
20-
2114
# If MONGODB_CLIENT_OPTIONS contains mongodbLogComponentSeverities redirect stderr to a file
2215
if [[ $MONGODB_CLIENT_OPTIONS == *"mongodbLogComponentSeverities"* ]]; then
2316
npm run check:bench 2> bench.log

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
"build:docs": "./etc/docs/build.ts",
129129
"build:typedoc": "typedoc",
130130
"build:nightly": "node ./.github/scripts/nightly.mjs",
131-
"check:bench": "node test/benchmarks/driverBench",
131+
"check:bench": "npm --prefix test/benchmarks/driver_bench start",
132132
"check:coverage": "nyc npm run test:all",
133133
"check:integration-coverage": "nyc npm run check:test",
134134
"check:lambda": "mocha --config test/mocha_lambda.json test/integration/node-specific/examples/handler.test.js",

0 commit comments

Comments
 (0)