Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb38aa65

Browse files
committed
remote backup help update
1 parent3e970d1 commitb38aa65

File tree

2 files changed

+76
-13
lines changed

2 files changed

+76
-13
lines changed

‎src/help.c

Lines changed: 67 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ help_pg_probackup(void)
119119
printf(_(" [--master-port=port] [--master-user=user_name]\n"));
120120
printf(_(" [--replica-timeout=timeout]\n"));
121121
printf(_(" [--skip-block-validation]\n"));
122+
printf(_(" [--remote-proto] [--remote-host]\n"));
123+
printf(_(" [--remote-port] [--remote-path]\n"));
124+
printf(_(" [--ssh-options]\n"));
122125

123126
printf(_("\n %s restore -B backup-path --instance=instance_name\n"),PROGRAM_NAME);
124127
printf(_(" [-D pgdata-path] [-i backup-id] [--progress]\n"));
@@ -129,6 +132,9 @@ help_pg_probackup(void)
129132
printf(_(" [--restore-as-replica]\n"));
130133
printf(_(" [--no-validate]\n"));
131134
printf(_(" [--skip-block-validation]\n"));
135+
printf(_(" [--remote-proto] [--remote-host]\n"));
136+
printf(_(" [--remote-port] [--remote-path]\n"));
137+
printf(_(" [--ssh-options]\n"));
132138

133139
printf(_("\n %s validate -B backup-path [--instance=instance_name]\n"),PROGRAM_NAME);
134140
printf(_(" [-i backup-id] [--progress]\n"));
@@ -148,6 +154,9 @@ help_pg_probackup(void)
148154

149155
printf(_("\n %s add-instance -B backup-path -D pgdata-path\n"),PROGRAM_NAME);
150156
printf(_(" --instance=instance_name\n"));
157+
printf(_(" [--remote-proto] [--remote-host]\n"));
158+
printf(_(" [--remote-port] [--remote-path]\n"));
159+
printf(_(" [--ssh-options]\n"));
151160

152161
printf(_("\n %s del-instance -B backup-path\n"),PROGRAM_NAME);
153162
printf(_(" --instance=instance_name\n"));
@@ -159,10 +168,16 @@ help_pg_probackup(void)
159168
printf(_(" [--compress-algorithm=compress-algorithm]\n"));
160169
printf(_(" [--compress-level=compress-level]\n"));
161170
printf(_(" [--overwrite]\n"));
171+
printf(_(" [--remote-proto] [--remote-host]\n"));
172+
printf(_(" [--remote-port] [--remote-path]\n"));
173+
printf(_(" [--ssh-options]\n"));
162174

163175
printf(_("\n %s archive-get -B backup-path --instance=instance_name\n"),PROGRAM_NAME);
164176
printf(_(" --wal-file-path=wal-file-path\n"));
165177
printf(_(" --wal-file-name=wal-file-name\n"));
178+
printf(_(" [--remote-proto] [--remote-host]\n"));
179+
printf(_(" [--remote-port] [--remote-path]\n"));
180+
printf(_(" [--ssh-options]\n"));
166181

167182
if ((PROGRAM_URL||PROGRAM_EMAIL))
168183
{
@@ -207,7 +222,10 @@ help_backup(void)
207222
printf(_(" [--master-db=db_name] [--master-host=host_name]\n"));
208223
printf(_(" [--master-port=port] [--master-user=user_name]\n"));
209224
printf(_(" [--replica-timeout=timeout]\n"));
210-
printf(_(" [--skip-block-validation]\n\n"));
225+
printf(_(" [--skip-block-validation]\n"));
226+
printf(_(" [--remote-proto] [--remote-host]\n"));
227+
printf(_(" [--remote-port] [--remote-path]\n"));
228+
printf(_(" [--ssh-options]\n\n"));
211229

212230
printf(_(" -B, --backup-path=backup-path location of the backup storage area\n"));
213231
printf(_(" -b, --backup-mode=backup-mode backup mode=FULL|PAGE|DELTA|PTRACK\n"));
@@ -272,6 +290,14 @@ help_backup(void)
272290
printf(_(" --master-host=host_name database server host of master\n"));
273291
printf(_(" --master-port=port database server port of master\n"));
274292
printf(_(" --replica-timeout=timeout wait timeout for WAL segment streaming through replication (default: 5min)\n"));
293+
294+
printf(_("\n Remote options:\n"));
295+
printf(_(" --remote-proto=protocol remote protocol to use\n"));
296+
printf(_(" available options: 'ssh', 'none' (default: none)\n"));
297+
printf(_(" --remote-host=hostname remote host address or hostname\n"));
298+
printf(_(" --remote-port=port remote host port (default: 22)\n"));
299+
printf(_(" --remote-path=path path to pg_probackup binary on remote host (default: current binary path)\n"));
300+
printf(_(" --ssh-options=ssh_options additional ssh options (default: none)\n"));
275301
}
276302

