[fix](cancel) Fix cancel msg on branch-2.1 #41798

zhiqiang-hhhh · 2024-10-14T08:12:43Z

Make sure we can tell cancel reason from:

user cancel
timeout
others

mysql [demo]>set query_timeout=1;
--------------
set query_timeout=1
--------------

Query OK, 0 rows affected (0.00 sec)

mysql [demo]>select sleep(5);
--------------
select sleep(5)
--------------

ERROR 1105 (HY000): errCode = 2, detailMessage = Timeout

mysql [demo]>select sleep(5);
--------------
select sleep(5)
--------------

^C^C -- sending "KILL QUERY 0" to server ...
^C -- query aborted
ERROR 1105 (HY000): errCode = 2, detailMessage = cancel query by user from 127.0.0.1:64208

doris-robot · 2024-10-14T08:12:48Z

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR

Since 2024-03-18, the Document has been moved to doris-website.
See Doris Document.

zhiqiang-hhhh · 2024-10-14T08:12:53Z

run buildall

github-actions · 2024-10-14T08:19:22Z

clang-tidy review says "All clean, LGTM! 👍"

doris-robot · 2024-10-14T08:46:10Z

TeamCity be ut coverage result:
Function Coverage: 36.03% (9339/25922)
Line Coverage: 27.62% (76734/277853)
Region Coverage: 26.42% (39406/149169)
Branch Coverage: 23.21% (20051/86398)
Coverage Report: http://coverage.selectdb-in.cc/coverage/c210be4dba2a02a20f203a98f20fa674769268d6_c210be4dba2a02a20f203a98f20fa674769268d6/report/index.html

zhiqiang-hhhh · 2024-10-14T15:36:07Z

run buildall

github-actions · 2024-10-14T15:43:18Z

clang-tidy review says "All clean, LGTM! 👍"

doris-robot · 2024-10-14T16:10:13Z

TeamCity be ut coverage result:
Function Coverage: 36.03% (9340/25922)
Line Coverage: 27.61% (76703/277856)
Region Coverage: 26.42% (39404/149169)
Branch Coverage: 23.21% (20055/86398)
Coverage Report: http://coverage.selectdb-in.cc/coverage/61201fa0a38c5e0320d9d331d7cbc45e03ccd782_61201fa0a38c5e0320d9d331d7cbc45e03ccd782/report/index.html

zhiqiang-hhhh · 2024-10-15T02:04:01Z

run buildall

github-actions · 2024-10-15T02:08:29Z

clang-tidy review says "All clean, LGTM! 👍"

zhiqiang-hhhh · 2024-10-15T02:10:04Z

run buildall

github-actions · 2024-10-15T02:10:55Z

clang-tidy review says "All clean, LGTM! 👍"

github-actions · 2024-10-15T02:15:17Z

clang-tidy review says "All clean, LGTM! 👍"

github-actions · 2024-10-15T02:39:31Z

clang-tidy review says "All clean, LGTM! 👍"

github-actions · 2024-10-15T04:10:58Z

clang-tidy review says "All clean, LGTM! 👍"

yiguolei · 2024-10-15T06:25:03Z

run buildall

github-actions · 2024-10-15T06:25:28Z

PR approved by at least one committer and no changes requested.

github-actions · 2024-10-15T06:25:30Z

PR approved by anyone and no changes requested.

yiguolei · 2024-10-15T06:25:34Z

run buildall

github-actions · 2024-10-15T06:27:13Z

clang-tidy review says "All clean, LGTM! 👍"

zhiqiang-hhhh · 2024-10-15T06:34:18Z

run buildall

github-actions · 2024-10-15T06:40:01Z

clang-tidy review says "All clean, LGTM! 👍"

doris-robot · 2024-10-15T07:05:32Z

TeamCity be ut coverage result:
Function Coverage: 36.03% (9342/25927)
Line Coverage: 27.62% (76767/277960)
Region Coverage: 26.41% (39421/149248)
Branch Coverage: 23.20% (20057/86456)
Coverage Report: http://coverage.selectdb-in.cc/coverage/d898a1b110973c94d19201529343ff4fd7b8fa2b_d898a1b110973c94d19201529343ff4fd7b8fa2b/report/index.html

pick fix #41798 on master.

pick fix apache#41798 on master.

### What problem does this PR solve? Related PR: #41798 Problem Summary: #41798 does not set cancel reason if query is timeout on fe.

Make sure we can tell cancel reason from: 1. user cancel 2. timeout 3. others ```text mysql [demo]>set query_timeout=1; -------------- set query_timeout=1 -------------- Query OK, 0 rows affected (0.00 sec) mysql [demo]>select sleep(5); -------------- select sleep(5) -------------- ERROR 1105 (HY000): errCode = 2, detailMessage = Timeout mysql [demo]>select sleep(5); -------------- select sleep(5) -------------- ^C^C -- sending "KILL QUERY 0" to server ... ^C -- query aborted ERROR 1105 (HY000): errCode = 2, detailMessage = cancel query by user from 127.0.0.1:64208 ```

