mirror of
https://github.com/pgbackrest/pgbackrest.git
synced 2025-03-03 14:52:21 +02:00
Fixed small race condition in cleanup - the archiver was recreating paths after they had been deleted. Put in a loop to make sure it gets done.
This commit is contained in:
parent
60550cd45b
commit
139b1cf872
@ -167,7 +167,7 @@ sub BackRestTestBackup_ClusterStop
|
|||||||
# If postmaster process is running them stop the cluster
|
# If postmaster process is running them stop the cluster
|
||||||
if (-e $strPath . '/postmaster.pid')
|
if (-e $strPath . '/postmaster.pid')
|
||||||
{
|
{
|
||||||
BackRestTestCommon_Execute(BackRestTestCommon_PgSqlBinPathGet() . "/pg_ctl stop -D ${strPath} -w -s -m fast");
|
BackRestTestCommon_Execute(BackRestTestCommon_PgSqlBinPathGet() . "/pg_ctl stop -D ${strPath} -w -s");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -249,9 +249,10 @@ sub BackRestTestBackup_Drop
|
|||||||
BackRestTestBackup_ClusterStop(BackRestTestCommon_DbCommonPathGet());
|
BackRestTestBackup_ClusterStop(BackRestTestCommon_DbCommonPathGet());
|
||||||
|
|
||||||
# Remove the backrest private directory
|
# Remove the backrest private directory
|
||||||
if (-e BackRestTestCommon_BackupPathGet())
|
while (-e BackRestTestCommon_BackupPathGet())
|
||||||
{
|
{
|
||||||
BackRestTestCommon_PathRemove(BackRestTestCommon_BackupPathGet(), true, true);
|
BackRestTestCommon_PathRemove(BackRestTestCommon_BackupPathGet(), true, true);
|
||||||
|
hsleep(.1);
|
||||||
}
|
}
|
||||||
|
|
||||||
# Remove the test directory
|
# Remove the test directory
|
||||||
@ -1050,7 +1051,7 @@ sub BackRestTestBackup_Test
|
|||||||
{
|
{
|
||||||
for (my $bChecksum = false; $bChecksum <= true; $bChecksum++)
|
for (my $bChecksum = false; $bChecksum <= true; $bChecksum++)
|
||||||
{
|
{
|
||||||
for (my $bArchiveAsync = false; $bArchiveAsync <= true $bArchiveAsync++)
|
for (my $bArchiveAsync = false; $bArchiveAsync <= true; $bArchiveAsync++)
|
||||||
{
|
{
|
||||||
for (my $bCompressAsync = false; $bCompressAsync <= true; $bCompressAsync++)
|
for (my $bCompressAsync = false; $bCompressAsync <= true; $bCompressAsync++)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user