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

OCPBUGS-28736: Rebase etcd 3.5.12 openshift 4.12 #246

Conversation

Elbehery
Copy link

@Elbehery Elbehery commented Jan 31, 2024

This PR rebases etcd 3.5.12 into openshift-4.12.

This PR has been created by this workflow

  • git rebase --rebase-merges --fork-point v3.5.11 v3.5.12 ( rebasing the changes from upstream 3.5.11 --> 3.5.12 )
  • git cherry-pick dff7db5
  • git cherry-pick 19158c6
  • git cherry-pick 2c14fe6 -m 2

After rebasing, running make locally produce

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

serathius and others added 30 commits December 6, 2023 09:13
Signed-off-by: Siyuan Zhang <sizhang@google.com>
[3.5] tests: Backport Extract e2e cluster setup to separate package
Signed-off-by: Siyuan Zhang <sizhang@google.com>
Signed-off-by: Siyuan Zhang <sizhang@google.com>
[3.5] Backport e2e tests for livez/readyz.
…stent index and closing database on defer

`err` variable shared throughout the NewServer function and used on line
396 to defer decision whether backend should be closed when starting
the server failed.

`snapshot` variable is first defined 407, redeclared locally on line 496 and later
again used on line 625. Creation of local variable is a bug introduced
in etcd-io#11888.

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
…coverSnapshotBackend on line 517

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
[release-3.5] Fix etcd bootstrap: Etcd not validating database consistent index, closing database and panicking on nil backend.
Signed-off-by: ZhouJianMS <zhoujian@microsoft.com>
Signed-off-by: Amit Rastogi <amitrastogi2206@gmail.com>
Signed-off-by: ishan16696 <ishan.tyagi@sap.com>
[3.5] Add missing `experimental-enable-lease-checkpoint-persist` flag in etcd help
Backport testutils.ExecuteUntil to 3.5 branch
Signed-off-by: ishan16696 <ishan.tyagi@sap.com>
[3.5]Add a unit tests and missing flags in etcd help.
To ensure etcd official image builds can be reproduced.

Signed-off-by: James Blair <mail@jamesblair.net>
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
[release-3.5] Don't flock snapshot files
…age-builds

[3.5] Backport adding digest for etcd base image
Signed-off-by: Siyuan Zhang <sizhang@google.com>
Signed-off-by: Siyuan Zhang <sizhang@google.com>
[3.5] Fix delete inconsistencies in read buffer
Signed-off-by: Ivan Valdes <ivan@vald.es>
…0.13

[3.5] dependency: upgrade go to 1.20.13
…ompaction function

Backporting commit 21bbc82 in etcd 3.5
To improve traceability of backend database usage, Added below parameter
related to backend database usage metrics inside scheduledCompaction
function.
current-db-size-bytes
current-db-size
current-db-size-in-use-bytes
current-db-size-in-use

Signed-off-by: Rahul More <rahulbapumore@gmail.com>
[3.5] mvcc: Printing etcd backend database related metrics inside scheduleCompaction function
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
…240124

[3.5] Print error log when creating peer listener failed
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 31, 2024
@openshift-ci-robot
Copy link

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

  • expected Jira Issue OCPBUGS-28736 to depend on a bug targeting a version in 4.13.0, 4.13.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This PR rebases etcd 3.5.12 into openshift-4.13.

This PR has been created by this workflow

  • git rebase --rebase-merges --fork-point v3.5.11 v3.5.12 ( rebasing the changes from upstream 3.5.11 --> 3.5.12 )
  • git cherry-pick dff7db5
  • git cherry-pick 19158c6
  • git cherry-pick 2c14fe6 -m 2

After rebasing, running make locally produce

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

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
Copy link

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

  • expected dependent Jira Issue OCPBUGS-28734 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ASSIGNED instead
  • expected dependent Jira Issue OCPBUGS-28734 to target a version in 4.13.0, 4.13.z, but it targets "4.13" 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:

This PR rebases etcd 3.5.12 into openshift-4.12.

This PR has been created by this workflow

  • git rebase --rebase-merges --fork-point v3.5.11 v3.5.12 ( rebasing the changes from upstream 3.5.11 --> 3.5.12 )
  • git cherry-pick dff7db5
  • git cherry-pick 19158c6
  • git cherry-pick 2c14fe6 -m 2

After rebasing, running make locally produce

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

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 31, 2024
@Elbehery
Copy link
Author

/payload 4.12 nightly informing

@Elbehery
Copy link
Author

/payload 4.12 nightly blocking

Copy link

openshift-ci bot commented Jan 31, 2024

@Elbehery: trigger 6 job(s) of type blocking for the nightly release of OCP 4.12

  • periodic-ci-openshift-release-master-nightly-4.12-e2e-aws-sdn-serial
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-aws-sdn-upgrade
  • periodic-ci-openshift-release-master-ci-4.12-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.12-upgrade-from-stable-4.11-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-sdn-bm

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/20c17b30-c058-11ee-8a5d-0568cf8f01cd-0

