Merge branch 'release_2_4' into issue_201

Author: gsmolk

README.md

@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.com/postgrespro/pg_probackup.svg?branch=master)](https://travis-ci.com/postgrespro/pg_probackup)
+[![GitHub release](https://img.shields.io/github/v/release/postgrespro/pg_probackup?include_prereleases)](https://github.com/postgrespro/pg_probackup/releases/latest)
 
 # pg_probackup
 
@@ -49,18 +50,19 @@ Regardless of the chosen backup type, all backups taken with `pg_probackup` supp
 `pg_probackup` currently has the following limitations:
 * The server from which the backup was taken and the restored server must be compatible by the [block_size](https://postgrespro.com/docs/postgresql/current/runtime-config-preset#GUC-BLOCK-SIZE) and [wal_block_size](https://postgrespro.com/docs/postgresql/current/runtime-config-preset#GUC-WAL-BLOCK-SIZE) parameters and have the same major release number.
 * Remote backup via ssh on Windows currently is not supported.
+* When running remote operations via ssh, remote and local pg_probackup versions must be the same.
 
 ## Current release
 
-[2.3.1](https://github.com/postgrespro/pg_probackup/releases/tag/2.3.1)
+[2.3.3](https://github.com/postgrespro/pg_probackup/releases/tag/2.3.3)
 
 ## Documentation
 
 Documentation can be found at [github](https://postgrespro.github.io/pg_probackup) and [Postgres Professional documentation](https://postgrespro.com/docs/postgrespro/current/app-pgprobackup)
 
 ## Installation and Setup
 ### Windows Installation
-Installers are available in release **assets**. [Latests](https://github.com/postgrespro/pg_probackup/releases/latest).
+Installers are available in release **assets**. [Latests](https://github.com/postgrespro/pg_probackup/releases/2.3.3).
 
 ### Linux Installation
 #### pg_probackup for vanilla PostgreSQL

doc/pgprobackup.xml

@@ -740,6 +740,16 @@ ALTER ROLE backup WITH REPLICATION;
       DELTA, and PTRACK backups in the
       <link linkend="pbk-stream-mode">STREAM</link> WAL mode.
     </para>
+    <note>
+      <para>
+        If you are planning to rely on
+        <ulink url="https://postgrespro.com/docs/postgresql/current/libpq-pgpass.html">.pgpass</ulink>
+        for authentication when running backup in STREAM mode,
+        then .pgpass must contain credentials for <literal>replication</literal> database,
+        used to establish connection via replication protocol. Example:
+        pghost:5432:replication:backup_user:my_strong_password
+      </para>
+    </note>
   </refsect2>
   <refsect2 id="pbk-setting-up-continuous-wal-archiving">
     <title>Setting up Continuous WAL Archiving</title>
@@ -1158,20 +1168,20 @@ CREATE EXTENSION ptrack;
       </listitem>
       <listitem>
       <para>
-       To enable tracking page updates, set <varname>ptrack_map_size</varname>
+       To enable tracking page updates, set <varname>ptrack.map_size</varname>
        parameter to a positive integer and restart the server.
       </para>
       <para>
        For optimal performance, it is recommended to set
-       <varname>ptrack_map_size</varname> to
+       <varname>ptrack.map_size</varname> to
        <literal><replaceable>N</replaceable> / 1024</literal>, where
        <replaceable>N</replaceable> is the size of the
        <productname>PostgreSQL</productname> cluster, in MB. If you set this
        parameter to a lower value, PTRACK is more likely to map several blocks
        together, which leads to false-positive results when tracking changed
        blocks and increases the incremental backup size as unchanged blocks
        can also be copied into the incremental backup.
-       Setting <varname>ptrack_map_size</varname> to a higher value
+       Setting <varname>ptrack.map_size</varname> to a higher value
        does not affect PTRACK operation. The maximum allowed value is 1024.
       </para>
      </listitem>
@@ -1191,11 +1201,11 @@ GRANT EXECUTE ON FUNCTION pg_ptrack_get_block(oid, oid, oid, bigint) TO backup;
 
    <note>
     <para>
-     If you change the <varname>ptrack_map_size</varname> parameter value,
+     If you change the <varname>ptrack.map_size</varname> parameter value,
      the previously created PTRACK map file is cleared,
      and tracking newly changed blocks starts from scratch. Thus, you have
      to retake a full backup before taking incremental PTRACK backups after
-     changing <varname>ptrack_map_size</varname>.
+     changing <varname>ptrack.map_size</varname>.
     </para>
    </note>
 
@@ -2407,6 +2417,12 @@ primary_conninfo = 'user=backup passfile=/var/lib/pgsql/.pgpass port=5432 sslmod
           <literal>note</literal> — text note attached to backup.
         </para>
         </listitem>
+        <listitem>
+        <para>
+          <literal>content-crc</literal> — CRC32 checksum of <literal>backup_content.control</literal> file.
+          It is used to detect corruption of backup metainformation.
+        </para>
+        </listitem>
       </itemizedlist>
       </para>
       <para>
@@ -4039,10 +4055,10 @@ pg_probackup archive-push -B <replaceable>backup_dir</replaceable> --instance <r
         corruption.
       </para>
       <para>
-        To speed up archiving, you can specify the <option>-j</option> option
-        to run <command>archive-push</command> on multiple threads.
-        If you provide the <option>--batch-size</option> option, WAL files
-        will be copied in batches of the specified size.
+        To speed up archiving, you can specify the <option>--batch-size</option> option
+        to copy WAL segments in batches of the specified size.
+        If <option>--batch-size</option> option is used, then you can also specify
+        the <option>-j</option> option to copy the batch of WAL segments on multiple threads.
       </para>
       <para>
         WAL segments copied to the archive are synced to disk unless
@@ -4080,10 +4096,10 @@ pg_probackup archive-get -B <replaceable>backup_dir</replaceable> --instance <re
       </para>
 
       <para>
-        To speed up recovery, you can specify the <option>-j</option> option
-        to run <command>archive-get</command> on multiple threads.
-        If you provide the <option>--batch-size</option> option, WAL segments
-        will be copied in batches of the specified size.
+        To speed up recovery, you can specify the <option>--batch-size</option> option
+        to copy WAL segments in batches of the specified size.
+        If <option>--batch-size</option> option is used, then you can also specify
+        the <option>-j</option> option to copy the batch of WAL segments on multiple threads.
       </para>
 
       <para>
@@ -4708,7 +4724,7 @@ pg_probackup archive-get -B <replaceable>backup_dir</replaceable> --instance <re
 <term><option>--password</option></term>
       <listitem>
       <para>
-        Forces a password prompt.
+        Forces a password prompt. (Deprecated)
       </para>
       </listitem>
       </varlistentry>

src/archive.c

@@ -945,7 +945,7 @@ setup_push_filelist(const char *archive_status_dir, const char *first_file,
 	/* get list of files from archive_status */
 	status_files = parray_new();
 	dir_list_file(status_files, archive_status_dir, false, false, false, 0, FIO_DB_HOST);
-	parray_qsort(status_files, pgFileComparePath);
+	parray_qsort(status_files, pgFileCompareName);
 
 	for (i = 0; i < parray_num(status_files); i++)
 	{
@@ -1109,7 +1109,7 @@ do_archive_get(InstanceConfig *instance, const char *prefetch_dir_arg,
 			{
 				/* discard prefetch */
 //				n_fetched = 0;
-				rmtree(prefetch_dir, false);
+				pgut_rmtree(prefetch_dir, false, false);
 			}
 		}
 		else