rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-26 09:30:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set LD_LIBRARY_PATH in the check_restored_datadir_content() psql call

Browse Source 
Otherwise we may use outdated system libpq.
Also print stdout/stderr if basebackup failed in check_restored_datadir_content()
This commit is contained in:
Alexey Kondratov
2021-11-11 13:04:58 +03:00
committed by Alexey Kondratov
parent 0d6bf14ecb
commit de5e6a15ae
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test_runner/fixtures/zenith_fixtures.py
View File

@@ -1219,7 +1219,17 @@ def check_restored_datadir_content(test_output_dir: str, env: ZenithEnv, pg: Pos
| tar -x -C {restored_dir_path}
"""
subprocess.check_call(cmd, shell=True)
# Set LD_LIBRARY_PATH in the env properly, otherwise we may use the wrong libpq.
# PgBin sets it automatically, but here we need to pipe psql output to the tar command.
psql_env = {'LD_LIBRARY_PATH': os.path.join(str(pg_distrib_dir), 'lib')}
result = subprocess.run(cmd, env=psql_env, capture_output=True, text=True, shell=True)
# Print captured stdout/stderr if basebackup cmd failed.
if result.returncode != 0:
log.error('Basebackup shell command failed with:')
log.error(result.stdout)
log.error(result.stderr)
assert result.returncode == 0
# list files we're going to compare
assert pg.pgdata_dir