NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit499c9b1

committed

Improve some check logic in pg_receivewal

The following things are improved:- Fetch the system identifier from the source server before anyWAL streaming loop. This triggers extra checks to make sure thatpg_receivewal is still connected to a server with the same system IDwith a correct timeline.- Switch umask() (for file creation mode mask) and RetrieveWalSegSize()(to fetch the size of WAL segments) a bit later before the initialstream attempt. If the connection was done with a database,pg_receivewal would fail but those commands were still executed, whichwas a waste. The slot creation and drop are now done before retrievingthe segment size.Author: Bharath RupireddyReviewed-by: Ronan Dunklau, Michael PaquierDiscussion:https://postgr.es/m/CALj2ACX00YYeyBfoi55Cy=NrP-FcfMgiYYx1qRUEib3yjCVoaA@mail.gmail.com

1 parentd7897ab commit499c9b1Copy full SHA for 499c9b1

File tree

1 file changed

+18

-15

lines changed

src/bin/pg_basebackup
- pg_receivewal.c

1 file changed

+18

-15

lines changed

`‎src/bin/pg_basebackup/pg_receivewal.c`

Lines changed: 18 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -372,6 +372,7 @@ StreamLog(void)`
`372`	`372`	`XLogRecPtrserverpos;`
`373`	`373`	`TimeLineIDservertli;`
`374`	`374`	`StreamCtlstream;`
	`375`	`+char*sysidentifier;`
`375`	`376`
`376`	`377`	`MemSet(&stream,0,sizeof(stream));`
`377`	`378`
`@@ -399,7 +400,7 @@ StreamLog(void)`
`399`	`400`	`* at the same time, necessary if not valid data can be found in the`
`400`	`401`	`* existing output directory.`
`401`	`402`	`*/`
`402`		`-if (!RunIdentifySystem(conn,NULL,&servertli,&serverpos,NULL))`
	`403`	`+if (!RunIdentifySystem(conn,&sysidentifier,&servertli,&serverpos,NULL))`
`403`	`404`	`exit(1);`
`404`	`405`
`405`	`406`	`/*`
`@@ -435,6 +436,7 @@ StreamLog(void)`
`435`	`436`	`stream.do_sync);`
`436`	`437`	`stream.partial_suffix=".partial";`
`437`	`438`	`stream.replication_slot=replication_slot;`
	`439`	`+stream.sysidentifier=sysidentifier;`
`438`	`440`
`439`	`441`	`ReceiveXlogStream(conn,&stream);`
`440`	`442`
`@@ -449,6 +451,7 @@ StreamLog(void)`
`449`	`451`
`450`	`452`	`FreeWalDirectoryMethod();`
`451`	`453`	`pg_free(stream.walmethod);`
	`454`	`+pg_free(stream.sysidentifier);`
`452`	`455`	`}`
`453`	`456`
`454`	`457`	`/*`
`@@ -687,20 +690,6 @@ main(int argc, char **argv)`
`687`	`690`	`if (!RunIdentifySystem(conn,NULL,NULL,NULL,&db_name))`
`688`	`691`	`exit(1);`
`689`	`692`
`690`		`-/*`
`691`		`- * Set umask so that directories/files are created with the same`
`692`		`- * permissions as directories/files in the source data directory.`
`693`		`- *`
`694`		`- * pg_mode_mask is set to owner-only by default and then updated in`
`695`		`- * GetConnection() where we get the mode from the server-side with`
`696`		`- * RetrieveDataDirCreatePerm() and then call SetDataDirectoryCreatePerm().`
`697`		`- */`
`698`		`-umask(pg_mode_mask);`
`699`		`-`
`700`		`-/* determine remote server's xlog segment size */`
`701`		`-if (!RetrieveWalSegSize(conn))`
`702`		`-exit(1);`
`703`		`-`
`704`	`693`	`/*`
`705`	`694`	`* Check that there is a database associated with connection, none should`
`706`	`695`	`* be defined in this context.`
`@@ -712,6 +701,16 @@ main(int argc, char **argv)`
`712`	`701`	`exit(1);`
`713`	`702`	`}`
`714`	`703`
	`704`	`+/*`
	`705`	`+ * Set umask so that directories/files are created with the same`
	`706`	`+ * permissions as directories/files in the source data directory.`
	`707`	`+ *`
	`708`	`+ * pg_mode_mask is set to owner-only by default and then updated in`
	`709`	`+ * GetConnection() where we get the mode from the server-side with`
	`710`	`+ * RetrieveDataDirCreatePerm() and then call SetDataDirectoryCreatePerm().`
	`711`	`+ */`
	`712`	`+umask(pg_mode_mask);`
	`713`	`+`
`715`	`714`	`/*`
`716`	`715`	`* Drop a replication slot.`
`717`	`716`	`*/`
`@@ -737,6 +736,10 @@ main(int argc, char **argv)`
`737`	`736`	`exit(0);`
`738`	`737`	`}`
`739`	`738`
	`739`	`+/* determine remote server's xlog segment size */`
	`740`	`+if (!RetrieveWalSegSize(conn))`
	`741`	`+exit(1);`
	`742`	`+`
`740`	`743`	`/*`
`741`	`744`	`* Don't close the connection here so that subsequent StreamLog() can`
`742`	`745`	`* reuse it.`

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!

Commit499c9b1

File tree

1 file changed

1 file changed

`‎src/bin/pg_basebackup/pg_receivewal.c`

0 commit comments