Commit6037abc

committed

Check archive_command with archive_mode. Do not set dbname for stream connection.

1 parent9b78401 commit6037abcCopy full SHA for 6037abc

File tree

+15

-4

lines changed

+15

-4

lines changed

Lines changed: 15 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -631,8 +631,6 @@ pg_start_backup(const char label, bool smooth, pgBackup backup)`
`631`	`631`	`2,`
`632`	`632`	`params);`
`633`	`633`
`634`		`-backup_in_progress= true;`
`635`		`-`
`636`	`634`	`/* Extract timeline and LSN from results of pg_start_backup() */`
`637`	`635`	`XLogDataFromLSN(PQgetvalue(res,0,0),&xlogid,&xrecoff);`
`638`	`636`	`/* Calculate LSN */`
`@@ -665,6 +663,12 @@ pg_start_backup(const char label, bool smooth, pgBackup backup)`
`665`	`663`	`/* Wait for start_lsn to be replayed by replica */`
`666`	`664`	`if (from_replica)`
`667`	`665`	`wait_replica_wal_lsn(backup->start_lsn, true);`
	`666`	`+`
	`667`	`+/*`
	`668`	`+ * Set flag that pg_start_backup() was called. If an error will happen it`
	`669`	`+ * is necessary to call pg_stop_backup() in backup_cleanup().`
	`670`	`+ */`
	`671`	`+backup_in_progress= true;`
`668`	`672`	`}`
`669`	`673`
`670`	`674`	`/*`
`@@ -760,6 +764,15 @@ pg_archive_enabled(void)`
`760`	`764`	`return false;`
`761`	`765`	`}`
`762`	`766`	`PQclear(res_db);`
	`767`	`+`
	`768`	`+res_db=pgut_execute(backup_conn,"show archive_command",0,NULL);`
	`769`	`+if (strlen(PQgetvalue(res_db,0,0))==0)`
	`770`	`+{`
	`771`	`+PQclear(res_db);`
	`772`	`+return false;`
	`773`	`+}`
	`774`	`+PQclear(res_db);`
	`775`	`+`
`763`	`776`	`return true;`
`764`	`777`	`}`
`765`	`778`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -327,8 +327,6 @@ main(int argc, char *argv[])`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`/* Setup stream options. They are used in streamutil.c. */`
`330`		`-if (pgut_dbname!=NULL)`
`331`		`-dbname=pstrdup(pgut_dbname);`
`332`	`330`	`if (host!=NULL)`
`333`	`331`	`dbhost=pstrdup(host);`
`334`	`332`	`if (port!=NULL)`

Comments

(0)