NotificationsYou must be signed in to change notification settings
Fork91
Star762

Commit1c81e75

committed

minor improvements

1 parent853d685 commit1c81e75Copy full SHA for 1c81e75

File tree

2 files changed

+19

-7

lines changed

src
- data.c
tests/expected
- option_help.out

2 files changed

+19

-7

lines changed

`‎src/data.c‎`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -821,8 +821,11 @@ backup_non_data_file(pgFile file, pgFile prev_file,`
`821`	`821`	`{`
`822`	`822`	`/* special treatment for global/pg_control */`
`823`	`823`	`if (file->external_dir_num==0&&strcmp(file->rel_path,XLOG_CONTROL_FILE)==0)`
`824`		`-returncopy_pgcontrol_file(from_fullpath,FIO_DB_HOST,`
	`824`	`+{`
	`825`	`+copy_pgcontrol_file(from_fullpath,FIO_DB_HOST,`
`825`	`826`	`to_fullpath,FIO_BACKUP_HOST,file);`
	`827`	`+return;`
	`828`	`+}`
`826`	`829`
`827`	`830`	`/*`
`828`	`831`	`* If non-data file exists in previous backup`

`‎tests/expected/option_help.out‎`

Lines changed: 15 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ pg_probackup - utility to manage backup/recovery of PostgreSQL database.`
`32`	`32`	`[--help]`
`33`	`33`
`34`	`34`	`pg_probackup set-backup -B backup-path --instance=instance_name`
`35`		`- -i backup-id [--ttl] [--expire-time]`
	`35`	`+ -i backup-id [--ttl=interval] [--expire-time=timestamp]`
	`36`	`+ [--note=text]`
`36`	`37`	`[--help]`
`37`	`38`
`38`	`39`	`pg_probackup show-config -B backup-path --instance=instance_name`
`@@ -45,6 +46,7 @@ pg_probackup - utility to manage backup/recovery of PostgreSQL database.`
`45`	`46`	`[--backup-pg-log] [-j num-threads] [--progress]`
`46`	`47`	`[--no-validate] [--skip-block-validation]`
`47`	`48`	`[--external-dirs=external-directories-paths]`
	`49`	`+ [--no-sync]`
`48`	`50`	`[--log-level-console=log-level-console]`
`49`	`51`	`[--log-level-file=log-level-file]`
`50`	`52`	`[--log-filename=log-filename]`
`@@ -65,7 +67,7 @@ pg_probackup - utility to manage backup/recovery of PostgreSQL database.`
`65`	`67`	`[--remote-proto] [--remote-host]`
`66`	`68`	`[--remote-port] [--remote-path] [--remote-user]`
`67`	`69`	`[--ssh-options]`
`68`		`- [--ttl] [--expire-time]`
	`70`	`+ [--ttl=interval] [--expire-time=timestamp] [--note=text]`
`69`	`71`	`[--help]`
`70`	`72`
`71`	`73`	`pg_probackup restore -B backup-path --instance=instance_name`
`@@ -77,10 +79,13 @@ pg_probackup - utility to manage backup/recovery of PostgreSQL database.`
`77`	`79`	`[--recovery-target-name=target-name]`
`78`	`80`	`[--recovery-target-action=pause\|promote\|shutdown]`
`79`	`81`	`[--restore-as-replica] [--force]`
	`82`	`+ [--primary-conninfo=primary_conninfo]`
	`83`	`+ [-S \| --primary-slot-name=slotname]`
`80`	`84`	`[--no-validate] [--skip-block-validation]`
`81`	`85`	`[-T OLDDIR=NEWDIR] [--progress]`
`82`	`86`	`[--external-mapping=OLDDIR=NEWDIR]`
`83`	`87`	`[--skip-external-dirs] [--restore-command=cmdline]`
	`88`	`+ [--no-sync]`
`84`	`89`	`[--db-include \| --db-exclude]`
`85`	`90`	`[--remote-proto] [--remote-host]`
`86`	`91`	`[--remote-port] [--remote-path] [--remote-user]`
`@@ -114,7 +119,8 @@ pg_probackup - utility to manage backup/recovery of PostgreSQL database.`
`114`	`119`	`[--retention-redundancy=retention-redundancy]`
`115`	`120`	`[--retention-window=retention-window]`
`116`	`121`	`[--wal-depth=wal-depth]`
`117`		`- [--delete-wal] [-i backup-id \| --delete-expired \| --merge-expired]`
	`122`	`+ [-i backup-id \| --delete-expired \| --merge-expired \| --status=backup_status]`
	`123`	`+ [--delete-wal]`
`118`	`124`	`[--dry-run]`
`119`	`125`	`[--help]`
`120`	`126`
`@@ -135,10 +141,11 @@ pg_probackup - utility to manage backup/recovery of PostgreSQL database.`
`135`	`141`	`[--help]`
`136`	`142`
`137`	`143`	`pg_probackup archive-push -B backup-path --instance=instance_name`
`138`		`- --wal-file-path=wal-file-path`
`139`	`144`	`--wal-file-name=wal-file-name`
`140`		`- [--overwrite]`
`141`		`- [--compress]`
	`145`	`+ [-j num-threads] [--batch-size=batch_size]`
	`146`	`+ [--archive-timeout=timeout]`
	`147`	`+ [--no-ready-rename] [--no-sync]`
	`148`	`+ [--overwrite] [--compress]`
`142`	`149`	`[--compress-algorithm=compress-algorithm]`
`143`	`150`	`[--compress-level=compress-level]`
`144`	`151`	`[--remote-proto] [--remote-host]`
`@@ -149,6 +156,8 @@ pg_probackup - utility to manage backup/recovery of PostgreSQL database.`
`149`	`156`	`pg_probackup archive-get -B backup-path --instance=instance_name`
`150`	`157`	`--wal-file-path=wal-file-path`
`151`	`158`	`--wal-file-name=wal-file-name`
	`159`	`+ [-j num-threads] [--batch-size=batch_size]`
	`160`	`+ [--no-validate-wal]`
`152`	`161`	`[--remote-proto] [--remote-host]`
`153`	`162`	`[--remote-port] [--remote-path] [--remote-user]`
`154`	`163`	`[--ssh-options]`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit1c81e75

File tree

2 files changed

2 files changed

`‎src/data.c‎`

`‎tests/expected/option_help.out‎`

0 commit comments