277303
staticvoid
@@ -284,7 +310,10 @@ help_restore(void)
284310
printf(_(" [--immediate] [--recovery-target-name=target-name]\n"));
285311
printf(_(" [--recovery-target-action=pause|promote|shutdown]\n"));
286312
printf(_(" [--restore-as-replica] [--no-validate]\n\n"));
287-
printf(_(" [--skip-block-validation]\n\n"));
313+
printf(_(" [--skip-block-validation]\n"));
314+
printf(_(" [--remote-proto] [--remote-host]\n"));
315+
printf(_(" [--remote-port] [--remote-path]\n"));
316+
printf(_(" [--ssh-options]\n\n"));
288317

289318
printf(_(" -B, --backup-path=backup-path location of the backup storage area\n"));
290319
printf(_(" --instance=instance_name name of the instance\n"));
@@ -333,6 +362,14 @@ help_restore(void)
333362
printf(_(" --log-rotation-age=log-rotation-age\n"));
334363
printf(_(" rotate logfile if its age exceeds this value; 0 disables; (default: 0)\n"));
335364
printf(_(" available units: 'ms', 's', 'min', 'h', 'd' (default: min)\n"));
365+
366+
printf(_("\n Remote options:\n"));
367+
printf(_(" --remote-proto=protocol remote protocol to use\n"));
368+
printf(_(" available options: 'ssh', 'none' (default: none)\n"));
369+
printf(_(" --remote-host=hostname remote host address or hostname\n"));
370+
printf(_(" --remote-port=port remote host port (default: 22)\n"));
371+
printf(_(" --remote-path=path path to pg_probackup binary on remote host (default: current binary path)\n"));
372+
printf(_(" --ssh-options=ssh_options additional ssh options (default: none)\n"));
336373
}
337374

338375
staticvoid
@@ -558,11 +595,22 @@ static void
558595
help_add_instance(void)
559596
{
560597
printf(_("%s add-instance -B backup-path -D pgdata-path\n"),PROGRAM_NAME);
561-
printf(_(" --instance=instance_name\n\n"));
598+
printf(_(" --instance=instance_name\n"));
599+
printf(_(" [--remote-proto] [--remote-host]\n"));
600+
printf(_(" [--remote-port] [--remote-path]\n"));
601+
printf(_(" [--ssh-options]\n\n"));
562602

563603
printf(_(" -B, --backup-path=backup-path location of the backup storage area\n"));
564604
printf(_(" -D, --pgdata=pgdata-path location of the database storage area\n"));
565605
printf(_(" --instance=instance_name name of the new instance\n"));
606+
607+
printf(_("\n Remote options:\n"));
608+
printf(_(" --remote-proto=protocol remote protocol to use\n"));
609+
printf(_(" available options: 'ssh', 'none' (default: none)\n"));
610+
printf(_(" --remote-host=hostname remote host address or hostname\n"));
611+
printf(_(" --remote-port=port remote host port (default: 22)\n"));
612+
printf(_(" --remote-path=path path to pg_probackup binary on remote host (default: current binary path)\n"));
613+
printf(_(" --ssh-options=ssh_options additional ssh options (default: none)\n"));
566614
}
567615

568616
staticvoid
@@ -583,7 +631,10 @@ help_archive_push(void)
583631
printf(_(" [--compress]\n"));
584632
printf(_(" [--compress-algorithm=compress-algorithm]\n"));
585633
printf(_(" [--compress-level=compress-level]\n"));
586-
printf(_(" [--overwrite]\n\n"));
634+
printf(_(" [--overwrite]\n"));
635+
printf(_(" [--remote-proto] [--remote-host]\n"));
636+
printf(_(" [--remote-port] [--remote-path]\n"));
637+
printf(_(" [--ssh-options]\n\n"));
587638

