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-947: Rebase openshift/etcd 4.11 onto 3.5.5 #154

Closed
wants to merge 1,203 commits into from

Conversation

tjungblu
Copy link

@tjungblu tjungblu commented Oct 10, 2022

This was rebased with:

git rebase --rebase-merges --fork-point v3.5.3 v3.5.5
git merge openshift/openshift-4.11

same as #144

ptabor and others added 30 commits July 28, 2021 15:05
…s, as they are taken care by hook.

missing after 3.5.0 merge
missing after merge of v3.5.0 tag

Thanks to this change:
  - all the maps bucket -> buffer are indexed by int's instead of
string. No need to do: byte[] -> string -> hash conversion on each
access.
  - buckets are strongly typed in backend/mvcc API.
…to a role

Missing after v3.5.0 tag merge

Prevent etcd from crashing when given a bad grant payload, e.g.:

$ curl -d '{"name": "foo"}' http://localhost:2379/v3/auth/role/add
{"header":{"cluster_id":"14841639068965178418", ...
$ curl -d '{"name": "foo"}' http://localhost:2379/v3/auth/role/grant
curl: (52) Empty reply from server

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
… is a distributed"

Correcting a typo from 2f10964 (version: openshift-v4.0, 2018-11-29).
…operly copied from build.

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
…se-3.3

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
make build performs a sanity test on the binary image which causes problems for unsupport arch. Because we run full CI tests against the image this check is not nessisary and will allow images to be build regardless of arch.

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
…ember but memberDir exists, go ahead and start.
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
…dling when we dont scale member

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
…s not part of member list and dataDir exists

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
serathius and others added 19 commits September 7, 2022 15:11
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
This has been additionally verified by running the tests locally as a
basic smoke test. GitHub Actions doesn't provide MacOS M1 (arm64) yet,
so there's no good way to automate testing.

Ran `TMPDIR=/tmp make test` locally. The `TMPDIR` bit is needed so
there's no really long path used that breaks Unix socket setup in one of
the tests.

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
- permissions were incorrectly loaded on restarts.
- etcd-io#14355
- Backport of etcd-io#14358

Signed-off-by: vivekpatani <9080894+vivekpatani@users.noreply.github.com>
[release-3.5] server,test: refresh cache on each NewAuthStore
[release-3.5] server/etcdmain: add build support for Apple M1
A WAL object was closed by defer, however the WAL was rewritten afterwards,
so defer closed already closed WAL but not the new one. It caused a data
race between writing file and cleaning up a temporary test directory,
which led to a non-deterministic bug.

Fixes etcd-io#14332

Signed-off-by: Vladimir Sokolov <vsvastey@gmail.com>
…-max-index-test-fix-3.5

[release-3.5] testing: fix TestOpenWithMaxIndex cleanup
Due to a duplicate call of clientConfigFromCmd, the move-leader command
would fail with "conflicting environment variable is shadowed by corresponding command-line flag".
Also in scenarios where no command-line flag was supplied.

Signed-off-by: Thomas Jungblut <tjungblu@redhat.com>
etcdctl: allow move-leader to connect to multiple endpoints
[3.5] server: don't panic in readonly serializable txn
Signed-off-by: Benjamin Wang <wachao@vmware.com>
…er_20220913_3.5

[release-3.5] fix the flaky test TestV3AuthRestartMember
@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Oct 10, 2022
@openshift-ci-robot
Copy link

@tjungblu: This pull request references Jira Issue OCPBUGS-947, which is invalid:

  • expected the bug to target the "4.12.0" version, but it targets "4.11.z" 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.

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

In response to this:

This was rebased with:

git rebase --rebase-merges --fork-point v3.5.3 v3.5.5

same as #144

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 kubernetes/test-infra repository.

@tjungblu tjungblu closed this Oct 10, 2022
@openshift-ci-robot
Copy link

@tjungblu: This pull request references Jira Issue OCPBUGS-947. The bug has been updated to no longer refer to the pull request using the external bug tracker.

In response to this:

This was rebased with:

git rebase --rebase-merges --fork-point v3.5.3 v3.5.5
git merge openshift/openshift-4.11

same as #144

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 kubernetes/test-infra repository.

@openshift-ci-robot
Copy link

@tjungblu: This pull request references Jira Issue OCPBUGS-947, which is invalid:

  • expected the bug to target the "4.12.0" version, but it targets "4.11.z" 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 was rebased with:

git rebase --rebase-merges --fork-point v3.5.3 v3.5.5
git merge openshift/openshift-4.11

same as #144

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 kubernetes/test-infra repository.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 10, 2022
@openshift-merge-robot
Copy link

@tjungblu: PR needs rebase.

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 kubernetes/test-infra repository.

@openshift-ci
Copy link

openshift-ci bot commented Oct 10, 2022

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: tjungblu

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

1 similar comment
@openshift-ci
Copy link

openshift-ci bot commented Oct 10, 2022

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: tjungblu

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tjungblu tjungblu deleted the rebase-3.5.5-forkpoint-4.11 branch October 24, 2022 10:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet