You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2019/12/30 15:03:35 UTC
[ignite] branch master updated: IGNITE-12512: SQL: Compact logs for
cancelled queries. This closes #7215.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 4d6fc4c IGNITE-12512: SQL: Compact logs for cancelled queries. This closes #7215.
4d6fc4c is described below
commit 4d6fc4c9dcb6b281c24ae18c1ea9590a5f6c5919
Author: amashenkov <an...@gmail.com>
AuthorDate: Mon Dec 30 18:03:23 2019 +0300
IGNITE-12512: SQL: Compact logs for cancelled queries. This closes #7215.
---
.../processors/query/h2/twostep/GridMapQueryExecutor.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
index 7d38dff..dd2216b 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
@@ -668,7 +668,17 @@ public class GridMapQueryExecutor {
GridQueryFailResponse msg = new GridQueryFailResponse(qryReqId, err);
if (node.isLocal()) {
- U.error(log, "Failed to run map query on local node.", err);
+ if (err instanceof QueryCancelledException) {
+ String errMsg = "Failed to run cancelled map query on local node: [localNodeId="
+ + node.id() + ", reqId=" + qryReqId + ']';
+
+ if (log.isDebugEnabled())
+ U.warn(log, errMsg, err);
+ else
+ log.info(errMsg);
+ }
+ else
+ U.error(log, "Failed to run map query on local node.", err);
h2.reduceQueryExecutor().onFail(node, msg);
}