Merge: postgresql_18: disable NUMA test-case (#432495)

authored by Maximilian Bosch and committed by GitHub 7f352f80 cef65422

+12 -8
+12 -8
pkgs/servers/sql/postgresql/generic.nix
··· 99 99 gettext, 100 100 101 101 # NUMA 102 - numaSupport ? 103 - lib.versionAtLeast version "18" 104 - && lib.meta.availableOn stdenv.hostPlatform numactl 105 - # NUMA can fail in 18beta2 on some hardware with: 106 - # ERROR: invalid NUMA node id outside of allowed range [0, 0]: 1 107 - # https://github.com/NixOS/nixpkgs/pull/411958#issuecomment-3031680123 108 - # https://www.postgresql.org/message-id/flat/E1u1tr8-003BbN-2E%40gemulon.postgresql.org 109 - && version != "18beta2", 102 + numaSupport ? lib.versionAtLeast version "18" && lib.meta.availableOn stdenv.hostPlatform numactl, 110 103 numactl, 111 104 112 105 # PAM ··· 432 425 substituteInPlace "src/Makefile.global.in" --subst-var out 433 426 substituteInPlace "src/common/config_info.c" --subst-var dev 434 427 cat ${./pg_config.env.mk} >> src/common/Makefile 428 + 429 + # This test always fails on hardware with >1 NUMA node: the sysfs 430 + # dirs providing information about the topology are hidden in the sandbox, 431 + # so postgres assumes there's only a single node `0`. However, 432 + # the test checks on which NUMA nodes the allocated pages are which is >1 433 + # on such hardware. This in turn triggers a safeguard in the view 434 + # which breaks the test. 435 + # Manual tests confirm that the testcase behaves properly outside of the 436 + # Nix sandbox. 437 + substituteInPlace src/test/regress/parallel_schedule \ 438 + --replace-fail numa "" 435 439 '' 436 440 # This check was introduced upstream to prevent calls to "exit" inside libpq. 437 441 # However, this doesn't work reliably with static linking, see this and following: