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

backupccl: stop reading on MutationJobs on RESTORE #51848

Merged
merged 1 commit into from
Jul 28, 2020

Conversation

pbardea
Copy link
Contributor

@pbardea pbardea commented Jul 23, 2020

This change stops reading the MutationJobs field on table descriptors
that we are importing. It previously assumed that the MutationsJobs and
Mutations remain in sync. However, in practice there are descriptors
where this is not the case and RESTORE should no longer rely on this
assumption.

Release note (bug fix): Increase robustness of restore against
descriptors which may be in an unexpected state.

@pbardea pbardea requested review from thoszhang, a team and dt and removed request for a team July 23, 2020 16:48
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Member

@dt dt left a comment

Choose a reason for hiding this comment

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

Reviewed 5 of 5 files at r1.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @lucy-zhang)

Copy link
Member

@dt dt left a comment

Choose a reason for hiding this comment

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

what's up with the proto generated changes?

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @lucy-zhang)

Copy link
Contributor

@thoszhang thoszhang left a comment

Choose a reason for hiding this comment

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

Reviewed 5 of 5 files at r1.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained

@pbardea
Copy link
Contributor Author

pbardea commented Jul 27, 2020

@lucy-zhang made a small change to handle migrating when several mutations share the same mutation ID. Before when looking at mutation jobs, these mutations would only have 1 corresponding job so I'm now keeping track of the mutations we've seen as to not re-create the same mutation job twice.

Copy link
Contributor

@thoszhang thoszhang left a comment

Choose a reason for hiding this comment

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

lgtm, modulo the pb.gw.go file changes

Reviewed 5 of 5 files at r2.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained

This change stops reading the MutationJobs field on table descriptors
that we are importing. It previously assumed that the MutationsJobs and
Mutations remain in sync. However, in practice there are descriptors
where this is not the case and RESTORE should no longer rely on this
assumption.

Release note (bug fix): Increase robustness of restore against
descriptors which may be in an unexpected state.
@pbardea pbardea force-pushed the backup-mutations branch from 6490d21 to 83218f1 Compare July 27, 2020 18:41
@pbardea
Copy link
Contributor Author

pbardea commented Jul 27, 2020

TFTR
bors r+

@craig
Copy link
Contributor

craig bot commented Jul 27, 2020

Build failed:

@pbardea
Copy link
Contributor Author

pbardea commented Jul 28, 2020

Flaked on #51356.
bors r+

@craig
Copy link
Contributor

craig bot commented Jul 28, 2020

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Jul 28, 2020

Build failed:

@pbardea
Copy link
Contributor Author

pbardea commented Jul 28, 2020

Flaked on #49895.
bors r+

@craig
Copy link
Contributor

craig bot commented Jul 28, 2020

Build succeeded:

@craig craig bot merged commit 7e36e68 into cockroachdb:master Jul 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants