Skip to content

Commit a89abf0

Browse files
nbbeekennbbeeken
committed
chore(NODE-6729): move to new benchmark runner
1 parent 6a61748 commit a89abf0

File tree

173 files changed

+15
-1463
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

+15
-1463
lines changed

‎.evergreen/config.in.yml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -707,22 +707,6 @@ functions:
707707
args:
708708
- ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh
709709

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

‎.evergreen/config.yml‎

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -632,20 +632,6 @@ functions:
632632
binary: bash
633633
args:
634634
- ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh
635-
run new spec driver benchmarks:
636-
- command: subprocess.exec
637-
type: test
638-
params:
639-
working_dir: src
640-
env:
641-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
642-
MONGODB_URI: ${MONGODB_URI}
643-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
644-
MONGODB_CLIENT_OPTIONS: ${MONGODB_CLIENT_OPTIONS}
645-
NEW_BENCH: 'true'
646-
binary: bash
647-
args:
648-
- ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh
649635
run x509 auth tests:
650636
- command: subprocess.exec
651637
type: test
@@ -2933,7 +2919,7 @@ tasks:
29332919
- func: run spec driver benchmarks
29342920
- command: perf.send
29352921
params:
2936-
file: src/results.json
2922+
file: src/test/benchmarks/driver_bench/results.json
29372923
- name: run-spec-benchmark-tests-node-server-timeoutMS-120000
29382924
tags:
29392925
- run-spec-benchmark-tests
@@ -2954,7 +2940,7 @@ tasks:
29542940
- func: run spec driver benchmarks
29552941
- command: perf.send
29562942
params:
2957-
file: src/results.json
2943+
file: src/test/benchmarks/driver_bench/results.json
29582944
- name: run-spec-benchmark-tests-node-server-timeoutMS-0
29592945
tags:
29602946
- run-spec-benchmark-tests
@@ -2975,7 +2961,7 @@ tasks:
29752961
- func: run spec driver benchmarks
29762962
- command: perf.send
29772963
params:
2978-
file: src/results.json
2964+
file: src/test/benchmarks/driver_bench/results.json
29792965
- name: run-spec-benchmark-tests-node-server-monitorCommands-true
29802966
tags:
29812967
- run-spec-benchmark-tests
@@ -2996,7 +2982,7 @@ tasks:
29962982
- func: run spec driver benchmarks
29972983
- command: perf.send
29982984
params:
2999-
file: src/results.json
2985+
file: src/test/benchmarks/driver_bench/results.json
30002986
- name: run-spec-benchmark-tests-node-server-logging
30012987
tags:
30022988
- run-spec-benchmark-tests
@@ -3017,25 +3003,7 @@ tasks:
30173003
- func: run spec driver benchmarks
30183004
- command: perf.send
30193005
params:
3020-
file: src/results.json
3021-
- name: run-spec-benchmark-tests-node-server-new
3022-
tags:
3023-
- run-spec-benchmark-tests
3024-
- performance
3025-
exec_timeout_secs: 18000
3026-
commands:
3027-
- command: expansions.update
3028-
type: setup
3029-
params:
3030-
updates:
3031-
- {key: NODE_LTS_VERSION, value: v22.11.0}
3032-
- {key: VERSION, value: v6.0-perf}
3033-
- {key: TOPOLOGY, value: server}
3034-
- {key: AUTH, value: noauth}
3035-
- {key: MONGODB_CLIENT_OPTIONS, value: '{}'}
3036-
- func: install dependencies
3037-
- func: bootstrap mongo-orchestration
3038-
- func: run new spec driver benchmarks
3006+
file: src/test/benchmarks/driver_bench/results.json
30393007
- name: run-unit-tests-node-16
30403008
tags:
30413009
- unit-tests
@@ -4855,7 +4823,6 @@ buildvariants:
48554823
- run-spec-benchmark-tests-node-server-timeoutMS-0
48564824
- run-spec-benchmark-tests-node-server-monitorCommands-true
48574825
- run-spec-benchmark-tests-node-server-logging
4858-
- run-spec-benchmark-tests-node-server-new
48594826
- name: rhel8-custom-dependency-tests
48604827
display_name: Custom Dependency Version Test
48614828
run_on: rhel80-large

‎.evergreen/generate_evergreen_tasks.js‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,12 @@ 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
2417
else
2518
npm run check:bench
2619
fi
20+
21+
cat test/benchmarks/driver_bench/results.json
22+
exit 1

‎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",

‎test/benchmarks/driverBench/common.js‎

Lines changed: 0 additions & 204 deletions
This file was deleted.

0 commit comments

Comments
 (0)