Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not continue retrying to connect to ZK if the query is killed or over limits #47985

Merged
merged 9 commits into from
Apr 12, 2023

Conversation

Algunenano
Copy link
Member

@Algunenano Algunenano commented Mar 24, 2023

Changelog category (leave one):

  • Improvement

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):

  • Do not continue retrying to connect to ZK if the query is killed or over limits

Documentation entry for user-facing changes

Closes #47983

Check with a restarting ZK (keeps resetting the session)

set max_execution_time=5
insert into bi_connector_log(start_datetime) Select now();
  • Before: Code: 159. DB::Exception: Received from clickhouse-02:59000. DB::Exception: Timeout exceeded: elapsed 142.722363052 seconds, maximum: 5. (TIMEOUT_EXCEEDED)
  • After: Code: 159. DB::Exception: Received from clickhouse-02:59000. DB::Exception: Timeout exceeded: elapsed 7.13354754 seconds, maximum: 5. (TIMEOUT_EXCEEDED)

@robot-ch-test-poll1 robot-ch-test-poll1 added the pr-improvement Pull request with some product improvements label Mar 24, 2023
@SmitaRKulkarni SmitaRKulkarni self-assigned this Mar 25, 2023
@Algunenano
Copy link
Member Author

Added an integration test and rebased with master to fix broken test (timezone issues)

@Algunenano
Copy link
Member Author

  • Integration tests (tsan) [4/6] -> Likely my fault. I assumed the ZK status/connection was reset per test but probably that's not the case.
  • Stateless tests (tsan) [1/5] -> Lock order inversion: onCancel #47460

Copy link
Member

@SmitaRKulkarni SmitaRKulkarni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rest all LGTM

@Algunenano
Copy link
Member Author

Stress test: #48151 (unrelated)
Everything else seems good

@SmitaRKulkarni SmitaRKulkarni self-requested a review April 4, 2023 16:36
@SmitaRKulkarni
Copy link
Member

@Algunenano Could you please resolve conflicts with master (src/Backups/BackupCoordinationRemote.cpp)

@SmitaRKulkarni
Copy link
Member

Unrelated failure
Stateless tests (tsan) - 02187_async_inserts_all_formats - #47866

@SmitaRKulkarni SmitaRKulkarni merged commit dd64eae into ClickHouse:master Apr 12, 2023
138 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr-improvement Pull request with some product improvements
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ZooKeeperRetriesControl does not respect max_execution_time
3 participants