NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitb2e431a

committed

Implement dry-run mode for pg_archivecleanup

In dry-run mode, just the name of the file to be removed is printed tostdout; this is so the user can easily plug it into another programthrough a pipe. If debug mode is also specified, a more verbose messageis printed to stderr.Author: Gabriele BartoliniReviewer: Josh Kupershmidt

1 parent21238de commitb2e431aCopy full SHA for b2e431a

File tree

2 files changed

+31

-1

lines changed

contrib/pg_archivecleanup
- pg_archivecleanup.c
doc/src/sgml
- pgarchivecleanup.sgml

2 files changed

+31

-1

lines changed

`‎contrib/pg_archivecleanup/pg_archivecleanup.c`

Lines changed: 22 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ const char *progname;`
`36`	`36`
`37`	`37`	`/* Options and defaults */`
`38`	`38`	`booldebug= false;/* are we debugging? */`
	`39`	`+booldryrun= false;/* are we performing a dry-run operation? */`
`39`	`40`
`40`	`41`	`chararchiveLocation;/ where to find the archive? */`
`41`	`42`	`charrestartWALFileName;/ the file from which we can restart restore */`
`@@ -119,6 +120,22 @@ CleanupPriorWALFiles(void)`
`119`	`120`	`{`
`120`	`121`	`snprintf(WALFilePath,MAXPGPATH,"%s/%s",`
`121`	`122`	`archiveLocation,xlde->d_name);`
	`123`	`+`
	`124`	`+if (dryrun)`
	`125`	`+{`
	`126`	`+/*`
	`127`	`+ * Prints the name of the file to be removed and skips the`
	`128`	`+ * actual removal. The regular printout is so that the`
	`129`	`+ * user can pipe the output into some other program.`
	`130`	`+ */`
	`131`	`+printf("%s\n",WALFilePath);`
	`132`	`+if (debug)`
	`133`	`+fprintf(stderr,`
	`134`	`+"%s: file \"%s\" would be removed\n",`
	`135`	`+progname,WALFilePath);`
	`136`	`+continue;`
	`137`	`+}`
	`138`	`+`
`122`	`139`	`if (debug)`
`123`	`140`	`fprintf(stderr,"%s: removing file \"%s\"\n",`
`124`	`141`	`progname,WALFilePath);`
`@@ -205,6 +222,7 @@ usage(void)`
`205`	`222`	`printf(" %s [OPTION]... ARCHIVELOCATION OLDESTKEPTWALFILE\n",progname);`
`206`	`223`	`printf("\nOptions:\n");`
`207`	`224`	`printf(" -d generates debug output (verbose mode)\n");`
	`225`	`+printf(" -n shows the names of the files that would have been removed (dry-run)\n");`
`208`	`226`	`printf(" --help show this help, then exit\n");`
`209`	`227`	`printf(" --version output version information, then exit\n");`
`210`	`228`	`printf("\n"`
`@@ -241,13 +259,16 @@ main(int argc, char **argv)`
`241`	`259`	`}`
`242`	`260`	`}`
`243`	`261`
`244`		`-while ((c=getopt(argc,argv,"d"))!=-1)`
	`262`	`+while ((c=getopt(argc,argv,"dn"))!=-1)`
`245`	`263`	`{`
`246`	`264`	`switch (c)`
`247`	`265`	`{`
`248`	`266`	`case'd':/* Debug mode */`
`249`	`267`	`debug= true;`
`250`	`268`	`break;`
	`269`	`+case'n':/* Dry-Run mode */`
	`270`	`+dryrun= true;`
	`271`	`+break;`
`251`	`272`	`default:`
`252`	`273`	`fprintf(stderr,"Try \"%s --help\" for more information.\n",progname);`
`253`	`274`	`exit(2);`

`‎doc/src/sgml/pgarchivecleanup.sgml`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,15 @@ pg_archivecleanup: removing file "archive/00000001000000370000000E"`
`98`	`98`	`</listitem>`
`99`	`99`	`</varlistentry>`
`100`	`100`
	`101`	`+ <varlistentry>`
	`102`	`+ <term><option>-n</option></term>`
	`103`	`+ <listitem>`
	`104`	`+ <para>`
	`105`	`+ Print the names of the files that would have been removed on <filename>stdout</> (performs a dry run).`
	`106`	`+ </para>`
	`107`	`+ </listitem>`
	`108`	`+ </varlistentry>`
	`109`	`+`
`101`	`110`	`</variablelist>`
`102`	`111`	`</para>`
`103`	`112`

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!

Commitb2e431a

File tree

2 files changed

2 files changed

`‎contrib/pg_archivecleanup/pg_archivecleanup.c`

`‎doc/src/sgml/pgarchivecleanup.sgml`

0 commit comments