Copy link

openshift-ci bot commented Jan 31, 2024

@Elbehery: trigger 54 job(s) of type informing for the nightly release of OCP 4.12

  • periodic-ci-openshift-release-master-nightly-4.12-e2e-alibaba-ovn
  • periodic-ci-openshift-release-master-nightly-4.12-console-aws
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-aws-csi
  • periodic-ci-openshift-release-master-ci-4.12-e2e-aws-ovn
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-aws-ovn-fips
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-aws-ovn-multi
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-aws-ovn-single-node
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-aws-ovn-single-node-serial
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-aws-sdn
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-aws-sdn-cgroupsv2
  • periodic-ci-openshift-release-master-ci-4.12-e2e-aws-sdn-techpreview
  • periodic-ci-openshift-release-master-ci-4.12-e2e-aws-sdn-techpreview-serial
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-aws-ovn-upi
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-azure-csi
  • periodic-ci-openshift-release-master-ci-4.12-e2e-azure-ovn
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-azure-sdn
  • periodic-ci-openshift-release-master-ci-4.12-e2e-azure-sdn-techpreview
  • periodic-ci-openshift-release-master-ci-4.12-e2e-azure-sdn-techpreview-serial
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-azure-deploy-cnv
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-azure-upgrade-cnv
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-aws-driver-toolkit
  • periodic-ci-openshift-release-master-ci-4.12-e2e-gcp-ovn
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-gcp-ovn-csi
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-gcp-ovn-rt
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-gcp-sdn
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-gcp-sdn-serial
  • periodic-ci-openshift-release-master-ci-4.12-e2e-gcp-sdn-techpreview
  • periodic-ci-openshift-release-master-ci-4.12-e2e-gcp-sdn-techpreview-serial
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-ovn-dualstack
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-ovn-serial-virtualmedia-bond
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-sdn-bm-upgrade
  • periodic-ci-openshift-release-master-nightly-4.12-upgrade-from-stable-4.11-e2e-metal-ipi-sdn-bm-upgrade
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-sdn-serial-ipv4
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-serial-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-serial-ovn-dualstack
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ipi-upgrade-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.12-upgrade-from-stable-4.11-e2e-metal-ipi-upgrade-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ovn-assisted
  • periodic-ci-openshift-osde2e-main-nightly-4.12-osd-aws
  • periodic-ci-openshift-osde2e-main-nightly-4.12-osd-gcp
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-ovirt-csi
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-ovirt-sdn
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-aws-ovn-proxy
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-metal-ovn-single-node-live-iso
  • periodic-ci-openshift-osde2e-main-nightly-4.12-rosa-classic-sts
  • periodic-ci-openshift-osde2e-main-nightly-4.12-rosa-hcp
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-aws-sdn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-telco5g
  • periodic-ci-openshift-release-master-nightly-4.12-upgrade-from-stable-4.11-e2e-aws-sdn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-vsphere-ovn-csi
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-vsphere-ovn-serial
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-vsphere-ovn-upi
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-vsphere-ovn-upi-serial
  • periodic-ci-openshift-release-master-nightly-4.12-e2e-vsphere-sdn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/18540a80-c058-11ee-99f4-458d03028b58-0

@Elbehery
Copy link
Author

/assign @tjungblu
/assign @hasbro17
/assign @dusk125
/assign @soltysh
/assign @deads2k

@sandeepknd
Copy link

/label cherry-pick-approved

@openshift-ci 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 Feb 12, 2024
Copy link
Member

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

With #245 in, this is safe to land now.
/remove-label jira/invalid-bug
/label jira/valid-bug
/label backport-risk-assessed

@openshift-ci openshift-ci bot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. labels Mar 15, 2024
Copy link
Member

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Mar 15, 2024
Copy link

openshift-ci bot commented Mar 15, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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:

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

@openshift-merge-bot openshift-merge-bot bot merged commit bb82e89 into openshift:openshift-4.12 Mar 15, 2024
7 of 8 checks passed
@openshift-ci-robot
Copy link

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

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

In response to this:

This PR rebases etcd 3.5.12 into openshift-4.12.

This PR has been created by this workflow

  • git rebase --rebase-merges --fork-point v3.5.11 v3.5.12 ( rebasing the changes from upstream 3.5.11 --> 3.5.12 )
  • git cherry-pick dff7db5
  • git cherry-pick 19158c6
  • git cherry-pick 2c14fe6 -m 2

After rebasing, running make locally produce

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

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 Elbehery deleted the rebase-etcd-3.5.12-openshift-4.12 branch March 18, 2024 11:35
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-etcd-container-v4.12.0-202403180808.p0.gbb82e89.assembly.stream.el8 for distgit ose-etcd.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet