Debug

timescale · Jan 26, 2023 · 7f4a128 · 7f4a128
1 parent 8db10e4
commit 7f4a128
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/tsl/src/nodes/data_node_dispatch.c b/tsl/src/nodes/data_node_dispatch.c
@@ -641,16 +641,26 @@ await_all_responses(DataNodeDispatchState *sds, AsyncRequestSet *reqset)
 {
 	AsyncResponseResult *rsp;
 	List *results = NIL;
-
+	unsigned num_responses = 0;
+
 	sds->next_tuple = 0;
 
+	elog(LOG, "awaiting all responses from data nodes");
+
 	while ((rsp = async_request_set_wait_any_result(reqset)))
 	{
 		DataNodeState *ss = async_response_result_get_user_data(rsp);
 		PGresult *res = async_response_result_get_pg_result(rsp);
 		ExecStatusType status = PQresultStatus(res);
 		bool report_error = true;
 
+		if (num_responses == 0)
+		{
+			elog(LOG, "got first response from %s", remote_connection_node_name(ss->conn));		   
+		}
+
+		num_responses++;
+
 		switch (status)
 		{
 			case PGRES_TUPLES_OK:
@@ -685,6 +695,9 @@ await_all_responses(DataNodeDispatchState *sds, AsyncRequestSet *reqset)
 		ss->next_tuple = 0;
 	}
 
+
+	elog(LOG, "got %u responses from data nodes", num_responses);
+
 	return results;
 }
 

diff --git a/tsl/src/remote/async.c b/tsl/src/remote/async.c
@@ -729,11 +729,12 @@ wait_to_consume_data(AsyncRequestSet *set, TimestampTz end_time)
 		timeout_ms = secs * 1000 + (microsecs / 1000);
 	}
 
-	we_set = CreateWaitEventSet(CurrentMemoryContext, list_length(set->requests) + 1);
+	we_set = CreateWaitEventSet(CurrentMemoryContext, list_length(set->requests) + 2);
 
 	/* always wait for my latch */
 	AddWaitEventToSet(we_set, WL_LATCH_SET, PGINVALID_SOCKET, (Latch *) MyLatch, NULL);
-
+	AddWaitEventToSet(we_set, WL_EXIT_ON_PM_DEATH, PGINVALID_SOCKET, NULL, NULL);
+
 	foreach (lc, set->requests)
 	{
 		AsyncRequest *req = lfirst(lc);
@@ -748,6 +749,9 @@ wait_to_consume_data(AsyncRequestSet *set, TimestampTz end_time)
 	while (true)
 	{
 		wait_req = NULL;
+
+		CHECK_FOR_INTERRUPTS();
+
 		rc = WaitEventSetWait(we_set, timeout_ms, &event, 1, PG_WAIT_EXTENSION);
 
 		if (rc == 0)
@@ -771,7 +775,6 @@ wait_to_consume_data(AsyncRequestSet *set, TimestampTz end_time)
 		if (event.events & WL_LATCH_SET)
 		{
 			ResetLatch(MyLatch);
-			CHECK_FOR_INTERRUPTS();
 		}
 
 		if (event.events & WL_SOCKET_READABLE)