rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-08 22:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

print diff for mismatching files in check_restored_datadir_content()

Browse Source
This commit is contained in:
anastasia
2021-09-03 17:47:38 +03:00
committed by lubennikovaav
parent a3214e982d
commit eb3fd7a8da
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test_runner/batch_pg_regress/test_pg_regress.py
View File

@@ -55,5 +55,4 @@ def test_pg_regress(pageserver: ZenithPageserver, postgres: PostgresFactory, pg_
lsn = pg.safe_psql('select pg_current_wal_insert_lsn()')[0][0]
# Check that we restore the content of the datadir correctly
# FIXME Now it fails on pg_xact for some reason
# check_restored_datadir_content(zenith_cli, pg, lsn, postgres)
check_restored_datadir_content(zenith_cli, pg, lsn, postgres)

21
test_runner/fixtures/zenith_fixtures.py
View File

@@ -11,6 +11,7 @@ import signal
import subprocess
import time
import filecmp
import difflib
from contextlib import closing
from pathlib import Path
@@ -956,10 +957,10 @@ def check_restored_datadir_content(zenith_cli, pg, lsn, postgres: PostgresFactor
# create new branch, but don't start postgres
# We only need 'basebackup' result here.
zenith_cli.run(
["branch", "new", pg.branch + "@" + lsn])
["branch", "check_restored_datadir", pg.branch + "@" + lsn])
pg2 = postgres.create('new')
print('postgres is created on new branch')
pg2 = postgres.create('check_restored_datadir')
print('postgres is created on check_restored_datadir branch')
print('files in a basebackup')
# list files we're going to compare
@@ -979,4 +980,18 @@ def check_restored_datadir_content(zenith_cli, pg, lsn, postgres: PostgresFactor
print('filecmp result mismatch and error lists:')
print(mismatch)
print(error)
for f in mismatch:
f1 = os.path.join(pg.pgdata_dir, f)
f2 = os.path.join(pg2.pgdata_dir, f)
stdout_filename = "{}.diff".format(f2)
with open(stdout_filename, 'w') as stdout_f:
subprocess.run("xxd -b {} > {}.hex ".format(f1, f1), shell=True)
subprocess.run("xxd -b {} > {}.hex ".format(f2, f2), shell=True)
cmd = ['diff {}.hex {}.hex'.format(f1, f2)]
subprocess.run(cmd, stdout=stdout_f, shell=True)
assert (mismatch, error) == ([], [])