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

release-22.2: go.mod: use the crdb fork for etcd #104499

Merged
merged 1 commit into from
Jun 8, 2023

Conversation

pav-kv
Copy link
Collaborator

@pav-kv pav-kv commented Jun 7, 2023

In order to cherry-pick bug fixes from upstream etcd-io/raft, use our fork. The fixes will be manually added because the etcd/raft has migrated to its own repo at etcd-io/raft.

Release justification: necessary to cherry-pick a bug fix from upstream
Epic: None
Release note: None

@pav-kv pav-kv requested a review from tbg June 7, 2023 14:07
@pav-kv pav-kv requested a review from a team as a code owner June 7, 2023 14:07
@blathers-crl
Copy link

blathers-crl bot commented Jun 7, 2023

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

@pav-kv pav-kv requested a review from erikgrinaker June 7, 2023 14:11
@pav-kv
Copy link
Collaborator Author

pav-kv commented Jun 7, 2023

Lint is broken. I couldn't get go mod tidy and go mod vendor to succeed:

...
github.com/cockroachdb/cockroach/pkg/kv/kvnemesis imports
        github.com/cockroachdb/cockroach/pkg/kv/kvnemesis/kvnemesisutil: no matching versions for query "latest"
github.com/cockroachdb/cockroach/pkg/sql/plpgsql/parser imports
        github.com/cockroachdb/cockroach/pkg/sql/sem/plpgsqltree: no matching versions for query "latest"
github.com/cockroachdb/cockroach/pkg/ccl/kvccl/kvtenantccl/upgradeinterlockccl tested by
        github.com/cockroachdb/cockroach/pkg/ccl/kvccl/kvtenantccl/upgradeinterlockccl.test imports
        github.com/cockroachdb/cockroach/pkg/ccl/kvccl/kvtenantccl/upgradeinterlockccl/sharedtestutil: no matching versions for query "latest"

Same behaviour prior to this PR, if I'm just on the release-22.2 branch.

Copy link
Member

@tbg tbg left a comment

Choose a reason for hiding this comment

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

Not sure about the go mod issues. Maybe dev-inf can help us?

@pav-kv pav-kv force-pushed the use-etcd-fork branch 2 times, most recently from 51a91cd to 51edcf5 Compare June 8, 2023 07:50
In order to cherry-pick bug fixes from upstream etcd-io/raft, use our fork. The
fixes will be manually added because the etcd/raft has migrated to its own repo
at etcd-io/raft.

Release justification: necessary to cherry-pick a bug fix from upstream
Release note: None
@pav-kv pav-kv requested review from erikgrinaker and tbg June 8, 2023 07:56
@pav-kv
Copy link
Collaborator Author

pav-kv commented Jun 8, 2023

@tbg @erikgrinaker Could you take another look? I updated deps in vendor. For now this should point at our fork at the same hash.

Copy link
Contributor

@erikgrinaker erikgrinaker left a comment

Choose a reason for hiding this comment

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

LGTM

@craig
Copy link
Contributor

craig bot commented Jun 8, 2023

Build succeeded:

@craig craig bot merged commit 7754c4b into cockroachdb:release-22.2 Jun 8, 2023
@pav-kv pav-kv deleted the use-etcd-fork branch June 8, 2023 08:39
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