OCPBUGS-27105: Rebase etcd 3.5.11 openshift 4.11 #241

Elbehery · 2024-01-12T19:17:24Z

This PR rebases etcd 3.5.11 into openshift-4.11.

This PR has been created by this workflow

git rebase --rebase-merges --fork-point v3.5.9 v3.5.11 ( rebasing the changes from upstream 3.5.9 --> 3.5.11 )
git cherry-pick 4080293a21e5151bd43015795a01c6870124f894
git cherry-pick 9c7fcd1d3a675613017af81b16841363434fd93a

After rebasing, running make locally produce

SUCCESS: etcd_build (GOARCH=amd64)
./bin/etcd --version
etcd Version: 3.5.11
Git SHA: 54d1f5cfb
Go Version: go1.20
Go OS/Arch: darwin/amd64
./bin/etcdctl version
etcdctl version: 3.5.11
API version: 3.5
./bin/etcdutl version
etcdutl version: 3.5.11
API version: 3.5

cc @hasbro17 @dusk125 @tjungblu @soltysh @deads2k

If start grpc proxy with --resolver-prefix, memberlist will return all alive proxy nodes, when one grpc proxy node is down, it is expected to not return the down node, but it is still return Signed-off-by: yellowzf <zzhf3311@163.com>

[release-3.5]grpcproxy: fix memberlist results not update when proxy node down

fixes bug with multiple endpoints with same prefix Signed-off-by: Ramil Mirhasanov <ramil600@yahoo.com>

Signed-off-by: Hubert Zhang <hubert.zyk@gmail.com>

[release-3.5]naming/endpoints: backport of etcd-io#15021, fix endpoints prefix bug

Signed-off-by: scuzk373x@gmai.com <zhuanwajiang@pinduoduo.com>

Signed-off-by: daljitdokal <daljit.dokal@yahoo.co.nz>

[3.5] Backport updating go to latest patch release 1.19.10

Signed-off-by: kkkkun <scuzk373x@gmail.com>

replace gobin with go install

Signed-off-by: kkkkun <scuzk373x@gmail.com>

…eck_to_help_3.5 cherry-pick etcd-io#16031 to release-3.5

Signed-off-by: kkkkun <scuzk373x@gmail.com>

Mitigates etcd-io#15993 by not checking each key individually for permission when auth is entirely disabled or admin user is calling the method. Signed-off-by: Thomas Jungblut <tjungblu@redhat.com>

This contains a slight refactoring to expose enough information to write meaningful tests for auth applier v3. Signed-off-by: Thomas Jungblut <tjungblu@redhat.com>

…te workflow. Signed-off-by: James Blair <mail@jamesblair.net>

…ation [3.5] Backport .github/workflows: Read .go-version as a step and not separate workflow

[3.5] etcdserver: fix corruption check when server has just been compacted

[3.5] Early exit auth check on lease puts

Signed-off-by: Sameer Natu <sameer.natu@gmail.com>

Add e2e-arm64.yaml and Tests-arm64.yaml to release-3.5

This reverts commit cb38980, reversing changes made to f565a94. Changes reversed as scheduled github actions must exist in default branch. Signed-off-by: James Blair <mail@jamesblair.net>

Signed-off-by: Allen Ray <alray@redhat.com> Signed-off-by: Thomas Jungblut <tjungblu@redhat.com>

…flags in snapshot restore command Signed-off-by: Benjamin Wang <wachao@vmware.com>

Signed-off-by: Thomas Jungblut <tjungblu@redhat.com>

[3.5] Adding optional revision bump and mark compacted to snapshot restore

Revert backport of arm64 scheduled workflows

fix the unexpected blocking when using Barrier.Wait(), e.g. NewBarrier(client, "a").Wait() will block if key "a" is not existed but "a0" is existed, but it should return immediately. Signed-off-by: zhangwenkang <zwenkang@vmware.com>

[3.5] clientv3: remove v3.WithFirstKey() in Barrier.Wait()

Signed-off-by: shitao.lst <acm_tach@163.com>

geliu2016 · 2024-01-15T02:40:31Z

/label cherry-pick-approved

dusk125 · 2024-01-15T16:20:26Z

/label backport-risk-assessed

Elbehery · 2024-01-19T14:15:02Z

/assign @sandeepknd
/assign @geliu2016

Elbehery · 2024-01-19T14:15:22Z

/jira refresh

openshift-ci-robot · 2024-01-19T14:15:26Z

@Elbehery: This pull request references Jira Issue OCPBUGS-27105, which is invalid:

expected dependent Jira Issue OCPBUGS-27102 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

sandeepknd · 2024-01-19T14:28:42Z

/label cherry-pick-approved

Elbehery · 2024-01-19T15:21:55Z

/jira refresh

openshift-ci-robot · 2024-01-19T15:21:59Z

@Elbehery: This pull request references Jira Issue OCPBUGS-27105, which is invalid:

expected dependent Jira Issue OCPBUGS-27102 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

dusk125 · 2024-01-19T15:33:26Z

/lgtm

openshift-ci · 2024-01-19T15:35:44Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dusk125, Elbehery

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [Elbehery,dusk125]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Elbehery · 2024-01-19T15:37:38Z

/jira refresh

openshift-ci-robot · 2024-01-19T15:37:42Z

@Elbehery: This pull request references Jira Issue OCPBUGS-27105, which is invalid:

expected dependent Jira Issue OCPBUGS-27102 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Elbehery · 2024-01-19T15:38:48Z

/jira refresh

openshift-ci-robot · 2024-01-19T15:38:51Z

@Elbehery: This pull request references Jira Issue OCPBUGS-27105, which is invalid:

expected dependent Jira Issue OCPBUGS-27102 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

soltysh · 2024-01-19T15:43:02Z

/remove-label jira/invalid-bug
/label jira/valid-bug

4.12 merge din #240, so manually overriding the bug to allow merges

Elbehery · 2024-01-19T15:46:17Z

/jira refresh

openshift-ci-robot · 2024-01-19T15:46:21Z

@Elbehery: This pull request references Jira Issue OCPBUGS-27105, which is invalid:

expected dependent Jira Issue OCPBUGS-27102 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Retaining the jira/valid-bug label as it was manually added.

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2024-01-19T15:50:26Z

@Elbehery: Jira Issue OCPBUGS-27105: All pull requests linked via external trackers have merged:

openshift/etcd#241

Jira Issue OCPBUGS-27105 has been moved to the MODIFIED state.

In response to this:

This PR rebases etcd 3.5.11 into openshift-4.11.

This PR has been created by this workflow

git rebase --rebase-merges --fork-point v3.5.9 v3.5.11 ( rebasing the changes from upstream 3.5.9 --> 3.5.11 )

git cherry-pick 4080293a21e5151bd43015795a01c6870124f894

git cherry-pick 9c7fcd1d3a675613017af81b16841363434fd93a

After rebasing, running make locally produce
SUCCESS: etcd_build (GOARCH=amd64)
./bin/etcd --version
etcd Version: 3.5.11
Git SHA: 54d1f5cfb
Go Version: go1.20
Go OS/Arch: darwin/amd64
./bin/etcdctl version
etcdctl version: 3.5.11
API version: 3.5
./bin/etcdutl version
etcdutl version: 3.5.11
API version: 3.5
cc @hasbro17 @dusk125 @tjungblu @soltysh @deads2k

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-bot · 2024-01-19T19:20:45Z

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-etcd-container-v4.11.0-202401191731.p0.ge73305f.assembly.stream for distgit ose-etcd.
All builds following this will include this PR.

Elbehery · 2024-01-21T20:00:53Z

/jira refresh

openshift-ci-robot · 2024-01-21T20:00:56Z

@Elbehery: Jira Issue OCPBUGS-27105 is in an unrecognized state (ON_QA) and will not be moved to the MODIFIED state.

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

