NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit8a00b96

committed

Add pg_rewind --no-sync

This is an option consistent with what pg_dump and pg_basebackup providewhich is useful for leveraging the I/O effort when testing things, notto be used in a production environment.Author: Michael PaquierReviewed-by: Heikki LinnakangasDiscussion:https://postgr.es/m/20180325122607.GB3707@paquier.xyz

1 parent9a4059d commit8a00b96Copy full SHA for 8a00b96

File tree

3 files changed

+30

-4

lines changed

doc/src/sgml/ref
- pg_rewind.sgml
src/bin/pg_rewind
- RewindTest.pm
- pg_rewind.c

3 files changed

+30

-4

lines changed

`‎doc/src/sgml/ref/pg_rewind.sgml`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,22 @@ PostgreSQL documentation`
`171`	`171`	`</listitem>`
`172`	`172`	`</varlistentry>`
`173`	`173`
	`174`	`+ <varlistentry>`
	`175`	`+ <term><option>-N</option></term>`
	`176`	`+ <term><option>--no-sync</option></term>`
	`177`	`+ <listitem>`
	`178`	`+ <para>`
	`179`	`+ By default, <command>pg_rewind</command> will wait for all files`
	`180`	`+ to be written safely to disk. This option causes`
	`181`	`+ <command>pg_rewind</command> to return without waiting, which is`
	`182`	`+ faster, but means that a subsequent operating system crash can leave`
	`183`	`+ the synchronized data folder corrupt. Generally, this option is`
	`184`	`+ useful for testing but should not be used when creating a production`
	`185`	`+ installation.`
	`186`	`+ </para>`
	`187`	`+ </listitem>`
	`188`	`+ </varlistentry>`
	`189`	`+`
`174`	`190`	`<varlistentry>`
`175`	`191`	`<term><option>-P</option></term>`
`176`	`192`	`<term><option>--progress</option></term>`

`‎src/bin/pg_rewind/RewindTest.pm`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,8 @@ sub run_pg_rewind`
`231`	`231`	`'pg_rewind',`
`232`	`232`	`"--debug",`
`233`	`233`	`"--source-pgdata=$standby_pgdata",`
`234`		`-"--target-pgdata=$master_pgdata"`
	`234`	`+"--target-pgdata=$master_pgdata",`
	`235`	`+"--no-sync"`
`235`	`236`	`],`
`236`	`237`	`'pg_rewind local');`
`237`	`238`	`}`
`@@ -243,7 +244,8 @@ sub run_pg_rewind`
`243`	`244`	`[`
`244`	`245`	`'pg_rewind',"--debug",`
`245`	`246`	`"--source-server",$standby_connstr,`
`246`		`-"--target-pgdata=$master_pgdata"`
	`247`	`+"--target-pgdata=$master_pgdata",`
	`248`	`+"--no-sync"`
`247`	`249`	`],`
`248`	`250`	`'pg_rewind remote');`
`249`	`251`	`}`

`‎src/bin/pg_rewind/pg_rewind.c`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ char *connstr_source = NULL;`
`56`	`56`	`booldebug= false;`
`57`	`57`	`boolshowprogress= false;`
`58`	`58`	`booldry_run= false;`
	`59`	`+booldo_sync= true;`
`59`	`60`
`60`	`61`	`/* Target history */`
`61`	`62`	`TimeLineHistoryEntry*targetHistory;`
`@@ -71,6 +72,8 @@ usage(const char *progname)`
`71`	`72`	`printf(_(" --source-pgdata=DIRECTORY source data directory to synchronize with\n"));`
`72`	`73`	`printf(_(" --source-server=CONNSTR source server to synchronize with\n"));`
`73`	`74`	`printf(_(" -n, --dry-run stop before modifying anything\n"));`
	`75`	`+printf(_(" -N, --no-sync do not wait for changes to be written\n"));`
	`76`	`+printf(_(" safely to disk\n"));`
`74`	`77`	`printf(_(" -P, --progress write progress messages\n"));`
`75`	`78`	`printf(_(" --debug write a lot of debug messages\n"));`
`76`	`79`	`printf(_(" -V, --version output version information, then exit\n"));`
`@@ -89,6 +92,7 @@ main(int argc, char **argv)`
`89`	`92`	`{"source-server",required_argument,NULL,2},`
`90`	`93`	`{"version",no_argument,NULL,'V'},`
`91`	`94`	`{"dry-run",no_argument,NULL,'n'},`
	`95`	`+{"no-sync",no_argument,NULL,'N'},`
`92`	`96`	`{"progress",no_argument,NULL,'P'},`
`93`	`97`	`{"debug",no_argument,NULL,3},`
`94`	`98`	`{NULL,0,NULL,0}`
`@@ -125,7 +129,7 @@ main(int argc, char **argv)`
`125`	`129`	`}`
`126`	`130`	`}`
`127`	`131`
`128`		`-while ((c=getopt_long(argc,argv,"D:nP",long_options,&option_index))!=-1)`
	`132`	`+while ((c=getopt_long(argc,argv,"D:nNP",long_options,&option_index))!=-1)`
`129`	`133`	`{`
`130`	`134`	`switch (c)`
`131`	`135`	`{`
`@@ -141,6 +145,10 @@ main(int argc, char **argv)`
`141`	`145`	`dry_run= true;`
`142`	`146`	`break;`
`143`	`147`
	`148`	`+case'N':`
	`149`	`+do_sync= false;`
	`150`	`+break;`
	`151`	`+`
`144`	`152`	`case3:`
`145`	`153`	`debug= true;`
`146`	`154`	`break;`
`@@ -709,7 +717,7 @@ updateControlFile(ControlFileData *ControlFile)`
`709`	`717`	`staticvoid`
`710`	`718`	`syncTargetDirectory(constchar*argv0)`
`711`	`719`	`{`
`712`		`-if (dry_run)`
	`720`	`+if (!do_sync\|\|dry_run)`
`713`	`721`	`return;`
`714`	`722`
`715`	`723`	`fsync_pgdata(datadir_target,progname,PG_VERSION_NUM);`

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!

Commit8a00b96

File tree

3 files changed

3 files changed

`‎doc/src/sgml/ref/pg_rewind.sgml`

`‎src/bin/pg_rewind/RewindTest.pm`

`‎src/bin/pg_rewind/pg_rewind.c`

0 commit comments