NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commite7873b7

committed

Open output file before sleeping in pg_recvlogical.

Let's complain about e.g an invalid path or permission problem sooner ratherthan later. Before this patch, we would only try to open the output fileafter receiving the first decoded message from the server.

1 parent07a4a93 commite7873b7Copy full SHA for e7873b7

File tree

1 file changed

+17

-17

lines changed

src/bin/pg_basebackup
- pg_recvlogical.c

1 file changed

+17

-17

lines changed

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

Lines changed: 17 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -315,6 +315,23 @@ StreamLog(void)`
`315`	`315`	`}`
`316`	`316`	`output_reopen= false;`
`317`	`317`
	`318`	`+/* open the output file, if not open yet */`
	`319`	`+if (outfd==-1)`
	`320`	`+{`
	`321`	`+if (strcmp(outfile,"-")==0)`
	`322`	`+outfd=fileno(stdout);`
	`323`	`+else`
	`324`	`+outfd=open(outfile,O_CREAT \|O_APPEND \|O_WRONLY \|PG_BINARY,`
	`325`	`+S_IRUSR \|S_IWUSR);`
	`326`	`+if (outfd==-1)`
	`327`	`+{`
	`328`	`+fprintf(stderr,`
	`329`	`+_("%s: could not open log file \"%s\": %s\n"),`
	`330`	`+progname,outfile,strerror(errno));`
	`331`	`+gotoerror;`
	`332`	`+}`
	`333`	`+}`
	`334`	`+`
`318`	`335`	`r=PQgetCopyData(conn,&copybuf,1);`
`319`	`336`	`if (r==0)`
`320`	`337`	`{`
`@@ -479,23 +496,6 @@ StreamLog(void)`
`479`	`496`	`output_written_lsn=Max(temp,output_written_lsn);`
`480`	`497`	`}`
`481`	`498`
`482`		`-/* open the output file, if not open yet */`
`483`		`-if (outfd==-1)`
`484`		`-{`
`485`		`-if (strcmp(outfile,"-")==0)`
`486`		`-outfd=fileno(stdout);`
`487`		`-else`
`488`		`-outfd=open(outfile,O_CREAT \|O_APPEND \|O_WRONLY \|PG_BINARY,`
`489`		`-S_IRUSR \|S_IWUSR);`
`490`		`-if (outfd==-1)`
`491`		`-{`
`492`		`-fprintf(stderr,`
`493`		`-_("%s: could not open log file \"%s\": %s\n"),`
`494`		`-progname,outfile,strerror(errno));`
`495`		`-gotoerror;`
`496`		`-}`
`497`		`-}`
`498`		`-`
`499`	`499`	`bytes_left=r-hdr_len;`
`500`	`500`	`bytes_written=0;`
`501`	`501`

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!

Commite7873b7

File tree

1 file changed

1 file changed

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

0 commit comments