hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject incubator-hawq git commit: HAWQ-160. Fixed "dispatcher encounter error" when cancel query
Date Sat, 14 Nov 2015 04:33:36 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 9d16f280c -> cfeba473a


HAWQ-160. Fixed "dispatcher encounter error" when cancel query


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/cfeba473
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/cfeba473
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/cfeba473

Branch: refs/heads/master
Commit: cfeba473a77c2fd305cfe96fbc0e70b6d5bb48d6
Parents: 9d16f28
Author: Ming LI <mli@pivotal.io>
Authored: Fri Nov 13 21:43:35 2015 +0800
Committer: Ming LI <mli@pivotal.io>
Committed: Sat Nov 14 12:35:21 2015 +0800

----------------------------------------------------------------------
 src/backend/cdb/dispatcher.c     | 1 +
 src/backend/cdb/dispatcher_mgt.c | 1 +
 src/backend/cdb/workermgr.c      | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/cfeba473/src/backend/cdb/dispatcher.c
----------------------------------------------------------------------
diff --git a/src/backend/cdb/dispatcher.c b/src/backend/cdb/dispatcher.c
index dedd0a8..36bc584 100644
--- a/src/backend/cdb/dispatcher.c
+++ b/src/backend/cdb/dispatcher.c
@@ -1250,6 +1250,7 @@ dispatch_wait(DispatchData *data)
 		return;
 
 	workermgr_wait_job(data->worker_mgr_state);
+	CHECK_FOR_INTERRUPTS();
 
 	/* Check executors state before return. */
 	if (dispatch_collect_executors_error(data))

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/cfeba473/src/backend/cdb/dispatcher_mgt.c
----------------------------------------------------------------------
diff --git a/src/backend/cdb/dispatcher_mgt.c b/src/backend/cdb/dispatcher_mgt.c
index 173ea35..69d6b0a 100644
--- a/src/backend/cdb/dispatcher_mgt.c
+++ b/src/backend/cdb/dispatcher_mgt.c
@@ -570,6 +570,7 @@ dispmgt_concurrent_connect(List	*executors, int executors_num_per_thread)
 	if (has_error)
 		return false;
 
+	CHECK_FOR_INTERRUPTS();
 	dispmgt_free_concurrent_connect_state(tasks);
 	workermgr_free_workermgr_state(state);
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/cfeba473/src/backend/cdb/workermgr.c
----------------------------------------------------------------------
diff --git a/src/backend/cdb/workermgr.c b/src/backend/cdb/workermgr.c
index 137d08f..eaf3060 100644
--- a/src/backend/cdb/workermgr.c
+++ b/src/backend/cdb/workermgr.c
@@ -153,7 +153,6 @@ workermgr_wait_job(WorkerMgrState *state)
 {
 	state->cancel = false;
 	workermgr_join(state);
-	CHECK_FOR_INTERRUPTS();
 }
 
 static void


Mime
View raw message