From bb3c0645aaa421dd44e46092923dcb7deca27709 Mon Sep 17 00:00:00 2001 From: Arthur Zakirov Date: Fri, 23 Nov 2018 15:08:04 +0300 Subject: [PATCH] PGPRO-2180: Use archive_timeout only, do not use checkpoint_timeout --- src/backup.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/backup.c b/src/backup.c index 0e76dde7..c9fcea3f 100644 --- a/src/backup.c +++ b/src/backup.c @@ -1545,21 +1545,18 @@ wait_wal_lsn(XLogRecPtr lsn, bool is_start_lsn, bool wait_prev_segment) DATABASE_DIR, PG_XLOG_DIR); join_path_components(wal_segment_path, pg_wal_dir, wal_segment); wal_segment_dir = pg_wal_dir; - - timeout = (uint32) checkpoint_timeout(); - timeout = timeout + timeout * 0.1; } else { join_path_components(wal_segment_path, arclog_path, wal_segment); wal_segment_dir = arclog_path; - - if (archive_timeout > 0) - timeout = archive_timeout; - else - timeout = ARCHIVE_TIMEOUT_DEFAULT; } + if (archive_timeout > 0) + timeout = archive_timeout; + else + timeout = ARCHIVE_TIMEOUT_DEFAULT; + if (wait_prev_segment) elog(LOG, "Looking for segment: %s", wal_segment); else