NotificationsYou must be signed in to change notification settings
Fork27
Star157

Commit1cb4967

authored

Merge pull request#10 from CherkashinSergey/fix_segfault

Fix bug related with queries to dead backends

2 parentsb7d5f98 +91e3196 commit1cb4967Copy full SHA for 1cb4967

File tree

1 file changed

+17

-5

lines changed

pg_query_state.c

1 file changed

+17

-5

lines changed

`‎pg_query_state.c‎`

Lines changed: 17 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -618,6 +618,11 @@ pg_query_state(PG_FUNCTION_ARGS)`
`618`	`618`	`shm_mq_msgmsg= (shm_mq_msg)lfirst(i);`
`619`	`619`	`proc_statep_state= (proc_state)palloc(sizeof(proc_state));`
`620`	`620`
	`621`	`+if (msg->result_code!=QS_RETURNED)`
	`622`	`+continue;`
	`623`	`+`
	`624`	`+AssertState(msg->result_code==QS_RETURNED);`
	`625`	`+`
`621`	`626`	`qs_stack=deserialize_stack(msg->stack,msg->stack_depth);`
`622`	`627`
`623`	`628`	`p_state->proc=msg->proc;`
`@@ -856,7 +861,12 @@ SendBgWorkerPids(void)`
`856`	`861`	`msg->number=list_length(all_workers);`
`857`	`862`	`i=0;`
`858`	`863`	`foreach(iter,all_workers)`
`859`		`-msg->pids[i++]=lfirst_int(iter);`
	`864`	`+{`
	`865`	`+pid_tcurrent_pid=lfirst_int(iter);`
	`866`	`+`
	`867`	`+AssertState(current_pid>0);`
	`868`	`+msg->pids[i++]=current_pid;`
	`869`	`+}`
`860`	`870`
`861`	`871`	`shm_mq_send(mqh,msg_len,msg, false);`
`862`	`872`	`}`
`@@ -894,9 +904,10 @@ GetRemoteBackendWorkers(PGPROC *proc)`
`894`	`904`
`895`	`905`	`for (i=0;i<msg->number;i++)`
`896`	`906`	`{`
`897`		`-pid_tpid=msg->pids[i];`
`898`		`-PGPROC*proc=BackendPidGetProc(pid);`
`899`		`-`
	`907`	`+pid_tpid=msg->pids[i];`
	`908`	`+PGPROC*proc=BackendPidGetProc(pid);`
	`909`	`+if (!proc\|\| !proc->pid)`
	`910`	`+continue;`
`900`	`911`	`result=lcons(proc,result);`
`901`	`912`	`}`
`902`	`913`
`@@ -971,7 +982,8 @@ GetRemoteBackendQueryStates(PGPROC *leader,`
`971`	`982`	`foreach(iter,pworkers)`
`972`	`983`	`{`
`973`	`984`	`PGPROCproc= (PGPROC)lfirst(iter);`
`974`		`-`
	`985`	`+if (!proc\|\| !proc->pid)`
	`986`	`+continue;`
`975`	`987`	`sig_result=SendProcSignal(proc->pid,`
`976`	`988`	`QueryStatePollReason,`
`977`	`989`	`proc->backendId);`

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!

Commit1cb4967

File tree

1 file changed

1 file changed

`‎pg_query_state.c‎`

0 commit comments