Merge branch 'master' into release_2_5

Author: Grigory Smolkin

doc/pgprobackup.xml

@@ -1880,6 +1880,14 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
           <literal>template1</literal> databases are always restored.
         </para>
       </note>
+      <note>
+        <para>
+          Due to how recovery works in PostgreSQL < 12 it is advisable to
+          disable <option>hot_standby</option> option, when running partial
+          restore of PostgreSQL cluster of version less than <option>12</option>.
+          Otherwise recovery may fail.
+        </para>
+      </note>
     </refsect3>
   </refsect2>
   <refsect2 id="pbk-performing-point-in-time-pitr-recovery">
@@ -4411,6 +4419,10 @@ pg_probackup archive-get -B <replaceable>backup_dir</replaceable> --instance <re
       <listitem>
       <para>
         Specifies the timestamp up to which recovery will proceed.
+        If timezone offset is not specified, local timezone is used.
+      </para>
+      <para>
+       Example: <literal>--recovery-target-time='2020-01-01 00:00:00+03'</literal>
       </para>
       </listitem>
       </varlistentry>
@@ -4597,6 +4609,7 @@ pg_probackup archive-get -B <replaceable>backup_dir</replaceable> --instance <re
       <para>
           Specifies the timestamp up to which the backup will stay
           pinned. Must be an ISO-8601 complaint timestamp.
+          If timezone offset is not specified, local timezone is used.
       </para>
       <para>
        Example: <literal>--expire-time='2020-01-01 00:00:00+03'</literal>

gen_probackup_project.pl

@@ -167,6 +167,7 @@ sub build_pgprobackup
 		'pg_probackup.c',
 		'restore.c',
 		'show.c',
+		'stream.c',
 		'util.c',
 		'validate.c',
 		'checkdb.c',

src/backup.c

@@ -133,7 +133,7 @@ do_backup_instance(PGconn *backup_conn, PGNodeInfo *nodeInfo, bool no_sync, bool
 		pg_ptrack_clear(backup_conn, nodeInfo->ptrack_version_num);
 
 	/* notify start of backup to PostgreSQL server */
-	time2iso(label, lengthof(label), current.start_time);
+	time2iso(label, lengthof(label), current.start_time, false);
 	strncat(label, " with pg_probackup", lengthof(label) -
 			strlen(" with pg_probackup"));
 
@@ -572,7 +572,6 @@ do_backup_instance(PGconn *backup_conn, PGNodeInfo *nodeInfo, bool no_sync, bool
 	 * NOTHING TO DO HERE
 	 */
 
-
 	/* write database map to file and add it to control file */
 	if (database_map)
 	{
@@ -765,7 +764,7 @@ do_backup(time_t start_time, pgSetBackupParams *set_backup_params,
 	/* Create backup directory and BACKUP_CONTROL_FILE */
 	if (pgBackupCreateDir(&current))
 		elog(ERROR, "Cannot create backup directory");
-	if (!lock_backup(&current, true))
+	if (!lock_backup(&current, true, true))
 		elog(ERROR, "Cannot lock backup %s directory",
 			 base36enc(current.start_time));
 	write_backup(&current, true);
@@ -1383,7 +1382,7 @@ wait_wal_lsn(XLogRecPtr target_lsn, bool is_start_lsn, TimeLineID tli,
 				XLogRecPtr	res;
 
 				res = get_prior_record_lsn(wal_segment_dir, current.start_lsn, target_lsn, tli,
-									   in_prev_segment, instance_config.xlog_seg_size);
+										in_prev_segment, instance_config.xlog_seg_size);
 
 				if (!XLogRecPtrIsInvalid(res))
 				{