yellowzf and others added 30 commits May 16, 2023 11:35

Merge pull request etcd-io#15907 from yellowzf/release-3.5-backport

721d9fe

[release-3.5]grpcproxy: fix memberlist results not update when proxy node down

clientv3/naming/endpoints: fix endpoints prefix bug

2158f21

fixes bug with multiple endpoints with same prefix Signed-off-by: Ramil Mirhasanov <ramil600@yahoo.com>

Fix test of clientv3/naming

9811738

Signed-off-by: Hubert Zhang <hubert.zyk@gmail.com>

Merge pull request etcd-io#15939 from HubertZhang/backport-3.5-15021

4d4984f

[release-3.5]naming/endpoints: backport of etcd-io#15021, fix endpoints prefix bug

add compact hash check to help

d3d530c

Signed-off-by: scuzk373x@gmai.com <zhuanwajiang@pinduoduo.com>

[3.5] Backport updating go to latest patch release 1.19.10

15d2aef

Signed-off-by: daljitdokal <daljit.dokal@yahoo.co.nz>

Merge pull request etcd-io#16033 from daljitdokal/release-3.5

ac034d0

[3.5] Backport updating go to latest patch release 1.19.10

replace gobin with go install

dca13c6

Signed-off-by: kkkkun <scuzk373x@gmail.com>

Merge pull request etcd-io#16039 from kkkkun/replace_gobin

ffcde60

replace gobin with go install

etcdserver: fix corruption check when server has just been compacted

8cffdba

Signed-off-by: kkkkun <scuzk373x@gmail.com>

Merge pull request etcd-io#16032 from kkkkun/add_experimental_hash_ch…

cf00c2d

…eck_to_help_3.5 cherry-pick etcd-io#16031 to release-3.5

remove stack log when etcdutl restore

620a623

Signed-off-by: kkkkun <scuzk373x@gmail.com>

Early exit auth check on lease puts

b2fb75d

Mitigates etcd-io#15993 by not checking each key individually for permission when auth is entirely disabled or admin user is calling the method. Signed-off-by: Thomas Jungblut <tjungblu@redhat.com>

Add first unit test for authApplierV3

423f951

This contains a slight refactoring to expose enough information to write meaningful tests for auth applier v3. Signed-off-by: Thomas Jungblut <tjungblu@redhat.com>

Backport .github/workflows: Read .go-version as a step and not separa…

b5f07c9

…te workflow. Signed-off-by: James Blair <mail@jamesblair.net>

Merge pull request etcd-io#16088 from jmhbnz/backport-gover-simplific…

2c04d51

…ation [3.5] Backport .github/workflows: Read .go-version as a step and not separate workflow

Merge pull request etcd-io#16048 from kkkkun/cp-14457-to-3.5

306c60a

[3.5] etcdserver: fix corruption check when server has just been compacted

Merge pull request etcd-io#16019 from tjungblu/putauthshort_3.5

f565a94

[3.5] Early exit auth check on lease puts

Add e2e-arm64.yaml and tests-arm64.yaml to release-3.5 scheduled at 1.30

c31f282

Signed-off-by: Sameer Natu <sameer.natu@gmail.com>

Merge pull request etcd-io#16119 from natusameer/release-3.5

cb38980

Add e2e-arm64.yaml and Tests-arm64.yaml to release-3.5

Revert "Merge pull request etcd-io#16119 from natusameer/release-3.5"

6c1f883

This reverts commit cb38980, reversing changes made to f565a94. Changes reversed as scheduled github actions must exist in default branch. Signed-off-by: James Blair <mail@jamesblair.net>

Adding optional revision bump and mark compacted to snapshot restore

4425ef5

Signed-off-by: Allen Ray <alray@redhat.com> Signed-off-by: Thomas Jungblut <tjungblu@redhat.com>

etcdutl: update description for --mark-compacted and --bump-revision …

f6668e0

…flags in snapshot restore command Signed-off-by: Benjamin Wang <wachao@vmware.com>

