WIP: Merging upstream release 3.5 #114
Closed
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
…of-#13145-etcd-io#13237-origin-release-3.5 [backport 3.5]: Automated cherry pick of etcd-io#13145 etcd-io#13237
Stop using tip golang version in CI
…ckend out of sync
Fix for v3.5 Ensure that cluster members stored in v2store and backend are in sync
prefixArgs uses os.Setenv in e2e tests instead envMap. This creates overwrites in some test cases and have an impact on test quality and isolation between tests. This PR uses ctlcontext envMap in each tests with high priority and merges os environment variables with low priority.
Cherry pick "Fix http2 authority header in single endpoint scenario" to release-3.5
fixes: CVE-2021-3711, CVE-2021-35942, CVE-2019-9893 Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
[release-3.5] Dockerfile: bump debian bullseye-20210927
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
storage/backend: Add a gauge to indicate if defrag is active (backport)
… by multiple peers
cherry-pick to 3.5 from etcd-io#13467 exclude the same alarm type activated by multiple peers
…ying To fix a bug in the retry logic caused when the auth token is cleared after receiving `ErrInvalidAuthToken` from the server and the subsequent call to `getToken` also fails due to some reason (eg. context deadline exceeded). This leaves the client without a token and the retry will continue to fail with `ErrUserEmpty` unless the token is refreshed.
Backport PR 13308 to release-3.5
Current checkpointing mechanism is buggy. New checkpoints for any lease are scheduled only until the first leader change. Added fix for that and a test that will check it.
…heck [3.5] enhance health check endpoint to support serializable request
porting back from 3.5 from main PR etcd-io#13334
*: fix IsOptsWithFromKey
…cimal [3.5] Always print raft term in decimal when displaying member list in json
server/storage/backend: restore original bolt db options after defrag
backport 3.5: etcd-io#13676 load all leases from backend
Fix offline defrag in etcdctl
This should make it easier to bump the golang version
[release-3.5] Update go to 1.16.15
Signed-off-by: Manuel Rüger <manuel@rueg.eu>
[Release-3.5] Makefile: Fix wrong target
This fixes problem where logs json changes format of timestamp.
[release-3.5] Fix inconsistent log format
[release-v3.5] server: Add verification of whether lock was called within out outsid…
[release-3.5] go.mod: Upgrade to prometheus/client_golang v1.11.1
…rease Reason to store CI and term in backend was to make db fully independent snapshot, it was never meant to interfere with apply logic. Skip of CI was introduced for v2->v3 migration where we wanted to prevent it from decreasing when replaying wal in etcd-io#5391. By mistake it was added to apply flow during refactor in etcd-io#12855 (comment). Consistency index and term should only be negotiated and used by raft to make decisions. Their values should only driven by raft state machine and backend should only be responsible for storing them.
[release-3.5] server: Save consistency index and term to backend even when they decrease
openshift-ci
bot
added
the
do-not-merge/work-in-progress
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: dusk125 The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
This matched the diff I got rebuilding. Great. |
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.
Preparing for merging upstream release 3.5; this is WIP as upstream 3.5.3 has not dropped yet.
This was created by rebasing upstream/release-3.5 onto os/release-3.5 as they directly share a history, os/release-3.5 was just behind.