Make sure we can tell cancel reason from: 1. user cancel 2. timeout 3. others ```text mysql [demo]>set query_timeout=1; -------------- set query_timeout=1 -------------- Query OK, 0 rows affected (0.00 sec) mysql [demo]>select sleep(5); -------------- select sleep(5) -------------- ERROR 1105 (HY000): errCode = 2, detailMessage = Timeout mysql [demo]>select sleep(5); -------------- select sleep(5) -------------- ^C^C -- sending "KILL QUERY 0" to server ... ^C -- query aborted ERROR 1105 (HY000): errCode = 2, detailMessage = cancel query by user from 127.0.0.1:64208 ``` Conflicts: fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java

Related PR: apache#41798 Problem Summary: apache#41798 does not set cancel reason if query is timeout on fe.

zhiqiang-hhhh marked this pull request as draft October 14, 2024 08:56

zhiqiang-hhhh force-pushed the fix-cancel-msg branch from e760929 to 18b899a Compare October 15, 2024 02:03

zhiqiang-hhhh marked this pull request as ready for review October 15, 2024 02:04

NEED

8a5e3c1

zhiqiang-hhhh force-pushed the fix-cancel-msg branch from 17f3e61 to 8a5e3c1 Compare October 15, 2024 06:20

yiguolei approved these changes Oct 15, 2024

View reviewed changes

github-actions bot added the approved Indicates a PR has been approved by one committer. label Oct 15, 2024

github-actions bot added the reviewed label Oct 15, 2024

R

d898a1b

yiguolei approved these changes Oct 15, 2024

View reviewed changes

zhiqiang-hhhh mentioned this pull request Oct 15, 2024

[fix](cancel) Fix cancel reason on master #41867

Merged

yiguolei merged commit abcba77 into apache:branch-2.1 Oct 15, 2024

yiguolei added the dev/2.1.7-merged label Oct 15, 2024

yiguolei pushed a commit that referenced this pull request Oct 16, 2024

[fix](cancel) Fix cancel reason on master (#41867)

3c58699

pick fix #41798 on master.

zhiqiang-hhhh added a commit to zhiqiang-hhhh/doris that referenced this pull request Oct 21, 2024

[fix](cancel) Fix cancel reason on master (apache#41867)

c7d767b

pick fix apache#41798 on master.

yiguolei mentioned this pull request Nov 6, 2024

Release Note 2.1.7 #43319

Closed

zhiqiang-hhhh deleted the fix-cancel-msg branch November 6, 2024 06:12

zhiqiang-hhhh mentioned this pull request Nov 8, 2024

[fix](cancel) Fix query time out not set #43521

Merged

16 tasks

yiguolei pushed a commit that referenced this pull request Nov 12, 2024

[fix](cancel) Fix query time out not set (#43521)

86dab57

### What problem does this PR solve? Related PR: #41798 Problem Summary: #41798 does not set cancel reason if query is timeout on fe.

This was referenced Dec 2, 2024

[chore](cancel message) Simplify cancel message of BufferControlBlock #44875

Closed

[chore](cancel message) Simplify cancel message of BufferControlBlock #44876

Closed

yiguolei mentioned this pull request Jan 19, 2025

Release Note 2.1.8 #47198

Closed

GoGoWen pushed a commit to GoGoWen/incubator-doris that referenced this pull request Sep 26, 2025

[fix](cancel) Fix query time out not set (apache#43521)

4e28618

Related PR: apache#41798 Problem Summary: apache#41798 does not set cancel reason if query is timeout on fe.

[fix](cancel) Fix cancel msg on branch-2.1 #41798

[fix](cancel) Fix cancel msg on branch-2.1 #41798

Uh oh!

Conversation

zhiqiang-hhhh commented Oct 14, 2024

Uh oh!

doris-robot commented Oct 14, 2024

Uh oh!

zhiqiang-hhhh commented Oct 14, 2024

Uh oh!

github-actions bot commented Oct 14, 2024

Uh oh!

doris-robot commented Oct 14, 2024

Uh oh!

zhiqiang-hhhh commented Oct 14, 2024

Uh oh!

github-actions bot commented Oct 14, 2024

Uh oh!

doris-robot commented Oct 14, 2024

Uh oh!

zhiqiang-hhhh commented Oct 15, 2024

Uh oh!

github-actions bot commented Oct 15, 2024

Uh oh!

zhiqiang-hhhh commented Oct 15, 2024

Uh oh!

github-actions bot commented Oct 15, 2024

Uh oh!

github-actions bot commented Oct 15, 2024

Uh oh!

github-actions bot commented Oct 15, 2024

Uh oh!

github-actions bot commented Oct 15, 2024

Uh oh!

yiguolei commented Oct 15, 2024

Uh oh!

github-actions bot commented Oct 15, 2024

Uh oh!

github-actions bot commented Oct 15, 2024

Uh oh!

yiguolei commented Oct 15, 2024

Uh oh!

github-actions bot commented Oct 15, 2024

Uh oh!

zhiqiang-hhhh commented Oct 15, 2024

Uh oh!

github-actions bot commented Oct 15, 2024

Uh oh!

doris-robot commented Oct 15, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants