diff options
| -rw-r--r-- | doc/src/sgml/ref/pg_combinebackup.sgml | 90 | ||||
| -rw-r--r-- | src/bin/pg_combinebackup/pg_combinebackup.c | 4 |
2 files changed, 47 insertions, 47 deletions
diff --git a/doc/src/sgml/ref/pg_combinebackup.sgml b/doc/src/sgml/ref/pg_combinebackup.sgml index def1e38ae69..96df3d81f15 100644 --- a/doc/src/sgml/ref/pg_combinebackup.sgml +++ b/doc/src/sgml/ref/pg_combinebackup.sgml @@ -138,6 +138,51 @@ PostgreSQL documentation </varlistentry> <varlistentry> + <term><option>--clone</option></term> + <listitem> + <para> + Use efficient file cloning (also known as <quote>reflinks</quote> on + some systems) instead of copying files to the new data directory, + which can result in near-instantaneous copying of the data files. + </para> + + <para> + If a backup manifest is not available or does not contain checksum of + the right type, file cloning will be used to copy the file, but the + file will be also read block-by-block for the checksum calculation. + </para> + + <para> + File cloning is only supported on some operating systems and file + systems. If it is selected but not supported, the + <application>pg_combinebackup</application> run will error. At present, + it is supported on Linux (kernel 4.5 or later) with Btrfs and XFS (on + file systems created with reflink support), and on macOS with APFS. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>--copy-file-range</option></term> + <listitem> + <para> + Use the <function>copy_file_range</function> system call for efficient + copying. On some file systems this gives results similar to + <option>--clone</option>, sharing physical disk blocks, while on others + it may still copy blocks, but do so via an optimized path. At present, + it is supported on Linux and FreeBSD. + </para> + + <para> + If a backup manifest is not available or does not contain checksum of + the right type, <function>copy_file_range</function> will be used to + copy the file, but the file will be also read block-by-block for the + checksum calculation. + </para> + </listitem> + </varlistentry> + + <varlistentry> <term><option>--manifest-checksums=<replaceable class="parameter">algorithm</replaceable></option></term> <listitem> <para> @@ -190,51 +235,6 @@ PostgreSQL documentation </varlistentry> <varlistentry> - <term><option>--clone</option></term> - <listitem> - <para> - Use efficient file cloning (also known as <quote>reflinks</quote> on - some systems) instead of copying files to the new data directory, - which can result in near-instantaneous copying of the data files. - </para> - - <para> - If a backup manifest is not available or does not contain checksum of - the right type, file cloning will be used to copy the file, but the - file will be also read block-by-block for the checksum calculation. - </para> - - <para> - File cloning is only supported on some operating systems and file - systems. If it is selected but not supported, the - <application>pg_combinebackup</application> run will error. At present, - it is supported on Linux (kernel 4.5 or later) with Btrfs and XFS (on - file systems created with reflink support), and on macOS with APFS. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term><option>--copy-file-range</option></term> - <listitem> - <para> - Use the <function>copy_file_range</function> system call for efficient - copying. On some file systems this gives results similar to - <option>--clone</option>, sharing physical disk blocks, while on others - it may still copy blocks, but do so via an optimized path. At present, - it is supported on Linux and FreeBSD. - </para> - - <para> - If a backup manifest is not available or does not contain checksum of - the right type, <function>copy_file_range</function> will be used to - copy the file, but the file will be also read block-by-block for the - checksum calculation. - </para> - </listitem> - </varlistentry> - - <varlistentry> <term><option>-V</option></term> <term><option>--version</option></term> <listitem> diff --git a/src/bin/pg_combinebackup/pg_combinebackup.c b/src/bin/pg_combinebackup/pg_combinebackup.c index 95da1b01bc6..6ad17788bfc 100644 --- a/src/bin/pg_combinebackup/pg_combinebackup.c +++ b/src/bin/pg_combinebackup/pg_combinebackup.c @@ -732,12 +732,12 @@ help(const char *progname) printf(_(" -o, --output output directory\n")); printf(_(" -T, --tablespace-mapping=OLDDIR=NEWDIR\n" " relocate tablespace in OLDDIR to NEWDIR\n")); + printf(_(" --clone clone (reflink) instead of copying files\n")); + printf(_(" --copy-file-range copy using copy_file_range() syscall\n")); printf(_(" --manifest-checksums=SHA{224,256,384,512}|CRC32C|NONE\n" " use algorithm for manifest checksums\n")); printf(_(" --no-manifest suppress generation of backup manifest\n")); printf(_(" --sync-method=METHOD set method for syncing files to disk\n")); - printf(_(" --clone clone (reflink) instead of copying files\n")); - printf(_(" --copy-file-range copy using copy_file_range() syscall\n")); printf(_(" -?, --help show this help, then exit\n")); printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); |