Skip to content

Commit f4e3cf9

Browse files
Replace msan clang 16 with clang 20 - Protected Builders
- remove msan clang 16 builder - tag clang 20 builder as protected - assign more powerful and stable builders to msan clang 20 builder. Increase the jobs - add msan clang 20 to github status builder Rollout plan: - remove msan clang 16 from branch protection (GitHub) - release this patch - add msan clang 20 to branch protection
1 parent 8195d31 commit f4e3cf9

File tree

3 files changed

+11
-144
lines changed

3 files changed

+11
-144
lines changed

constants.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"amd64-debian-12-debug-embedded",
5151
"amd64-debian-12-deb-autobake",
5252
"amd64-debian-11-debug-ps-embedded",
53-
"amd64-debian-11-msan-clang-16",
53+
"amd64-msan-clang-20",
5454
"amd64-fedora-40",
5555
"amd64-ubuntu-2004-debug",
5656
"amd64-ubuntu-2204-debug-ps",
@@ -115,7 +115,6 @@
115115
"amd64-centos-stream9",
116116
"amd64-debian-11",
117117
"amd64-debian-11-debug-ps-embedded",
118-
"amd64-debian-11-msan-clang-16",
119118
"amd64-debian-12-asan-ubsan",
120119
"amd64-debian-12-rocksdb",
121120
"amd64-fedora-40-valgrind",

master-docker-nonstandard-2/master.cfg

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,15 @@ for full_test_worker in ["debian-12-32-bit", "debian-12-32-bit-debug"]:
104104
)
105105

106106
for msan_worker in ["msan-clang-20", "msan-clang-20-debug"]:
107-
addWorker(
108-
"apexis-bbw",
109-
3,
110-
msan_worker,
111-
os.environ["CONTAINER_REGISTRY_URL"] + "debian12-msan-clang-20",
112-
jobs=15,
113-
save_packages=False,
114-
)
107+
for worker_id in [1,4,5]: # Hetzner designated workers for protected builds
108+
addWorker(
109+
"hz-bbw",
110+
worker_id,
111+
msan_worker,
112+
os.environ["CONTAINER_REGISTRY_URL"] + "debian12-msan-clang-20",
113+
jobs=20,
114+
save_packages=False,
115+
)
115116

