shm_mq: Repair breakage from previous commit.

robertmhaas · robertmhaas · commit 5eca6cf99411 · 2015-10-22T22:04:05.000-04:00
If the counterparty writes some data into the queue and then detaches,
it's wrong to return SHM_MQ_DETACHED right away.  If we do that, we
fail to read whatever was written.
diff --git a/src/backend/storage/ipc/shm_mq.c b/src/backend/storage/ipc/shm_mq.c
@@ -405,10 +405,12 @@ shm_mq_receive(shm_mq_handle *mqh, Size *nbytesp, void **datap, bool nowait)
 	{
 		if (nowait)
 		{
-			if (shm_mq_counterparty_gone(mq, mqh->mqh_handle))
-				return SHM_MQ_DETACHED;
 			if (shm_mq_get_sender(mq) == NULL)
+			{
+				if (shm_mq_counterparty_gone(mq, mqh->mqh_handle))
+					return SHM_MQ_DETACHED;
 				return SHM_MQ_WOULD_BLOCK;
+			}
 		}
 		else if (!shm_mq_wait_internal(mq, &mq->mq_sender, mqh->mqh_handle)
 				 && shm_mq_get_sender(mq) == NULL)

Original file line number	Diff line number	Diff line change
`@@ -405,10 +405,12 @@ shm_mq_receive(shm_mq_handle mqh, Size nbytesp, void **datap, bool nowait)`
`405`	`405`	`{`
`406`	`406`	`if (nowait)`
`407`	`407`	`{`
`408`		`- if (shm_mq_counterparty_gone(mq, mqh->mqh_handle))`
`409`		`- return SHM_MQ_DETACHED;`
`410`	`408`	`if (shm_mq_get_sender(mq) == NULL)`
	`409`	`+ {`
	`410`	`+ if (shm_mq_counterparty_gone(mq, mqh->mqh_handle))`
	`411`	`+ return SHM_MQ_DETACHED;`
`411`	`412`	`return SHM_MQ_WOULD_BLOCK;`
	`413`	`+ }`
`412`	`414`	`}`
`413`	`415`	`else if (!shm_mq_wait_internal(mq, &mq->mq_sender, mqh->mqh_handle)`
`414`	`416`	`&& shm_mq_get_sender(mq) == NULL)`