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.

Sign up for GitHub

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

Jump to bottom

release-22.2: backupccl: remove generic iterator #97597

Merged
merged 1 commit into from
Mar 6, 2023
Merged

release-22.2: backupccl: remove generic iterator #97597

merged 1 commit into from
Mar 6, 2023

Conversation

rhu713
Copy link
Contributor

@rhu713 rhu713 commented Feb 23, 2023 •
edited
Loading

Remove the generic iterator and replace with duplicate code as generics are not supported in 22.2

Release note: None

Release justification: necessary to pass the roachvet lint checker.

backupccl: remove generic iterator
8f49212 
Remove the generic iterator and replace with duplicate code as generics are not
supported in 22.2

Release note: None
@blathers-crl
Copy link

blathers-crl bot commented Feb 23, 2023 •
edited by rhu713
Loading

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@rhu713 rhu713 marked this pull request as ready for review February 24, 2023 20:56
@rhu713 rhu713 requested review from a team as code owners February 24, 2023 20:56
@rhu713 rhu713 requested review from benbardin and cucaroach and removed request for a team and cucaroach February 24, 2023 20:56
adityamaru
adityamaru approved these changes Feb 28, 2023
View reviewed changes
Copy link
Contributor

@adityamaru adityamaru left a comment

Choose a reason for hiding this comment

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

Looks good to me, I think our test coverage is pretty good and it looks like mainly boiler plate code changing.

pkg/sql/execinfrapb/processors_bulk_io.proto
@@ -395,7 +395,7 @@ message GenerativeSplitAndScatterSpec {
repeated roachpb.Span spans = 10 [(gogoproto.nullable) = false];
repeated jobs.jobspb.RestoreDetails.BackupLocalityInfo backup_locality_info = 11 [(gogoproto.nullable) = false];
// HighWater is the high watermark of the previous run of restore.
optional bytes high_water = 12 [(gogoproto.nullable) = false];
Copy link
Contributor

Choose a reason for hiding this comment

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

intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, it was from a backport that was missed that just removed this no-effect nullable=false

@rhu713 rhu713 merged commit d7283d9 into cockroachdb:release-22.2 Mar 6, 2023
@rhu713 rhu713 deleted the restore-it-remove-generics branch March 6, 2023 15:26
rhu713 pushed a commit to rhu713/cockroach that referenced this pull request Mar 21, 2023
Revert "Merge pull request cockroachdb#97597 from rhu713/restore-it-r…
ace446b 
…emove-generics"

This reverts commit d7283d9, reversing
changes made to 1e8e8dc.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adityamaru adityamaru adityamaru approved these changes

@benbardin benbardin Awaiting requested review from benbardin benbardin is a code owner automatically assigned from cockroachdb/disaster-recovery

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rhu713 @cockroach-teamcity @adityamaru