db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2024-12-04 10:44:46 +02:00
Code Issues Releases Activity

Replace PG_STOP_BACKUP_TIMEOUT by archive-timeout

Browse Source
This commit is contained in:
Arthur Zakirov 2018-11-27 17:31:35 +03:00
parent e199c4aee8
commit 59da24d59c
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backup.c
View File

@ -24,8 +24,6 @@
#include "utils/thread.h" #include "utils/thread.h"
#include <time.h> #include <time.h>
#define PG_STOP_BACKUP_TIMEOUT 300
/* /*
* Macro needed to parse ptrack. * Macro needed to parse ptrack.
* NOTE Keep those values syncronised with definitions in ptrack.h * NOTE Keep those values syncronised with definitions in ptrack.h
@ -1858,8 +1856,8 @@ pg_stop_backup(pgBackup *backup)
} }
/* /*
* Wait for the result of pg_stop_backup(), * Wait for the result of pg_stop_backup(), but no longer than
* but no longer than PG_STOP_BACKUP_TIMEOUT seconds * archive_timeout seconds
*/ */
if (pg_stop_backup_is_sent && !in_cleanup) if (pg_stop_backup_is_sent && !in_cleanup)
{ {
@ -1882,14 +1880,14 @@ pg_stop_backup(pgBackup *backup)
elog(INFO, "wait for pg_stop_backup()"); elog(INFO, "wait for pg_stop_backup()");
/* /*
* If postgres haven't answered in PG_STOP_BACKUP_TIMEOUT seconds, * If postgres haven't answered in archive_timeout seconds,
* send an interrupt. * send an interrupt.
*/ */
if (pg_stop_backup_timeout > PG_STOP_BACKUP_TIMEOUT) if (pg_stop_backup_timeout > archive_timeout)
{ {
pgut_cancel(conn); pgut_cancel(conn);
elog(ERROR, "pg_stop_backup doesn't answer in %d seconds, cancel it", elog(ERROR, "pg_stop_backup doesn't answer in %d seconds, cancel it",
PG_STOP_BACKUP_TIMEOUT); archive_timeout);
} }
} }
else else