jimmy/postgrest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nix(loadtest): fix cpu/mem monitoring for tests using libfaketime

Browse Source 
Instead of starting a separate process, which would make the pid we
store the one from `faketime` instead of `postgrest`, we can also just
start libfaketime directly via LD_PRELOAD.
This commit is contained in:
Wolfgang Walther
2026-06-26 18:30:25 +00:00
parent ba9336f402
commit a0bb87d693
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/tools/withTools.nix
+3 -3
View File
@@ -304,7 +304,7 @@ let
'' ''
export PGRST_SERVER_UNIX_SOCKET="$tmpdir"/postgrest.socket export PGRST_SERVER_UNIX_SOCKET="$tmpdir"/postgrest.socket
FAKETIME_CMD="${libfaketime}/bin/faketime" FAKETIME_LIB="${libfaketime}/lib/libfaketime.so.1"
if [ -z "''${PGRST_CMD:-}" ]; then if [ -z "''${PGRST_CMD:-}" ]; then
rm -f result rm -f result
@@ -319,7 +319,7 @@ let
} }
PGRST_CMD="$(nix-build --no-out-link -E 'with import ./. {}; pkgs.lib.getBin postgrestPackage')/bin/postgrest" PGRST_CMD="$(nix-build --no-out-link -E 'with import ./. {}; pkgs.lib.getBin postgrestPackage')/bin/postgrest"
# To avoid glibc mismatches with back-branches, we need to take libfaketime from the target branch. # To avoid glibc mismatches with back-branches, we need to take libfaketime from the target branch.
FAKETIME_CMD="$(nix-build --no-out-link -A pkgs.libfaketime)/bin/faketime" FAKETIME_LIB="$(nix-build --no-out-link -A pkgs.libfaketime)/lib/libfaketime.so.1"
else else
echo -n "${commandName}: Building postgrest (cabal)... " echo -n "${commandName}: Building postgrest (cabal)... "
postgrest-build postgrest-build
@@ -334,7 +334,7 @@ let
echo -n "${commandName}: Starting $ver... " echo -n "${commandName}: Starting $ver... "
if [[ -n "$_arg_faketime" ]]; then if [[ -n "$_arg_faketime" ]]; then
$FAKETIME_CMD "$_arg_faketime" "$PGRST_CMD" > "$tmpdir"/run.log 2>&1 & LD_PRELOAD="$FAKETIME_LIB" FAKETIME="$_arg_faketime" "$PGRST_CMD" > "$tmpdir"/run.log 2>&1 &
else else
$PGRST_CMD > "$tmpdir"/run.log 2>&1 & $PGRST_CMD > "$tmpdir"/run.log 2>&1 &
fi fi