OCPBUGS-28733: Rebase etcd 3.5.12 openshift 4.14 #244
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
[3.5] member replace e2e test
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
bot
added
the
approved
|
/payload 4.14 nightly informing |
|
/payload 4.14 nightly blocking |
|
@Elbehery: trigger 8 job(s) of type blocking for the nightly release of OCP 4.14
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/573266c0-c058-11ee-9b45-94e580a6e422-0 |
|
@Elbehery: trigger 64 job(s) of type informing for the nightly release of OCP 4.14
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/510437b0-c058-11ee-8c55-a51d4ddddb7d-0 |
|
/label cherry-pick-approved |
openshift-ci
bot
added
the
cherry-pick-approved
|
/payload 4.14 nightly informing |
|
/payload 4.14 nightly blocking |
|
@Elbehery: trigger 8 job(s) of type blocking for the nightly release of OCP 4.14
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/652f8ef0-cc11-11ee-8a5d-a7abc0cd880e-0 |
|
@Elbehery: trigger 65 job(s) of type informing for the nightly release of OCP 4.14
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/62c322d0-cc11-11ee-9543-22781385f72d-0 |
|
/label backport-risk-assessed |
openshift-ci
bot
added
backport-risk-assessed
|
[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:
Approvers can indicate their approval by writing |
|
With #243 in, this is safe to land now. |
openshift-ci
bot
added
jira/valid-bug
|
/retest-required |
openshift-merge-bot
bot
merged commit 070ba48
into
openshift:openshift-4.14
7 of 8 checks passed
|
@Elbehery: Jira Issue OCPBUGS-28733: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-28733 has been moved to the MODIFIED state. In response to this:
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. |
|
[ART PR BUILD NOTIFIER] This PR has been included in build ose-etcd-container-v4.14.0-202403191142.p0.g070ba48.assembly.stream.el9 for distgit ose-etcd. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR rebases etcd 3.5.12 into openshift-4.14.
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 )After rebasing, running make locally produce