Commit278c942

committed

pg_basebackup: Skip only the *contents* of pg_replslot.

Include the directory itself.Fujii Masao

1 parent32001ab commit278c942Copy full SHA for 278c942

File tree

+12

-4

lines changed

+12

-4

lines changed

Lines changed: 12 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -862,10 +862,6 @@ sendDir(char path, int basepathlen, bool sizeonly, List tablespaces)`
`862`	`862`	`if (strcmp(de->d_name,BACKUP_LABEL_FILE)==0)`
`863`	`863`	`continue;`
`864`	`864`
`865`		`-/* Skip pg_replslot, not useful to copy */`
`866`		`-if (strcmp(de->d_name,"pg_replslot")==0)`
`867`		`-continue;`
`868`		`-`
`869`	`865`	`/*`
`870`	`866`	`* Check if the postmaster has signaled us to exit, and abort with an`
`871`	`867`	`* error in that case. The error handler further up will call`
`@@ -920,6 +916,18 @@ sendDir(char path, int basepathlen, bool sizeonly, List tablespaces)`
`920`	`916`	`continue;`
`921`	`917`	`}`
`922`	`918`
	`919`	`+/*`
	`920`	`+ * Skip pg_replslot, not useful to copy. But include it as an empty`
	`921`	`+ * directory anyway, so we get permissions right.`
	`922`	`+ */`
	`923`	`+if (strcmp(de->d_name,"pg_replslot")==0)`
	`924`	`+{`
	`925`	`+if (!sizeonly)`
	`926`	`+_tarWriteHeader(pathbuf+basepathlen+1,NULL,&statbuf);`
	`927`	`+size+=512;/* Size of the header just added */`
	`928`	`+continue;`
	`929`	`+}`
	`930`	`+`
`923`	`931`	`/*`
`924`	`932`	`* We can skip pg_xlog, the WAL segments need to be fetched from the`
`925`	`933`	`* WAL archive anyway. But include it as an empty directory anyway, so`

Comments

(0)