update etcdctl flag description for snapshot restores

d0a56c0

Signed-off-by: Thomas Jungblut <tjungblu@redhat.com>

Merge pull request etcd-io#16165 from tjungblu/revbump_3.5

a233b2e

[3.5] Adding optional revision bump and mark compacted to snapshot restore

Merge pull request etcd-io#16151 from jmhbnz/revert-workflow-backport

f3f3729

Revert backport of arm64 scheduled workflows

clientv3: remove v3.WithFirstKey() in Barrier.Wait()

6be3ad3

fix the unexpected blocking when using Barrier.Wait(), e.g. NewBarrier(client, "a").Wait() will block if key "a" is not existed but "a0" is existed, but it should return immediately. Signed-off-by: zhangwenkang <zwenkang@vmware.com>

Merge pull request etcd-io#16188 from kensou97/release-3.5

e5bd8f4

[3.5] clientv3: remove v3.WithFirstKey() in Barrier.Wait()

[3.5] etcdutl: fix db double closed

2921992

Signed-off-by: shitao.lst <acm_tach@163.com>

openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jan 15, 2024

openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 19, 2024

openshift-ci bot assigned dusk125 Jan 19, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 19, 2024

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 19, 2024

openshift-ci bot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 19, 2024

openshift-merge-bot bot merged commit e73305f into openshift:openshift-4.11 Jan 19, 2024
7 of 8 checks passed

Elbehery deleted the rebase-etcd-3.5.11-openshift-4.11 branch February 1, 2024 15:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OCPBUGS-27105: Rebase etcd 3.5.11 openshift 4.11 #241

OCPBUGS-27105: Rebase etcd 3.5.11 openshift 4.11 #241

Elbehery commented Jan 12, 2024

geliu2016 commented Jan 15, 2024

dusk125 commented Jan 15, 2024

Elbehery commented Jan 19, 2024

Elbehery commented Jan 19, 2024

openshift-ci-robot commented Jan 19, 2024

sandeepknd commented Jan 19, 2024

Elbehery commented Jan 19, 2024

openshift-ci-robot commented Jan 19, 2024

dusk125 commented Jan 19, 2024

openshift-ci bot commented Jan 19, 2024

Elbehery commented Jan 19, 2024

openshift-ci-robot commented Jan 19, 2024

Elbehery commented Jan 19, 2024

openshift-ci-robot commented Jan 19, 2024

soltysh commented Jan 19, 2024

Elbehery commented Jan 19, 2024

openshift-ci-robot commented Jan 19, 2024

openshift-ci-robot commented Jan 19, 2024

openshift-bot commented Jan 19, 2024

Elbehery commented Jan 21, 2024

openshift-ci-robot commented Jan 21, 2024

OCPBUGS-27105: Rebase etcd 3.5.11 openshift 4.11 #241

OCPBUGS-27105: Rebase etcd 3.5.11 openshift 4.11 #241

Conversation

Elbehery commented Jan 12, 2024

geliu2016 commented Jan 15, 2024

dusk125 commented Jan 15, 2024

Elbehery commented Jan 19, 2024

Elbehery commented Jan 19, 2024

openshift-ci-robot commented Jan 19, 2024

sandeepknd commented Jan 19, 2024

Elbehery commented Jan 19, 2024

openshift-ci-robot commented Jan 19, 2024

dusk125 commented Jan 19, 2024

openshift-ci bot commented Jan 19, 2024

Elbehery commented Jan 19, 2024

openshift-ci-robot commented Jan 19, 2024

Elbehery commented Jan 19, 2024

openshift-ci-robot commented Jan 19, 2024

soltysh commented Jan 19, 2024

Elbehery commented Jan 19, 2024

openshift-ci-robot commented Jan 19, 2024

openshift-ci-robot commented Jan 19, 2024

openshift-bot commented Jan 19, 2024

Elbehery commented Jan 21, 2024

openshift-ci-robot commented Jan 21, 2024