@@ -122,9 +122,9 @@ help_pg_probackup(void)
122
122
printf (_ (" [--external-dirs=external-directory-path]\n" ));
123
123
124
124
printf (_ ("\n %s restore -B backup-path --instance=instance_name\n" ),PROGRAM_NAME );
125
- printf (_ (" [-D pgdata-path] [-i backup-id] [--progress ]\n" ));
125
+ printf (_ (" [-D pgdata-path] [-i backup-id] [-j num-threads ]\n" ));
126
126
printf (_ (" [--time=time|--xid=xid|--lsn=lsn [--inclusive=boolean]]\n" ));
127
- printf (_ (" [--timeline=timeline] [-T OLDDIR=NEWDIR]\n" ));
127
+ printf (_ (" [--timeline=timeline] [-T OLDDIR=NEWDIR] [--progress] \n" ));
128
128
printf (_ (" [--external-mapping=OLDDIR=NEWDIR]\n" ));
129
129
printf (_ (" [--immediate] [--recovery-target-name=target-name]\n" ));
130
130
printf (_ (" [--recovery-target-action=pause|promote|shutdown]\n" ));
@@ -146,8 +146,9 @@ help_pg_probackup(void)
146
146
147
147
printf (_ ("\n %s delete -B backup-path --instance=instance_name\n" ),PROGRAM_NAME );
148
148
printf (_ (" [--wal] [-i backup-id | --expired]\n" ));
149
+
149
150
printf (_ ("\n %s merge -B backup-path --instance=instance_name\n" ),PROGRAM_NAME );
150
- printf (_ (" -i backup-id\n" ));
151
+ printf (_ (" -i backup-id [--progress] [-j num-threads] \n" ));
151
152
152
153
printf (_ ("\n %s add-instance -B backup-path -D pgdata-path\n" ),PROGRAM_NAME );
153
154
printf (_ (" --instance=instance_name\n" ));
@@ -227,7 +228,7 @@ help_backup(void)
227
228
printf (_ (" --skip-block-validation set to validate only file-level checksum\n" ));
228
229
printf (_ (" -E --external-dirs=external-directory-path\n" ));
229
230
printf (_ (" backup some directories not from pgdata \n" ));
230
- printf (_ (" (example: --external-dirs=/tmp/dirA :/tmp/dirB )\n" ));
231
+ printf (_ (" (example: --external-dirs=/tmp/dir1 :/tmp/dir2 )\n" ));
231
232
232
233
printf (_ ("\n Logging options:\n" ));
233
234
printf (_ (" --log-level-console=log-level-console\n" ));
@@ -286,7 +287,7 @@ static void
286
287
help_restore (void )
287
288
{
288
289
printf (_ ("%s restore -B backup-path --instance=instance_name\n" ),PROGRAM_NAME );
289
- printf (_ (" [-D pgdata-path] [-i backup-id] [--progress]\n" ));
290
+ printf (_ (" [-D pgdata-path] [-i backup-id] [-j num-threads] [- -progress]\n" ));
290
291
printf (_ (" [--time=time|--xid=xid|--lsn=lsn [--inclusive=boolean]]\n" ));
291
292
printf (_ (" [--timeline=timeline] [-T OLDDIR=NEWDIR]\n" ));
292
293
printf (_ (" [--external-mapping=OLDDIR=NEWDIR]\n" ));
@@ -301,6 +302,7 @@ help_restore(void)
301
302
302
303
printf (_ (" -D, --pgdata=pgdata-path location of the database storage area\n" ));
303
304
printf (_ (" -i, --backup-id=backup-id backup to restore\n" ));
305
+ printf (_ (" -j, --threads=NUM number of parallel threads\n" ));
304
306
305
307
printf (_ (" --progress show progress\n" ));
306
308
printf (_ (" --time=time time stamp up to which recovery will proceed\n" ));
@@ -510,7 +512,7 @@ help_set_config(void)
510
512
printf (_ (" --instance=instance_name name of the instance\n" ));
511
513
printf (_ (" -E --external-dirs=external-directory-path\n" ));
512
514
printf (_ (" backup some directories not from pgdata \n" ));
513
- printf (_ (" (example: --external-dirs=/tmp/dirA :/tmp/dirB )\n" ));
515
+ printf (_ (" (example: --external-dirs=/tmp/dir1 :/tmp/dir2 )\n" ));
514
516
515
517
printf (_ ("\n Logging options:\n" ));
516
518
printf (_ (" --log-level-console=log-level-console\n" ));
@@ -586,7 +588,7 @@ help_add_instance(void)
586
588
printf (_ (" --instance=instance_name name of the new instance\n" ));
587
589
printf (_ (" -E --external-dirs=external-directory-path\n" ));
588
590
printf (_ (" backup some directories not from pgdata \n" ));
589
- printf (_ (" (example: --external-dirs=/tmp/dirA :/tmp/dirB )\n" ));
591
+ printf (_ (" (example: --external-dirs=/tmp/dir1 :/tmp/dir2 )\n" ));
590
592
}
591
593
592
594
static void