Cancel any row count queries before attempting to cut over #846

ajm188 · 2020-05-18T00:05:19Z

Closes #830. Switches from using QueryRow to QueryRowContext, and
stores a context.CancelFunc in the migration context, which is called to
halt any running row count query before beginning the cut over.

Note: I'm 99% sure database/sql does what I think it should do here. I wanted to open this now in case anyone else happens to know off-hand, but in the meantime I'll keep reading through the go stdlib to convince myself this is right.

Update on the above: I smartened up and read the docs instead of the code, which say go-sql-driver does support cancelling queries via contexts

In case this PR introduced Go code changes:

contributed code is using same conventions as original code
script/cibuild returns with no formatting errors, build errors or unit test errors.

Closes github#830. Switches from using `QueryRow` to `QueryRowContext`, and stores a context.CancelFunc in the migration context, which is called to halt any running row count query before beginning the cut over.

shlomi-noach

Thank you for this important fix! To the best of my understanding the termination of the rowcount query is not fully implemented in this PR, see comments inline.

go/logic/migrator.go

go/logic/inspect.go

* Explicitly grab a connection to run the count, store its connection id * When the query context is canceled, run a `KILL QUERY ?` on that connection id

…cel func

timvaillancourt · 2022-06-04T23:07:34Z

@ajm188 this PR makes a lot of sense to me. Thanks a lot!

Do you mind rebasing the PR? I think the main change is the logger 🙏

timvaillancourt · 2022-06-05T19:33:05Z

@ajm188 I was able to fix the CI failures myself via the GitHub UI 🤯

@dm-2 / @rashiq can we merge this and test in a train of other recent PRs?

ajm188 · 2022-06-06T16:19:19Z

@ajm188 I was able to fix the CI failures myself via the GitHub UI 🤯

awesome, thanks for taking care of it!

ajm188 · 2022-06-21T13:31:30Z

@timvaillancourt any update on getting this merged? 🤞

* Cancel any row count queries before attempting to cut over Closes #830. Switches from using `QueryRow` to `QueryRowContext`, and stores a context.CancelFunc in the migration context, which is called to halt any running row count query before beginning the cut over. * Make it threadsafe * Kill the count query on the database side as well * Explicitly grab a connection to run the count, store its connection id * When the query context is canceled, run a `KILL QUERY ?` on that connection id * Rewrite these to use the threadsafe functions, stop exporting the cancel func * Update logger * Update logger Co-authored-by: Tim Vaillancourt <timvaillancourt@github.com> Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com> Co-authored-by: dm-2 <45519614+dm-2@users.noreply.github.com>

* Cancel any row count queries before attempting to cut over Closes github#830. Switches from using `QueryRow` to `QueryRowContext`, and stores a context.CancelFunc in the migration context, which is called to halt any running row count query before beginning the cut over. * Make it threadsafe * Kill the count query on the database side as well * Explicitly grab a connection to run the count, store its connection id * When the query context is canceled, run a `KILL QUERY ?` on that connection id * Rewrite these to use the threadsafe functions, stop exporting the cancel func * Update logger * Update logger Co-authored-by: Tim Vaillancourt <timvaillancourt@github.com> Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com> Co-authored-by: dm-2 <45519614+dm-2@users.noreply.github.com>

* Merge pull request github#1143 from github/codeql-run-on-prs Run CodeQL analysis on PRs * Merge pull request github#1141 from shaohk/fix-two-phase-commit-lost-data_v2 fix(lost data in mysql two-phase commit): lost data in mysql two-phas… * compound pk tests (github#387) * compound pk tests * more details in failure diff * more elaborate test; the pk-ts one consistently fails * Fix merge conflict Co-authored-by: Shlomi Noach <shlomi-noach@github.com> Co-authored-by: Tim Vaillancourt <timvaillancourt@github.com> Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com> * Use `switch` statements for readability, simplify `.NewGoMySQLReader()` (github#1135) * Use `switch` statements for readability * Simplify initBinlogReader() * Add context/timeout to HTTP throttle check (github#1131) * Add context/timeout to HTTP throttle check * Dont run `.GetThrottleHTTPInterval()` on every loop * Update help message * Var rename * 2022 * Add timeout flag * Add unix/tcp server commands, use ParseInt() for string->int64 * Var rename * Re-check http timeout on every loop iteration * Remove stale comment * Make throttle interval idempotent * var rename * Usage grammar * Make http timeout idempotent too * Parse time.Duration once * Move timeout to NewThrottler * Help update * Set User-Agent header * Re-add newline Co-authored-by: dm-2 <45519614+dm-2@users.noreply.github.com> * Default to `go1.17.11` (github#1136) * Default to go1.17.11 * `go mod vendor` Co-authored-by: dm-2 <45519614+dm-2@users.noreply.github.com> * Cancel any row count queries before attempting to cut over (github#846) * Cancel any row count queries before attempting to cut over Closes github#830. Switches from using `QueryRow` to `QueryRowContext`, and stores a context.CancelFunc in the migration context, which is called to halt any running row count query before beginning the cut over. * Make it threadsafe * Kill the count query on the database side as well * Explicitly grab a connection to run the count, store its connection id * When the query context is canceled, run a `KILL QUERY ?` on that connection id * Rewrite these to use the threadsafe functions, stop exporting the cancel func * Update logger * Update logger Co-authored-by: Tim Vaillancourt <timvaillancourt@github.com> Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com> Co-authored-by: dm-2 <45519614+dm-2@users.noreply.github.com> Co-authored-by: dm-2 <45519614+dm-2@users.noreply.github.com> Co-authored-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Co-authored-by: Shlomi Noach <shlomi-noach@github.com> Co-authored-by: Tim Vaillancourt <timvaillancourt@github.com> Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com> Co-authored-by: Andrew Mason <amason@hey.com>

