Commit4c1ae7a

authored

Merge pull request#52 from postgrespro/PGPRO-6599

PGPRO-6599: Avoid race when accessing the request shared variable.

2 parents9dad24b +2d38a79 commit4c1ae7aCopy full SHA for 4c1ae7a

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -441,11 +441,12 @@ collector_main(Datum main_arg)`
`441`	`441`	`if (collector_hdr->request!=NO_REQUEST)`
`442`	`442`	`{`
`443`	`443`	`LOCKTAGtag;`
`444`		`-SHMRequestrequest=collector_hdr->request;`
	`444`	`+SHMRequestrequest;`
`445`	`445`
`446`	`446`	`init_lock_tag(&tag,PGWS_COLLECTOR_LOCK);`
`447`	`447`
`448`	`448`	`LockAcquire(&tag,ExclusiveLock, false, false);`
	`449`	`+request=collector_hdr->request;`
`449`	`450`	`collector_hdr->request=NO_REQUEST;`
`450`	`451`
`451`	`452`	`if (request==HISTORY_REQUEST\|\|request==PROFILE_REQUEST)`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -594,13 +594,11 @@ receive_array(SHMRequest request, Size item_size, Size *count)`
`594`	`594`	`init_lock_tag(&queueTag,PGWS_QUEUE_LOCK);`
`595`	`595`	`LockAcquire(&queueTag,ExclusiveLock, false, false);`
`596`	`596`
`597`		`-/* Ensure collector has processed previous request */`
`598`	`597`	`init_lock_tag(&collectorTag,PGWS_COLLECTOR_LOCK);`
`599`	`598`	`LockAcquire(&collectorTag,ExclusiveLock, false, false);`
`600`		`-LockRelease(&collectorTag,ExclusiveLock, false);`
`601`		`-`
`602`	`599`	`recv_mq=shm_mq_create(collector_mq,COLLECTOR_QUEUE_SIZE);`
`603`	`600`	`collector_hdr->request=request;`
	`601`	`+LockRelease(&collectorTag,ExclusiveLock, false);`
`604`	`602`
`605`	`603`	`if (!collector_hdr->latch)`
`606`	`604`	`ereport(ERROR, (errcode(ERRCODE_INTERNAL_ERROR),`
`@@ -770,9 +768,9 @@ pg_wait_sampling_reset_profile(PG_FUNCTION_ARGS)`
`770`	`768`
`771`	`769`	`init_lock_tag(&tagCollector,PGWS_COLLECTOR_LOCK);`
`772`	`770`	`LockAcquire(&tagCollector,ExclusiveLock, false, false);`
	`771`	`+collector_hdr->request=PROFILE_RESET;`
`773`	`772`	`LockRelease(&tagCollector,ExclusiveLock, false);`
`774`	`773`
`775`		`-collector_hdr->request=PROFILE_RESET;`
`776`	`774`	`SetLatch(collector_hdr->latch);`
`777`	`775`
`778`	`776`	`LockRelease(&tag,ExclusiveLock, false);`

Comments

(0)