Skip to content

Commit b1b0e64

Browse files
nbbeekennbbeeken
committed
chore(NODE-6729): move to new benchmark runner
1 parent e3904a4 commit b1b0e64

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
@@ -883,22 +883,6 @@ functions:
883883
args:
884884
- ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh
885885

886-
# TODO(NODE-6729): Remove this task when the original tasks are using the new runner
887-
"run new spec driver benchmarks":
888-
- command: subprocess.exec
889-
type: test
890-
params:
891-
working_dir: "src"
892-
env:
893-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
894-
MONGODB_URI: ${MONGODB_URI}
895-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
896-
MONGODB_CLIENT_OPTIONS: ${MONGODB_CLIENT_OPTIONS}
897-
NEW_BENCH: "true"
898-
binary: bash
899-
args:
900-
- ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh
901-
902886
"run x509 auth tests":
903887
- command: subprocess.exec
904888
type: test

‎.evergreen/config.yml‎

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -825,20 +825,6 @@ functions:
825825
binary: bash
826826
args:
827827
- ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh
828-
run new spec driver benchmarks:
829-
- command: subprocess.exec
830-
type: test
831-
params:
832-
working_dir: src
833-
env:
834-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
835-
MONGODB_URI: ${MONGODB_URI}
836-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
837-
MONGODB_CLIENT_OPTIONS: ${MONGODB_CLIENT_OPTIONS}
838-
NEW_BENCH: 'true'
839-
binary: bash
840-
args:
841-
- ${PROJECT_DIRECTORY}/.evergreen/run-benchmarks.sh
842828
run x509 auth tests:
843829
- command: subprocess.exec
844830
type: test
@@ -3234,7 +3220,7 @@ tasks:
32343220
- func: run spec driver benchmarks
32353221
- command: perf.send
32363222
params:
3237-
file: src/results.json
3223+
file: src/test/benchmarks/driver_bench/results.json
32383224
- name: run-spec-benchmark-tests-node-server-timeoutMS-120000
32393225
tags:
32403226
- run-spec-benchmark-tests
@@ -3255,7 +3241,7 @@ tasks:
32553241
- func: run spec driver benchmarks
32563242
- command: perf.send
32573243
params:
3258-
file: src/results.json
3244+
file: src/test/benchmarks/driver_bench/results.json
32593245
- name: run-spec-benchmark-tests-node-server-timeoutMS-0
32603246
tags:
32613247
- run-spec-benchmark-tests
@@ -3276,7 +3262,7 @@ tasks:
32763262
- func: run spec driver benchmarks
32773263
- command: perf.send
32783264
params:
3279-
file: src/results.json
3265+
file: src/test/benchmarks/driver_bench/results.json
32803266
- name: run-spec-benchmark-tests-node-server-monitorCommands-true
32813267
tags:
32823268
- run-spec-benchmark-tests
@@ -3297,7 +3283,7 @@ tasks:
32973283
- func: run spec driver benchmarks
32983284
- command: perf.send
32993285
params:
3300-
file: src/results.json
3286+
file: src/test/benchmarks/driver_bench/results.json
33013287
- name: run-spec-benchmark-tests-node-server-logging
33023288
tags:
33033289
- run-spec-benchmark-tests
@@ -3318,25 +3304,7 @@ tasks:
33183304
- func: run spec driver benchmarks
33193305
- command: perf.send
33203306
params:
3321-
file: src/results.json
3322-
- name: run-spec-benchmark-tests-node-server-new
3323-
tags:
3324-
- run-spec-benchmark-tests
3325-
- performance
3326-
exec_timeout_secs: 18000
3327-
commands:
3328-
- command: expansions.update
3329-
type: setup
3330-
params:
3331-
updates:
3332-
- {key: NODE_LTS_VERSION, value: v22.11.0}
3333-
- {key: VERSION, value: v6.0-perf}
3334-
- {key: TOPOLOGY, value: server}
3335-
- {key: AUTH, value: noauth}
3336-
- {key: MONGODB_CLIENT_OPTIONS, value: '{}'}
3337-
- func: install dependencies
3338-
- func: bootstrap mongo-orchestration
3339-
- func: run new spec driver benchmarks
3307+
file: src/test/benchmarks/driver_bench/results.json
33403308
- name: run-unit-tests-node-16
33413309
tags:
33423310
- unit-tests
@@ -5154,7 +5122,6 @@ buildvariants:
51545122
- run-spec-benchmark-tests-node-server-timeoutMS-0
51555123
- run-spec-benchmark-tests-node-server-monitorCommands-true
51565124
- run-spec-benchmark-tests-node-server-logging
5157-
- run-spec-benchmark-tests-node-server-new
51585125
- name: rhel8-custom-dependency-tests
51595126
display_name: Custom Dependency Version Test
51605127
run_on: rhel80-large

‎.evergreen/generate_evergreen_tasks.js‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -747,33 +747,11 @@ function addPerformanceTasks() {
747747
].map(func => ({ func })),
748748
{
749749
command: 'perf.send',
750-
params: { file: 'src/results.json' }
750+
params: { file: 'src/test/benchmarks/driver_bench/results.json' }
751751
}
752752
]
753753
});
754754

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

791768
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)