schemachange: speed up slow schema changes#48608
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom May 9, 2020
Merged
schemachange: speed up slow schema changes#48608craig[bot] merged 1 commit intocockroachdb:masterfrom
craig[bot] merged 1 commit intocockroachdb:masterfrom
Conversation
Member
|
This change is |
ajwerner
reviewed
May 8, 2020
| if scErr == nil { | ||
| return nil | ||
| } | ||
| switch { |
Contributor
There was a problem hiding this comment.
probably cleaner as:
switch scErr := sc.exec(ctx); scErr {
case nil:
return nil
...
pkg/sql/schema_changer.go
Outdated
| } | ||
| } | ||
| return nil | ||
| return jobs.NewRetryJobError(scErr.Error()) |
Contributor
There was a problem hiding this comment.
If you're here it probably means that your context was canceled. It's reasonably like that scErr is nil here which means this will panic.
Contributor
Author
There was a problem hiding this comment.
well if scErr was nil, we would return inside the body of the loop
| MaxBackoff: 20 * time.Second, | ||
| Multiplier: 1.5, | ||
| } | ||
| var scErr error |
Contributor
There was a problem hiding this comment.
I'm not sure it makes sense to retain this across iterations of the loop.
Contributor
Author
There was a problem hiding this comment.
no but we need it after we exit the loop to return to registry the last error from the schema change
e14652c to
e281a34
Compare
|
❌ The GitHub CI (Cockroach) build has failed on e281a348. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan. |
Touches cockroachdb#47790. Release note (performance improvement): Before this a simple schema change could take 30s+. The reason was that if the schema change is not first in line in the table mutation queue it would return a re-triable error and the jobs framework will re-adopt and run it later. The problem is that the job adoption loop is 30s. To repro run this for some time: ``` cockroach sql --insecure --watch 1s -e 'drop table if exists users cascade; create table users (id uuid not null, name varchar(255) not null, email varchar(255) not null, password varchar(255) not null, remember_token varchar(100) null, created_at timestamp(0) without time zone null, updated_at timestamp(0) without time zone null, deleted_at timestamp(0) without time zone null); alter table users add primary key (id); alter table users add constraint users_email_unique unique (email);' ``` Instead of returning on retriable errors we retry with a exponential backoff in the schema change code. This pattern of dealing with retriable errors in client job code is encouraged vs relying on the registry beacuse the latter leads to slowness and additionally to more complicated test fixtures that rely in hacking with the internals of the job registry,
ajwerner
approved these changes
May 8, 2020
| MaxBackoff: 20 * time.Second, | ||
| Multiplier: 1.5, | ||
| } | ||
| var scErr error |
5 tasks
Contributor
Author
|
bors r+ |
Contributor
Build failed (retrying...) |
Contributor
Author
|
bors r+ |
Contributor
|
Already running a review |
Contributor
Build succeeded |
This was referenced May 9, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Touches #45150.
Fixes #47607.
Touches #47790.
Release note (performance improvement):
Before this a simple schema change could take 30s+.
The reason was that if the schema change is not first
in line in the table mutation queue it would return a
re-triable error and the jobs framework will re-adopt and
run it later. The problem is that the job adoption loop
is 30s.
To repro run this for some time:
Instead of returning on re-triable errors we retry with exponential
backoff in the schema change code. This pattern of dealing with
re-triable errors in client job code is encouraged vs relying on the
registry because the latter leads to slowness and additionally to more
complicated test fixtures that rely on hacking with the internals of the
job registry,