Skip to content

Commit 925b7d5

Browse files
committed
[Issue #149] help update
1 parent 3a2a56a commit 925b7d5

File tree

1 file changed

+31
-22
lines changed

1 file changed

+31
-22
lines changed

src/help.c

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@ help_pg_probackup(void)
153153
printf(_(" [--recovery-target-name=target-name]\n"));
154154
printf(_(" [--recovery-target-action=pause|promote|shutdown]\n"));
155155
printf(_(" [--restore-as-replica] [--force]\n"));
156+
printf(_(" [--primary-conninfo=primary_conninfo]\n"));
157+
printf(_(" [-S | --primary-slot-name=slotname]\n"));
156158
printf(_(" [--no-validate] [--skip-block-validation]\n"));
157159
printf(_(" [-T OLDDIR=NEWDIR] [--progress]\n"));
158160
printf(_(" [--external-mapping=OLDDIR=NEWDIR]\n"));
@@ -382,20 +384,20 @@ help_restore(void)
382384
{
383385
printf(_("\n%s restore -B backup-path --instance=instance_name\n"), PROGRAM_NAME);
384386
printf(_(" [-D pgdata-path] [-i backup-id] [-j num-threads]\n"));
387+
printf(_(" [--progress] [--force] [--no-sync]\n"));
388+
printf(_(" [--no-validate] [--skip-block-validation]\n"));
389+
printf(_(" [-T OLDDIR=NEWDIR]\n"));
390+
printf(_(" [--external-mapping=OLDDIR=NEWDIR]\n"));
391+
printf(_(" [--skip-external-dirs]\n"));
392+
printf(_(" [--db-include dbname | --db-exclude dbname]\n"));
385393
printf(_(" [--recovery-target-time=time|--recovery-target-xid=xid\n"));
386394
printf(_(" |--recovery-target-lsn=lsn [--recovery-target-inclusive=boolean]]\n"));
387395
printf(_(" [--recovery-target-timeline=timeline]\n"));
388396
printf(_(" [--recovery-target=immediate|latest]\n"));
389397
printf(_(" [--recovery-target-name=target-name]\n"));
390398
printf(_(" [--recovery-target-action=pause|promote|shutdown]\n"));
391-
printf(_(" [--restore-as-replica] [--force]\n"));
392-
printf(_(" [--no-validate] [--skip-block-validation]\n"));
393-
printf(_(" [-T OLDDIR=NEWDIR] [--progress]\n"));
394-
printf(_(" [--external-mapping=OLDDIR=NEWDIR]\n"));
395-
printf(_(" [--skip-external-dirs]\n"));
396399
printf(_(" [--restore-command=cmdline]\n"));
397-
printf(_(" [--no-sync]\n"));
398-
printf(_(" [--db-include dbname | --db-exclude dbname]\n"));
400+
printf(_(" [-R | --restore-as-replica]\n"));
399401
printf(_(" [--remote-proto] [--remote-host]\n"));
400402
printf(_(" [--remote-port] [--remote-path] [--remote-user]\n"));
401403
printf(_(" [--ssh-options]\n"));
@@ -410,6 +412,22 @@ help_restore(void)
410412
printf(_(" -j, --threads=NUM number of parallel threads\n"));
411413

412414
printf(_(" --progress show progress\n"));
415+
printf(_(" --force ignore invalid status of the restored backup\n"));
416+
printf(_(" --no-sync do not sync restored files to disk\n"));
417+
printf(_(" --no-validate disable backup validation during restore\n"));
418+
printf(_(" --skip-block-validation set to validate only file-level checksum\n"));
419+
420+
printf(_(" -T, --tablespace-mapping=OLDDIR=NEWDIR\n"));
421+
printf(_(" relocate the tablespace from directory OLDDIR to NEWDIR\n"));
422+
printf(_(" --external-mapping=OLDDIR=NEWDIR\n"));
423+
printf(_(" relocate the external directory from OLDDIR to NEWDIR\n"));
424+
printf(_(" --skip-external-dirs do not restore all external directories\n"));
425+
426+
printf(_("\n Partial restore options:\n"));
427+
printf(_(" --db-include dbname restore only specified databases\n"));
428+
printf(_(" --db-exclude dbname do not restore specified databases\n"));
429+
430+
printf(_("\n Recovery options:\n"));
413431
printf(_(" --recovery-target-time=time time stamp up to which recovery will proceed\n"));
414432
printf(_(" --recovery-target-xid=xid transaction ID up to which recovery will proceed\n"));
415433
printf(_(" --recovery-target-lsn=lsn LSN of the write-ahead log location up to which recovery will proceed\n"));
@@ -424,24 +442,15 @@ help_restore(void)
424442
printf(_(" --recovery-target-action=pause|promote|shutdown\n"));
425443
printf(_(" action the server should take once the recovery target is reached\n"));
426444
printf(_(" (default: pause)\n"));
445+
printf(_(" --restore-command=cmdline command to use as 'restore_command' in recovery.conf; 'none' disables\n"));
427446

447+
printf(_("\n Standby options:\n"));
428448
printf(_(" -R, --restore-as-replica write a minimal recovery.conf in the output directory\n"));
429449
printf(_(" to ease setting up a standby server\n"));
430-
printf(_(" --force ignore invalid status of the restored backup\n"));
431-
printf(_(" --no-validate disable backup validation during restore\n"));
432-
printf(_(" --skip-block-validation set to validate only file-level checksum\n"));
433-
434-
printf(_(" -T, --tablespace-mapping=OLDDIR=NEWDIR\n"));
435-
printf(_(" relocate the tablespace from directory OLDDIR to NEWDIR\n"));
436-
printf(_(" --external-mapping=OLDDIR=NEWDIR\n"));
437-
printf(_(" relocate the external directory from OLDDIR to NEWDIR\n"));
438-
printf(_(" --skip-external-dirs do not restore all external directories\n"));
439-
printf(_(" --restore-command=cmdline command to use as 'restore_command' in recovery.conf; 'none' disables\n"));
440-
printf(_(" --no-sync do not sync restored files to disk\n"));
441-
442-
printf(_("\n Partial restore options:\n"));
443-
printf(_(" --db-include dbname restore only specified databases\n"));
444-
printf(_(" --db-exclude dbname do not restore specified databases\n"));
450+
printf(_(" --primary-conninfo=primary_conninfo\n"));
451+
printf(_(" connection string to be used for establishing connection\n"));
452+
printf(_(" with the primary server\n"));
453+
printf(_(" -S, --primary-slot-name=slotname replication slot to be used for WAL streaming from the primary server\n"));
445454

446455
printf(_("\n Logging options:\n"));
447456
printf(_(" --log-level-console=log-level-console\n"));

0 commit comments

Comments
 (0)