Skip to content

Cherry pick #22183 to 21.1: Fix query cancellation with use_hedged_requests=0 and async_socket_for_remote=1#22293

Merged
Avogar merged 3 commits intobackport/21.1/22183from
cherrypick/21.1/6d60f2eb871beee6efd4c0c3b953224e50861eaf
Apr 2, 2021
Merged

Cherry pick #22183 to 21.1: Fix query cancellation with use_hedged_requests=0 and async_socket_for_remote=1#22293
Avogar merged 3 commits intobackport/21.1/22183from
cherrypick/21.1/6d60f2eb871beee6efd4c0c3b953224e50861eaf

Conversation

@robot-clickhouse
Copy link
Copy Markdown
Member

Original pull-request #22183

This pull-request is a first step of an automated backporting.
It contains changes like after calling a local command git cherry-pick.
If you intend to continue backporting this changes, then resolve all conflicts if any.
Otherwise, if you do not want to backport them, then just close this pull-request.

The check results does not matter at this step - you can safely ignore them.
Also this pull-request will be merged automatically as it reaches the mergeable state, but you always can merge it manually.

azat and others added 2 commits March 26, 2021 21:24
…r_remote=1

In #21643 async_socket_for_remote=1 was fixed to avoid leaving the
connection in the unsynchronised state.

But one should not try to wait for the current packet in case of timeout
because this will exceed the timeout.

Anyway if the timeout is exceeded, then the connection will be shutdown
(disconnected), so it will not left in an unsynchronised state.
…cel-on-timeout-fix

Fix query cancellation with use_hedged_requests=0 and async_socket_for_remote=1
@robot-clickhouse robot-clickhouse added do not test disable testing on pull request pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only! labels Mar 29, 2021
@Avogar Avogar merged this pull request into backport/21.1/22183 Apr 2, 2021
@Avogar Avogar deleted the cherrypick/21.1/6d60f2eb871beee6efd4c0c3b953224e50861eaf branch April 2, 2021 10:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do not test disable testing on pull request pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants