You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by ta...@apache.org on 2016/10/25 20:16:07 UTC
[20/33] incubator-impala git commit: IMPALA-4241: remove spurious
child queries event
IMPALA-4241: remove spurious child queries event
"IMPALA-4037,IMPALA-4038: fix locking during query
cancellation" accidentally added the "Child queries
finished" event unconditionally. We should only do
this if there are actually child queries.
Change-Id: I3881d032622750444d750f161ad6843bdbd16c30
Reviewed-on: http://gerrit.cloudera.org:8080/4768
Reviewed-by: Tim Armstrong <ta...@cloudera.com>
Tested-by: Internal Jenkins
Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/d1d88aac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/d1d88aac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/d1d88aac
Branch: refs/heads/hadoop-next
Commit: d1d88aaccd03c461c4ce6224f765afe94b7c073b
Parents: 8d7b01f
Author: Tim Armstrong <ta...@cloudera.com>
Authored: Thu Oct 20 08:33:07 2016 -0700
Committer: Internal Jenkins <cl...@gerrit.cloudera.org>
Committed: Sat Oct 22 01:27:39 2016 +0000
----------------------------------------------------------------------
be/src/service/query-exec-state.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d1d88aac/be/src/service/query-exec-state.cc
----------------------------------------------------------------------
diff --git a/be/src/service/query-exec-state.cc b/be/src/service/query-exec-state.cc
index 7ec8c27..69473c5 100644
--- a/be/src/service/query-exec-state.cc
+++ b/be/src/service/query-exec-state.cc
@@ -620,7 +620,7 @@ Status ImpalaServer::QueryExecState::WaitInternal() {
RETURN_IF_ERROR(query_status_);
RETURN_IF_ERROR(UpdateQueryStatus(child_queries_status));
}
- query_events_->MarkEvent("Child queries finished");
+ if (!child_queries.empty()) query_events_->MarkEvent("Child queries finished");
if (coord_.get() != NULL) {
RETURN_IF_ERROR(coord_->Wait());