@@ -80,6 +80,7 @@ static void backup_files(void *arg);
8080static void do_backup_database (parray * backup_list );
8181
8282static void pg_start_backup (const char * label ,bool smooth ,pgBackup * backup );
83+ static void pg_switch_wal (PGconn * conn );
8384static void pg_stop_backup (pgBackup * backup );
8485static int checkpoint_timeout (void );
8586
@@ -639,19 +640,53 @@ pg_start_backup(const char *label, bool smooth, pgBackup *backup)
639640
640641PQclear (res );
641642
643+ if (current .backup_mode == BACKUP_MODE_DIFF_PAGE )
644+ /*
645+ * Switch to a new WAL segment. It is necessary to get archived WAL
646+ * segment, which includes start LSN of current backup.
647+ */
648+ pg_switch_wal (conn );
649+
642650if (!stream_wal )
651+ {
643652/*
644653 * Do not wait start_lsn for stream backup.
645654 * Because WAL streaming will start after pg_start_backup() in stream
646655 * mode.
647656 */
648- wait_wal_lsn (backup -> start_lsn , true);
657+ /* In PAGE mode wait for current segment... */
658+ if (current .backup_mode == BACKUP_MODE_DIFF_PAGE )
659+ wait_wal_lsn (backup -> start_lsn , false);
660+ /* ...for others wait for previous segment */
661+ else
662+ wait_wal_lsn (backup -> start_lsn , true);
663+ }
649664
650665/* Wait for start_lsn to be replayed by replica */
651666if (from_replica )
652667wait_replica_wal_lsn (backup -> start_lsn , true);
653668}
654669
670+ /*
671+ * Switch to a new WAL segment. It should be called only for master.
672+ */
673+ static void
674+ pg_switch_wal (PGconn * conn )
675+ {
676+ PGresult * res ;
677+
678+ /* Remove annoying NOTICE messages generated by backend */
679+ res = pgut_execute (conn ,"SET client_min_messages = warning;" ,0 ,NULL );
680+ PQclear (res );
681+
682+ if (server_version >=100000 )
683+ res = pgut_execute (conn ,"SELECT * FROM pg_switch_wal()" ,0 ,NULL );
684+ else
685+ res = pgut_execute (conn ,"SELECT * FROM pg_switch_xlog()" ,0 ,NULL );
686+
687+ PQclear (res );
688+ }
689+
655690/*
656691 * Check if the instance supports ptrack
657692 * TODO Maybe we should rather check ptrack_version()?
@@ -974,7 +1009,7 @@ pg_stop_backup(pgBackup *backup)
9741009uint32 xrecoff ;
9751010XLogRecPtr restore_lsn = InvalidXLogRecPtr ;
9761011bool sent = false;
977- int pg_stop_backup_timeout = 0 ;
1012+ int pg_stop_backup_timeout = 0 ;
9781013
9791014/*
9801015 * We will use this values if there are no transactions between start_lsn
@@ -1050,8 +1085,6 @@ pg_stop_backup(pgBackup *backup)
10501085 * Wait for the result of pg_stop_backup(),
10511086 * but no longer than PG_STOP_BACKUP_TIMEOUT seconds
10521087 */
1053- elog (INFO ,"wait for pg_stop_backup()" );
1054-
10551088while (1 )
10561089{
10571090if (!PQconsumeInput (conn )|| PQisBusy (conn ))
@@ -1064,6 +1097,10 @@ pg_stop_backup(pgBackup *backup)
10641097pgut_cancel (conn );
10651098elog (ERROR ,"interrupted during waiting for pg_stop_backup" );
10661099}
1100+
1101+ if (pg_stop_backup_timeout == 1 )
1102+ elog (INFO ,"wait for pg_stop_backup()" );
1103+
10671104/*
10681105 * If postgres haven't answered in PG_STOP_BACKUP_TIMEOUT seconds,
10691106 * send an interrupt.
