Commit82af8f3

committed

[Issue#346] detect failure of streaming thread

1 parentfd73b9c commit82af8f3Copy full SHA for 82af8f3

File tree

+11

-4

lines changed

+11

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1405,7 +1405,7 @@ wait_wal_lsn(XLogRecPtr target_lsn, bool is_start_lsn, TimeLineID tli,`
`1405`	`1405`	`}`
`1406`	`1406`
`1407`	`1407`	`sleep(1);`
`1408`		`-if (interrupted)`
	`1408`	`+if (interrupted\|\|thread_interrupted)`
`1409`	`1409`	`elog(ERROR,"Interrupted during waiting for WAL %s",in_stream_dir ?"streaming" :"archiving");`
`1410`	`1410`	`try_count++;`
`1411`	`1411`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1851,7 +1851,7 @@ get_checksum_map(const char *fullpath, uint32 checksum_version,`
`1851`	`1851`	`if (feof(in))`
`1852`	`1852`	`break;`
`1853`	`1853`
`1854`		`-if (interrupted)`
	`1854`	`+if (interrupted\|\|thread_interrupted)`
`1855`	`1855`	`elog(ERROR,"Interrupted during page reading");`
`1856`	`1856`	`}`
`1857`	`1857`
`@@ -1914,7 +1914,7 @@ get_lsn_map(const char *fullpath, uint32 checksum_version,`
`1914`	`1914`	`if (feof(in))`
`1915`	`1915`	`break;`
`1916`	`1916`
`1917`		`-if (interrupted)`
	`1917`	`+if (interrupted\|\|thread_interrupted)`
`1918`	`1918`	`elog(ERROR,"Interrupted during page reading");`
`1919`	`1919`	`}`
`1920`	`1920`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -781,6 +781,8 @@ dir_check_file(pgFile *file, bool backup_logs)`
`781`	`781`	`* List files in parent->path directory. If "exclude" is true do not add into`
`782`	`782`	`* "files" files from pgdata_exclude_files and directories from`
`783`	`783`	`* pgdata_exclude_dir.`
	`784`	`+ *`
	`785`	`+ * TODO: should we check for interrupt here ?`
`784`	`786`	`*/`
`785`	`787`	`staticvoid`
`786`	`788`	`dir_list_file_internal(parrayfiles,pgFileparent,constchar*parent_dir,`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,10 @@ StreamLog(void *arg)`
`233`	`233`	`ctl.mark_done= false;`
`234`	`234`
`235`	`235`	`if(ReceiveXlogStream(stream_arg->conn,&ctl)== false)`
	`236`	`+{`
	`237`	`+interrupted= true;`
`236`	`238`	`elog(ERROR,"Problem in receivexlog");`
	`239`	`+}`
`237`	`240`
`238`	`241`	`#ifPG_VERSION_NUM >=100000`
`239`	`242`	`if (!ctl.walmethod->finish())`
`@@ -245,7 +248,10 @@ StreamLog(void *arg)`
`245`	`248`	`if(ReceiveXlogStream(stream_arg->conn,stream_arg->startpos,stream_arg->starttli,`
`246`	`249`	`NULL, (char*)stream_arg->basedir,stop_streaming,`
`247`	`250`	`standby_message_timeout,NULL, false, false)== false)`
	`251`	`+{`
	`252`	`+interrupted= true;`
`248`	`253`	`elog(ERROR,"Problem in receivexlog");`
	`254`	`+}`
`249`	`255`	`#endif`
`250`	`256`
`251`	`257`	`/* be paranoid and sort xlog_files_list,`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,6 @@ exit_if_necessary(int elevel)`
`169`	`169`	`{`
`170`	`170`	`/* Interrupt other possible routines */`
`171`	`171`	`thread_interrupted= true;`
`172`		`-interrupted= true;`
`173`	`172`	`#ifdefWIN32`
`174`	`173`	`ExitThread(elevel);`
`175`	`174`	`#else`

Comments

(0)