Add detach after unsuccessful receives and checks on their after sends

maksm90 · akorotkov · commit 2daa422902a8 · 2019-05-09T07:10:00.000+03:00
diff --git a/collector.c b/collector.c
@@ -210,15 +210,25 @@ send_history(History *observations, shm_mq_handle *mqh)
 {
 	Size	count,
 			i;
+	shm_mq_result	mq_result;
 
 	if (observations->wraparound)
 		count = observations->count;
 	else
 		count = observations->index;
 
-	shm_mq_send(mqh, sizeof(count), &count, false);
+	mq_result = shm_mq_send(mqh, sizeof(count), &count, false);
+	if (mq_result == SHM_MQ_DETACHED)
+		return;
 	for (i = 0; i < count; i++)
-		shm_mq_send(mqh, sizeof(HistoryItem), &observations->items[i], false);
+	{
+		mq_result = shm_mq_send(mqh,
+								sizeof(HistoryItem),
+								&observations->items[i],
+								false);
+		if (mq_result == SHM_MQ_DETACHED)
+			return;
+	}
 }
 
 /*
diff --git a/pg_wait_sampling.c b/pg_wait_sampling.c
@@ -540,7 +540,14 @@ receive_array(SHMRequest request, Size item_size, Size *count)
 	{
 		res = shm_mq_receive(mqh, &len, &data, false);
 		if (res != SHM_MQ_SUCCESS || len != item_size)
+		{
+#if PG_VERSION_NUM >= 100000
+			shm_mq_detach(mqh);
+#else
+			shm_mq_detach(mq);
+#endif
 			elog(ERROR, "Error reading mq.");
+		}
 		memcpy(ptr, data, item_size);
 		ptr += item_size;
 	}
