external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

incorporate the fixopen fix for osx users on bigsur (#4837) 

comparable to https://github.com/citusdata/tools/pull/88

this patch adds checks to the perl script running the testing harness of citus to start the postgres instances via the fixopen binary when present to work around `Interrupted System` call errors on OSX Big Sur.
pull/4844/head
Nils Dijk 2021-03-22 16:22:08 +01:00 committed by GitHub
parent 787ee97867
commit 1c1999ed7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/test/regress/pg_regress_multi.pl
View File

@ -116,6 +116,14 @@ GetOptions(
'worker-2-public-hostname=s' => \$publicWorker2Host, 'worker-2-public-hostname=s' => \$publicWorker2Host,
'help' => sub { Usage() }); 'help' => sub { Usage() });
my $fixopen = "$bindir/postgres.fixopen";
my @pg_ctl_args = ();
if (-e $fixopen)
{
push(@pg_ctl_args, "-p");
push(@pg_ctl_args, $fixopen);
}
# Update environment to include [DY]LD_LIBRARY_PATH/LIBDIR/etc - # Update environment to include [DY]LD_LIBRARY_PATH/LIBDIR/etc -
# pointing to the libdir - that's required so the right version of # pointing to the libdir - that's required so the right version of
# libpq, citus et al is being picked up. # libpq, citus et al is being picked up.
@ -665,26 +673,26 @@ sub ShutdownServers()
if (!$conninfo && $serversAreShutdown eq "FALSE") if (!$conninfo && $serversAreShutdown eq "FALSE")
{ {
system(catfile("$bindir", "pg_ctl"), system(catfile("$bindir", "pg_ctl"),
('stop', '-w', '-D', catfile($TMP_CHECKDIR, $MASTERDIR, 'data'))) == 0 (@pg_ctl_args, 'stop', '-w', '-D', catfile($TMP_CHECKDIR, $MASTERDIR, 'data'))) == 0
or warn "Could not shutdown worker server"; or warn "Could not shutdown worker server";
for my $port (@workerPorts) for my $port (@workerPorts)
{ {
system(catfile("$bindir", "pg_ctl"), system(catfile("$bindir", "pg_ctl"),
('stop', '-w', '-D', catfile($TMP_CHECKDIR, "worker.$port", "data"))) == 0 (@pg_ctl_args, 'stop', '-w', '-D', catfile($TMP_CHECKDIR, "worker.$port", "data"))) == 0
or warn "Could not shutdown worker server"; or warn "Could not shutdown worker server";
} }
if ($followercluster) if ($followercluster)
{ {
system(catfile("$bindir", "pg_ctl"), system(catfile("$bindir", "pg_ctl"),
('stop', '-w', '-D', catfile($TMP_CHECKDIR, $MASTER_FOLLOWERDIR, 'data'))) == 0 (@pg_ctl_args, 'stop', '-w', '-D', catfile($TMP_CHECKDIR, $MASTER_FOLLOWERDIR, 'data'))) == 0
or warn "Could not shutdown worker server"; or warn "Could not shutdown worker server";
for my $port (@followerWorkerPorts) for my $port (@followerWorkerPorts)
{ {
system(catfile("$bindir", "pg_ctl"), system(catfile("$bindir", "pg_ctl"),
('stop', '-w', '-D', catfile($TMP_CHECKDIR, "follower.$port", "data"))) == 0 (@pg_ctl_args, 'stop', '-w', '-D', catfile($TMP_CHECKDIR, "follower.$port", "data"))) == 0
or warn "Could not shutdown worker server"; or warn "Could not shutdown worker server";
} }
} }
@ -793,7 +801,7 @@ if (!$conninfo)
{ {
write_settings_to_postgres_conf(\@pgOptions, catfile($TMP_CHECKDIR, $MASTERDIR, "data/postgresql.conf")); write_settings_to_postgres_conf(\@pgOptions, catfile($TMP_CHECKDIR, $MASTERDIR, "data/postgresql.conf"));
if(system(catfile("$bindir", "pg_ctl"), if(system(catfile("$bindir", "pg_ctl"),
('start', '-w', (@pg_ctl_args, 'start', '-w',
'-o', " -c port=$masterPort $synchronousReplication", '-o', " -c port=$masterPort $synchronousReplication",
'-D', catfile($TMP_CHECKDIR, $MASTERDIR, 'data'), '-l', catfile($TMP_CHECKDIR, $MASTERDIR, 'log', 'postmaster.log'))) != 0) '-D', catfile($TMP_CHECKDIR, $MASTERDIR, 'data'), '-l', catfile($TMP_CHECKDIR, $MASTERDIR, 'log', 'postmaster.log'))) != 0)
{ {
@ -805,7 +813,7 @@ if (!$conninfo)
{ {
write_settings_to_postgres_conf(\@pgOptions, catfile($TMP_CHECKDIR, "worker.$port", "data/postgresql.conf")); write_settings_to_postgres_conf(\@pgOptions, catfile($TMP_CHECKDIR, "worker.$port", "data/postgresql.conf"));
if(system(catfile("$bindir", "pg_ctl"), if(system(catfile("$bindir", "pg_ctl"),
('start', '-w', (@pg_ctl_args, 'start', '-w',
'-o', " -c port=$port $synchronousReplication", '-o', " -c port=$port $synchronousReplication",
'-D', catfile($TMP_CHECKDIR, "worker.$port", "data"), '-D', catfile($TMP_CHECKDIR, "worker.$port", "data"),
'-l', catfile($TMP_CHECKDIR, "worker.$port", "log", "postmaster.log"))) != 0) '-l', catfile($TMP_CHECKDIR, "worker.$port", "log", "postmaster.log"))) != 0)
@ -836,7 +844,7 @@ if ($followercluster)
write_settings_to_postgres_conf(\@pgOptions, catfile($TMP_CHECKDIR, $MASTER_FOLLOWERDIR, "data/postgresql.conf")); write_settings_to_postgres_conf(\@pgOptions, catfile($TMP_CHECKDIR, $MASTER_FOLLOWERDIR, "data/postgresql.conf"));
if(system(catfile("$bindir", "pg_ctl"), if(system(catfile("$bindir", "pg_ctl"),
('start', '-w', (@pg_ctl_args, 'start', '-w',
'-o', " -c port=$followerCoordPort", '-o', " -c port=$followerCoordPort",
'-D', catfile($TMP_CHECKDIR, $MASTER_FOLLOWERDIR, 'data'), '-l', catfile($TMP_CHECKDIR, $MASTER_FOLLOWERDIR, 'log', 'postmaster.log'))) != 0) '-D', catfile($TMP_CHECKDIR, $MASTER_FOLLOWERDIR, 'data'), '-l', catfile($TMP_CHECKDIR, $MASTER_FOLLOWERDIR, 'log', 'postmaster.log'))) != 0)
{ {
@ -848,7 +856,7 @@ if ($followercluster)
{ {
write_settings_to_postgres_conf(\@pgOptions, catfile($TMP_CHECKDIR, "follower.$port", "data/postgresql.conf")); write_settings_to_postgres_conf(\@pgOptions, catfile($TMP_CHECKDIR, "follower.$port", "data/postgresql.conf"));
if(system(catfile("$bindir", "pg_ctl"), if(system(catfile("$bindir", "pg_ctl"),
('start', '-w', (@pg_ctl_args, 'start', '-w',
'-o', " -c port=$port", '-o', " -c port=$port",
'-D', catfile($TMP_CHECKDIR, "follower.$port", "data"), '-D', catfile($TMP_CHECKDIR, "follower.$port", "data"),
'-l', catfile($TMP_CHECKDIR, "follower.$port", "log", "postmaster.log"))) != 0) '-l', catfile($TMP_CHECKDIR, "follower.$port", "log", "postmaster.log"))) != 0)