116117
addWorker(
117118
"apexis-bbw",
@@ -746,7 +747,7 @@ c["builders"].append(
746747
util.BuilderConfig(
747748
name="amd64-msan-clang-20",
748749
workernames=workers["x64-bbw-docker-msan-clang-20"],
749-
tags=["Debian", "clang", "msan"],
750+
tags=["Debian", "clang", "msan", "protected"],
750751
collapseRequests=True,
751752
nextBuild=nextBuild,
752753
canStartBuild=canStartBuild,

master-docker-nonstandard/master.cfg

Lines changed: 0 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -297,31 +297,6 @@ addWorker(
297297
save_packages=False,
298298
)
299299

300-
addWorker(
301-
"hz-bbw",
302-
1,
303-
"msan-clang-16-debian-11",
304-
os.environ["CONTAINER_REGISTRY_URL"] + "debian11-msan-clang-16",
305-
jobs=20,
306-
save_packages=False,
307-
)
308-
addWorker(
309-
"hz-bbw",
310-
4,
311-
"msan-clang-16-debian-11",
312-
os.environ["CONTAINER_REGISTRY_URL"] + "debian11-msan-clang-16",
313-
jobs=20,
314-
save_packages=False,
315-
)
316-
addWorker(
317-
"hz-bbw",
318-
5,
319-
"msan-clang-16-debian-11",
320-
os.environ["CONTAINER_REGISTRY_URL"] + "debian11-msan-clang-16",
321-
jobs=20,
322-
save_packages=False,
323-
)
324-
325300
addWorker(
326301
"hz-bbw",
327302
2,
@@ -612,101 +587,6 @@ f_asan_build.addStep(
612587
)
613588
)
614589

615-
## f_msan_build
616-
f_msan_build = util.BuildFactory()
617-
f_msan_build.addStep(printEnv())
618-
f_msan_build.addStep(
619-
steps.ShellCommand(
620-
name="create html log file",
621-
command=[
622-
"bash",
623-
"-c",
624-
util.Interpolate(
625-
getHTMLLogString(),
626-
jobs=util.Property("jobs", default="$(getconf _NPROCESSORS_ONLN)"),
627-
),
628-
],
629-
)
630-
)
631-
f_msan_build.addStep(getSourceTarball())
632-
# build steps
633-
f_msan_build.addStep(steps.ShellCommand(command="ls /msan-libs"))
634-
f_msan_build.addStep(
635-
steps.Compile(
636-
command=[
637-
"bash",
638-
"-xc",
639-
util.Interpolate(
640-
'cmake . -DCMAKE_C_COMPILER=%(kw:c_compiler)s -DCMAKE_CXX_COMPILER=%(kw:cxx_compiler)s -DCMAKE_C_FLAGS="-O2 -Wno-unused-command-line-argument -fdebug-macro" -DCMAKE_CXX_FLAGS="-stdlib=libc++ -O2 -Wno-unused-command-line-argument -fdebug-macro" -DWITH_EMBEDDED_SERVER=OFF -DWITH_UNIT_TESTS=OFF -DCMAKE_BUILD_TYPE=Debug -DWITH_INNODB_{BZIP2,LZ4,LZMA,LZO,SNAPPY}=OFF -DPLUGIN_{ARCHIVE,TOKUDB,MROONGA,OQGRAPH,ROCKSDB,CONNECT,SPIDER}=NO -DWITH_SAFEMALLOC=OFF -DWITH_{ZLIB,SSL,PCRE}=bundled -DHAVE_LIBAIO_H=0 -DCMAKE_DISABLE_FIND_PACKAGE_{URING,LIBAIO}=1 -DWITH_MSAN=ON -DWITH_DBUG_TRACE=OFF && make -j%(kw:jobs)s package',
641-
jobs=util.Property("jobs", default="$(getconf _NPROCESSORS_ONLN)"),
642-
c_compiler=util.Property("c_compiler", default="clang"),
643-
cxx_compiler=util.Property("cxx_compiler", default="clang++"),
644-
),
645-
],
646-
haltOnFailure="true",
647-
)
648-
)
649-
f_msan_build.addStep(
650-
steps.MTR(
651-
logfiles={"mysqld*": "./buildbot/mysql_logs.html"},
652-
test_type="msan",
653-
command=[
654-
"bash",
655-
"-xc",
656-
util.Interpolate(
657-
'cd mysql-test && LD_LIBRARY_PATH=/msan-libs MSAN_OPTIONS=abort_on_error=1:poison_in_dtor=0 ./mtr --mem --big-test --force --retry=0 --skip-test=".*compression.*|rpl\.rpl_non_direct_row_mixing_engines|perfschema\.table_io_aggregate_hist_\du_\dt|perfschema\.transaction_nested_events|perfschema\.events_waits_current_MDEV-29091|perfschema\.memory_aggregate_no_a_no_u_no_h|main\.show_explain|main\.show_analyze_json" --max-test-fail=100 --parallel=$(expr %(kw:jobs)s \* 2)',
658-
jobs=util.Property("jobs", default="$(getconf _NPROCESSORS_ONLN)"),
659-
),
660-
],
661-
timeout=950,
662-
haltOnFailure="true",
663-
parallel=mtrJobsMultiplier,
664-
dbpool=mtrDbPool,
665-
autoCreateTables=True,
666-
env=MTR_ENV,
667-
)
668-
)
669-
f_msan_build.addStep(
670-
steps.ShellCommand(
671-
name="move mysqld log files",
672-
alwaysRun=True,
673-
command=[
674-
"bash",
675-
"-c",
676-
util.Interpolate(
677-
moveMTRLogs(),
678-
jobs=util.Property("jobs", default="$(getconf _NPROCESSORS_ONLN)"),
679-
),
680-
],
681-
)
682-
)
683-
f_msan_build.addStep(
684-
steps.ShellCommand(
685-
name="create var archive",
686-
alwaysRun=True,
687-
command=["bash", "-c", util.Interpolate(createVar())],
688-
doStepIf=hasFailed,
689-
)
690-
)
691-
f_msan_build.addStep(
692-
steps.DirectoryUpload(
693-
name="save mysqld log files",
694-
compress="bz2",
695-
alwaysRun=True,
696-
workersrc="./buildbot/logs/",
697-
masterdest=util.Interpolate(
698-
"/srv/buildbot/packages/"
699-
+ "%(prop:tarbuildnum)s"
700-
+ "/logs/"
701-
+ "%(prop:buildername)s"
702-
),
703-
)
704-
)
705-
f_msan_build.addStep(
706-
steps.ShellCommand(
707-
name="cleanup", command="rm -r * .* 2> /dev/null || true", alwaysRun=True
708-
)
709-
)
710590

711591
## f_valgrind_build
712592
f_valgrind_build = util.BuildFactory()
@@ -1502,19 +1382,6 @@ c["builders"].append(
15021382
)
15031383
)
15041384

1505-
c["builders"].append(
1506-
util.BuilderConfig(
1507-
name="amd64-debian-11-msan-clang-16",
1508-
workernames=workers["x64-bbw-docker-msan-clang-16-debian-11"],
1509-
tags=["Debian", "quick", "clang-16", "msan", "protected"],
1510-
collapseRequests=True,
1511-
nextBuild=nextBuild,
1512-
canStartBuild=canStartBuild,
1513-
properties={"c_compiler": "clang-16", "cxx_compiler": "clang++-16"},
1514-
locks=getLocks,
1515-
factory=f_msan_build,
1516-
)
1517-
)
15181385

15191386
c["builders"].append(
15201387
util.BuilderConfig(

0 commit comments

Comments
 (0)