588639
printf(_(" -B, --backup-path=backup-path location of the backup storage area\n"));
589640
printf(_(" --instance=instance_name name of the instance to delete\n"));
@@ -604,12 +655,23 @@ help_archive_get(void)
604655
{
605656
printf(_("\n %s archive-get -B backup-path --instance=instance_name\n"),PROGRAM_NAME);
606657
printf(_(" --wal-file-path=wal-file-path\n"));
607-
printf(_(" --wal-file-name=wal-file-name\n\n"));
658+
printf(_(" --wal-file-name=wal-file-name\n"));
659+
printf(_(" [--remote-proto] [--remote-host]\n"));
660+
printf(_(" [--remote-port] [--remote-path]\n"));
661+
printf(_(" [--ssh-options]\n\n"));
608662

609663
printf(_(" -B, --backup-path=backup-path location of the backup storage area\n"));
610664
printf(_(" --instance=instance_name name of the instance to delete\n"));
611665
printf(_(" --wal-file-path=wal-file-path\n"));
612666
printf(_(" relative destination path name of the WAL file on the server\n"));
613667
printf(_(" --wal-file-name=wal-file-name\n"));
614668
printf(_(" name of the WAL file to retrieve from the archive\n"));
669+
670+
printf(_("\n Remote options:\n"));
671+
printf(_(" --remote-proto=protocol remote protocol to use\n"));
672+
printf(_(" available options: 'ssh', 'none' (default: none)\n"));
673+
printf(_(" --remote-host=hostname remote host address or hostname\n"));
674+
printf(_(" --remote-port=port remote host port (default: 22)\n"));
675+
printf(_(" --remote-path=path path to pg_probackup binary on remote host (default: current binary path)\n"));
676+
printf(_(" --ssh-options=ssh_options additional ssh options (default: none)\n"));
615677
}

‎src/pg_probackup.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -142,14 +142,15 @@ static ConfigOption cmd_options[] =
142142
{'s','S',"slot",&replication_slot,SOURCE_CMD_STRICT },
143143
{'b',134,"delete-wal",&delete_wal,SOURCE_CMD_STRICT },
144144
{'b',135,"delete-expired",&delete_expired,SOURCE_CMD_STRICT },
145-
{'s',19,"remote-host",&remote_host,SOURCE_CMD_STRICT, },
146-
{'s',20,"remote-port",&remote_port,SOURCE_CMD_STRICT, },
147-
{'s',21,"remote-proto",&remote_proto,SOURCE_CMD_STRICT, },
148-
{'s',22,"remote-path",&remote_path,SOURCE_CMD_STRICT, },
149-
{'s',23,"ssh-config",&ssh_config,SOURCE_CMD_STRICT, },
150-
{'s',24,"ssh-options",&ssh_options,SOURCE_CMD_STRICT, },
151-
{'s',25,"agent",&remote_agent,SOURCE_CMD_STRICT, },
152-
{'b',26,"remote",&is_remote_backup,SOURCE_CMD_STRICT, },
145+
/* remote options */
146+
{'s',19,"remote-proto",&remote_proto,SOURCE_CMD_STRICT, },
147+
{'b',20,"remote",&is_remote_backup,SOURCE_CMD_STRICT, },
148+
{'s',21,"remote-host",&remote_host,SOURCE_CMD_STRICT, },
149+
{'s',22,"remote-port",&remote_port,SOURCE_CMD_STRICT, },
150+
{'s',23,"remote-path",&remote_path,SOURCE_CMD_STRICT, },
151+
{'s',24,"ssh-config",&ssh_config,SOURCE_CMD_STRICT, },
152+
{'s',25,"ssh-options",&ssh_options,SOURCE_CMD_STRICT, },
153+
{'s',26,"agent",&remote_agent,SOURCE_CMD_STRICT, },
153154
/* restore options */
154155
{'s',136,"time",&target_time,SOURCE_CMD_STRICT },
155156
{'s',137,"xid",&target_xid,SOURCE_CMD_STRICT },

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp