Skip to content

backupccl: run TestFullClusterBackup with span configs#79228

Merged
craig[bot] merged 3 commits intocockroachdb:masterfrom
irfansharif:220401.deflake-TestFullClusterBackup
Apr 2, 2022
Merged

backupccl: run TestFullClusterBackup with span configs#79228
craig[bot] merged 3 commits intocockroachdb:masterfrom
irfansharif:220401.deflake-TestFullClusterBackup

Conversation

@irfansharif
Copy link
Copy Markdown
Contributor

Closes #75060; speculating that #79222 fixed the underlying issue.
Previously the reconciliation job errored out with "expected to delete
11 row(s), deleted 10", which could conceivably occur if there were two
instances of the reconciliation job running post-restore (something
#79222 fixes).

Release note: None


First two commits are from #79139 and #79222 respectively.

@irfansharif irfansharif requested review from a team as code owners April 1, 2022 14:09
@irfansharif irfansharif requested a review from a team April 1, 2022 14:09
@irfansharif irfansharif requested a review from a team as a code owner April 1, 2022 14:09
@irfansharif irfansharif requested review from adityamaru, ajwerner and dt and removed request for a team April 1, 2022 14:09
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@irfansharif irfansharif removed the request for review from a team April 1, 2022 14:09
@irfansharif irfansharif force-pushed the 220401.deflake-TestFullClusterBackup branch from b6d01e1 to 49968a1 Compare April 1, 2022 14:10
Copy link
Copy Markdown
Collaborator

@arulajmani arulajmani left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @adityamaru, @ajwerner, @dt, and @irfansharif)


pkg/ccl/backupccl/full_cluster_backup_restore_test.go, line 61 at r3 (raw file):

				},
				GCJob: &sql.GCJobTestingKnobs{
					DisableNewProtectedTimestampSubsystemCheck: true,

driveby: You should be able to remove this as well now. We should also get rid of the knob entirely, considering this was the only use.

@irfansharif irfansharif force-pushed the 220401.deflake-TestFullClusterBackup branch from 49968a1 to 02cd2e5 Compare April 1, 2022 14:28
Copy link
Copy Markdown
Contributor Author

@irfansharif irfansharif left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @adityamaru, @ajwerner, @arulajmani, and @dt)


pkg/ccl/backupccl/full_cluster_backup_restore_test.go, line 61 at r3 (raw file):

Previously, arulajmani (Arul Ajmani) wrote…

driveby: You should be able to remove this as well now. We should also get rid of the knob entirely, considering this was the only use.

Done.

@irfansharif irfansharif force-pushed the 220401.deflake-TestFullClusterBackup branch from 02cd2e5 to 9245adf Compare April 1, 2022 14:29
@irfansharif irfansharif requested a review from a team April 1, 2022 14:29
Fixes cockroachdb#70173. When restoring a cluster, we don't want to end up with two
instances of the singleton reconciliation job.

Release note: None
Closes cockroachdb#75060; speculating that the previous commit fixed the underlying
issue. Previously the reconciliation job errored out with "expected to
delete 11 row(s), deleted 10", which could conceivably occur if there
were two instances of the reconciliation job running post-restore.

Release note: None
@irfansharif irfansharif force-pushed the 220401.deflake-TestFullClusterBackup branch from 9245adf to f475361 Compare April 1, 2022 18:52
@irfansharif
Copy link
Copy Markdown
Contributor Author

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 1, 2022

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 2, 2022

Build succeeded:

@craig craig bot merged commit 4b9151f into cockroachdb:master Apr 2, 2022
@irfansharif irfansharif deleted the 220401.deflake-TestFullClusterBackup branch April 2, 2022 01:28
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.

backupccl: TestFullClusterBackup/ensure_that_jobs_are_restored flakes under span configs

4 participants