Cancel any row count queries before attempting to cut over

4cc8f74

Closes github#830. Switches from using `QueryRow` to `QueryRowContext`, and stores a context.CancelFunc in the migration context, which is called to halt any running row count query before beginning the cut over.

shlomi-noach suggested changes Jun 28, 2020

View reviewed changes

go/logic/migrator.go Outdated Show resolved Hide resolved

go/logic/inspect.go Outdated Show resolved Hide resolved

go/logic/inspect.go Outdated Show resolved Hide resolved

ajm188 added 3 commits June 28, 2020 11:04

Make it threadsafe

687e1d0

Kill the count query on the database side as well

96281cd

* Explicitly grab a connection to run the count, store its connection id * When the query context is canceled, run a `KILL QUERY ?` on that connection id

Rewrite these to use the threadsafe functions, stop exporting the can…

c1181aa

…cel func

timvaillancourt added the enhancement label Dec 24, 2020

timvaillancourt added this to the v1.1.3 milestone Jun 23, 2021

timvaillancourt added the bug label Jun 23, 2021

timvaillancourt and others added 3 commits June 23, 2021 04:41

Merge branch 'master' into am_cancel_row_counts

8dc9e9a

Merge branch 'master' into am_cancel_row_counts

972d24e

Merge branch 'master' into am_cancel_row_counts

8efaba7

timvaillancourt self-requested a review June 4, 2022 23:06

timvaillancourt approved these changes Jun 4, 2022

View reviewed changes

timvaillancourt requested review from dm-2 and rashiq June 4, 2022 23:08

timvaillancourt added the needs-testing label Jun 4, 2022

timvaillancourt added 2 commits June 5, 2022 20:24

Update logger

2844e95

Update logger

9a657ea

dm-2 approved these changes Jul 6, 2022

View reviewed changes

dm-2 and others added 2 commits July 6, 2022 16:32

Merge branch 'master' into am_cancel_row_counts

22034e0

Merge branch 'master' into am_cancel_row_counts

99e0a7c

timvaillancourt merged commit b751499 into github:master Jul 6, 2022

timvaillancourt added the release-notes label Jul 6, 2022

dm-2 mentioned this pull request Jul 7, 2022

v1.1.5 #1144

Open

timvaillancourt mentioned this pull request Jul 9, 2022

Move .Kill() func from inspector to go/mysql #1148

Merged

2 tasks

ajm188 deleted the am_cancel_row_counts branch February 22, 2023 18:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cancel any row count queries before attempting to cut over #846

Cancel any row count queries before attempting to cut over #846

ajm188 commented May 18, 2020 •

edited

Loading

shlomi-noach left a comment

timvaillancourt commented Jun 4, 2022 •

edited

Loading

timvaillancourt commented Jun 5, 2022

ajm188 commented Jun 6, 2022

ajm188 commented Jun 21, 2022

Cancel any row count queries before attempting to cut over #846

Cancel any row count queries before attempting to cut over #846

Conversation

ajm188 commented May 18, 2020 • edited Loading

shlomi-noach left a comment

Choose a reason for hiding this comment

timvaillancourt commented Jun 4, 2022 • edited Loading

timvaillancourt commented Jun 5, 2022

ajm188 commented Jun 6, 2022

ajm188 commented Jun 21, 2022

ajm188 commented May 18, 2020 •

edited

Loading

timvaillancourt commented Jun 4, 2022 •

edited

Loading