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

WIP: Merging upstream release 3.5 #114

Closed
wants to merge 67 commits into from

Commits on Jul 29, 2021

  1. Configuration menu
    Copy the full SHA
    dfd2fea View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    627d91c View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2021

  1. Merge pull request etcd-io#13257 from tangcong/automated-cherry-pick-…

    …of-#13145-etcd-io#13237-origin-release-3.5
    
    [backport 3.5]: Automated cherry pick of etcd-io#13145 etcd-io#13237
    hexfusion committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    2fe94b1 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2021

  1. Configuration menu
    Copy the full SHA
    921f78d View commit details
    Browse the repository at this point in the history
  2. Merge pull request etcd-io#13349 from serathius/tip-3.5

    Stop using tip golang version in CI
    hexfusion committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    d7eeda0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e68c7ab View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2021

  1. Merge pull request etcd-io#13348 from serathius/sync

    Fix for v3.5 Ensure that cluster members stored in v2store and backend are in sync
    ptabor committed Sep 25, 2021
    Configuration menu
    Copy the full SHA
    4312298 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2021

  1. Decouple prefixArgs from os.Env dependency

    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.
    ardaguclu authored and serathius committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    6e2fe84 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c1f48d8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    994bd08 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f324894 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0bac49b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7272a95 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    6e04e8a View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    58d2b12 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    7f25a50 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    79f9a45 View commit details
    Browse the repository at this point in the history
  11. Merge pull request etcd-io#13375 from serathius/authority-3.5

    Cherry pick "Fix http2 authority header in single endpoint scenario" to release-3.5
    ptabor committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    edb3b5a View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2021

  1. Dockerfile: bump debian bullseye-20210927

    fixes: CVE-2021-3711, CVE-2021-35942, CVE-2019-9893
    
    Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
    hexfusion committed Oct 1, 2021
    Configuration menu
    Copy the full SHA
    bad9a52 View commit details
    Browse the repository at this point in the history
  2. Merge pull request etcd-io#13380 from hexfusion/cp-13376

    [release-3.5] Dockerfile: bump debian bullseye-20210927
    hexfusion committed Oct 1, 2021
    Configuration menu
    Copy the full SHA
    ec56229 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2021

  1. version: 3.5.1

    Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
    hexfusion committed Oct 3, 2021
    Configuration menu
    Copy the full SHA
    d42e858 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2021

  1. storage/backend: Add a gauge to indicate if defrag is active (backpor…

    …t from 3.6)
    Geeta Gharpure committed Oct 6, 2021
    Configuration menu
    Copy the full SHA
    446f7d6 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2021

  1. Merge pull request etcd-io#13395 from geetasg/release-3.5

    storage/backend: Add a gauge to indicate if defrag is active (backport)
    ptabor committed Oct 7, 2021
    Configuration menu
    Copy the full SHA
    e8732fb View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2021

  1. Configuration menu
    Copy the full SHA
    7d44a7c View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2021

  1. Merge pull request etcd-io#13476 from chaochn47/backport-release-3.5

    cherry-pick to 3.5 from etcd-io#13467 exclude the same alarm type activated by multiple peers
    hexfusion committed Nov 14, 2021
    Configuration menu
    Copy the full SHA
    77d760b View commit details
    Browse the repository at this point in the history
  2. client/v3: refresh the token when ErrUserEmpty is received while retr…

    …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.
    r-ashish authored and mitake committed Nov 14, 2021
    Configuration menu
    Copy the full SHA
    79bbc8f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    dec6f72 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2021

  1. Merge pull request etcd-io#13477 from mitake/backport-13308-to-3.5

    Backport PR 13308 to release-3.5
    hexfusion committed Nov 21, 2021
    Configuration menu
    Copy the full SHA
    eac7f98 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2021

  1. Configuration menu
    Copy the full SHA
    8c81598 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2021

  1. lease,integration: add checkpoint scheduling after leader change

    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.
    michaljasionowski authored and serathius committed Dec 2, 2021
    Configuration menu
    Copy the full SHA
    21634a9 View commit details
    Browse the repository at this point in the history
  2. etcdserver,integration: Store remaining TTL on checkpoint

    To extend lease checkpointing mechanism to cases when the whole etcd
    cluster is restarted.
    michaljasionowski authored and serathius committed Dec 2, 2021
    Configuration menu
    Copy the full SHA
    eddfb42 View commit details
    Browse the repository at this point in the history
  3. server: Require either cluster version v3.6 or --experimental-enable-…

    …lease-checkpoint-persist to persist lease remainingTTL
    
    To avoid inconsistant behavior during cluster upgrade we are feature
    gating persistance behind cluster version. This should ensure that
    all cluster members are upgraded to v3.6 before changing behavior.
    
    To allow backporting this fix to v3.5 we are also introducing flag
    --experimental-enable-lease-checkpoint-persist that will allow for
    smooth upgrade in v3.5 clusters with this feature enabled.
    serathius committed Dec 2, 2021
    Configuration menu
    Copy the full SHA
    d00e89d View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2021

  1. Merge pull request etcd-io#13515 from serathius/checkpoints-fix-3.5

    Backport Lease Checkpoints fix to release-3.5
    ptabor committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    e84c611 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2021

  1. Merge pull request etcd-io#13501 from ahrtr/reset_ci_after_reload_db_3.5

    [3.5] Set the backend again after recovering v3 backend from snapshot
    ptabor committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    73080a7 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2021

  1. fix runlock bug

    leoyang.yl authored and michaljasionowski committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    55c16df View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2021

  1. Merge pull request etcd-io#13541 from michaljasionowski/backport-runl…

    …ock-fix
    
    Backport watchablestore runlock bug fix to release-3.5
    ptabor committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    7291ed3 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2022

  1. Configuration menu
    Copy the full SHA
    74f33d6 View commit details
    Browse the repository at this point in the history
  2. Merge pull request etcd-io#13616 from ptabor/20220117-update-yaml

    Update dep: gopkg.in/yaml.v2 v2.2.8 -> v2.4.0 due to: CVE-2019-11254 [release 3.5]
    ptabor committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    a624446 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2022

  1. version: bump up to 3.5.2

    serathius committed Feb 1, 2022
    Configuration menu
    Copy the full SHA
    99018a7 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2022

  1. server/storage/backend: restore original bolt db options after defrag

    Problem: Defrag was implemented before custom bolt options were added.
    Currently defrag doesn't restore backend options.
    For example BackendFreelistType will be unset after defrag.
    
    Solution: save bolt db options and use them in defrag.
    Bogdan Kanivets committed Feb 15, 2022
    Configuration menu
    Copy the full SHA
    631fa6f View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2022

  1. Configuration menu
    Copy the full SHA
    7db1051 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2022

  1. Configuration menu
    Copy the full SHA
    4f51cc1 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2022

  1. Merge pull request etcd-io#13714 from ahrtr/3.5_correct_dns_etcd_client

    [3.5] Trim the suffix dot from the srv.Target for etcd-client DNS lookup
    serathius committed Feb 20, 2022
    Configuration menu
    Copy the full SHA
    31c8e3c View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2022

  1. Merge pull request etcd-io#13706 from ahrtr/3.5-serializable_health_c…

    …heck
    
    [3.5] enhance health check endpoint to support serializable request
    serathius committed Feb 21, 2022
    Configuration menu
    Copy the full SHA
    fa191c6 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2022

  1. Configuration menu
    Copy the full SHA
    7345d42 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f634b44 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2022

  1. *: fix IsOptsWithFromKey

    porting back from 3.5 from main
    PR etcd-io#13334
    leoyang.yl authored and Vivek Patani committed Feb 24, 2022
    Configuration menu
    Copy the full SHA
    7cec92a View commit details
    Browse the repository at this point in the history
  2. Merge pull request etcd-io#13736 from vivekpatani/release-3.5

    *: fix IsOptsWithFromKey
    ptabor committed Feb 24, 2022
    Configuration menu
    Copy the full SHA
    1eb8b6a View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2022

  1. Merge pull request etcd-io#13727 from ahrtr/3.5_print_raft_term_in_de…

    …cimal
    
    [3.5] Always print raft term in decimal when displaying member list in json
    ptabor committed Feb 25, 2022
    Configuration menu
    Copy the full SHA
    3c2ef71 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2022

  1. Merge pull request etcd-io#13701 from lavacat/defrag-bopts-fix-3.5

    server/storage/backend: restore original bolt db options after defrag
    serathius committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    541635e View commit details
    Browse the repository at this point in the history
  2. Merge pull request etcd-io#13726 from chaochn47/backport_13676_to_3_5

    backport 3.5: etcd-io#13676 load all leases from backend
    serathius committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    39baf36 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2022

  1. Fix offline defrag

    kkkkun committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    58374b8 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2022

  1. Merge pull request etcd-io#13792 from kkkkun/fix-offline-defrag

    Fix offline defrag in etcdctl
    serathius committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    d516134 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2022

  1. Update to go 1.16.15

    mrueg committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    1801ef8 View commit details
    Browse the repository at this point in the history
  2. Build locally if docker-test container image does not exist

    This should make it easier to bump the golang version
    mrueg committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    c51c8d2 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2022

  1. Merge pull request etcd-io#13832 from mrueg/rel-3.5-go-1.16.15

    [release-3.5] Update go to 1.16.15
    serathius committed Mar 23, 2022
    Configuration menu
    Copy the full SHA
    fed325a View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2022

  1. Makefile: Fix wrong target

    Signed-off-by: Manuel Rüger <manuel@rueg.eu>
    mrueg committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    462aefd View commit details
    Browse the repository at this point in the history
  2. Merge pull request etcd-io#13858 from mrueg/release-3.5-fix-make

    [Release-3.5] Makefile: Fix wrong target
    ptabor committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    12ceac6 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2022

  1. Configuration menu
    Copy the full SHA
    25556a0 View commit details
    Browse the repository at this point in the history
  2. server: Use default logging configuration instead of zap production one

    This fixes problem where logs json changes format of timestamp.
    serathius committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    a060b42 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2022

  1. Merge pull request etcd-io#13866 from serathius/logs-v3.5

    [release-3.5] Fix inconsistent log format
    serathius committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    8b9ce3e View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2022

  1. Configuration menu
    Copy the full SHA
    3b8c651 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2022

  1. Configuration menu
    Copy the full SHA
    83538f3 View commit details
    Browse the repository at this point in the history
  2. Merge pull request etcd-io#13887 from serathius/verify-v3.5

    [release-v3.5] server: Add verification of whether lock was called within out outsid…
    ptabor committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    5f19688 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2022

  1. Merge pull request etcd-io#13895 from mrueg/rel3.5-client_golang

    [release-3.5] go.mod: Upgrade to prometheus/client_golang v1.11.1
    serathius committed Apr 7, 2022
    Configuration menu
    Copy the full SHA
    238b18c View commit details
    Browse the repository at this point in the history
  2. server: Save consistency index and term to backend even when they dec…

    …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.
    serathius committed Apr 7, 2022
    Configuration menu
    Copy the full SHA
    780ec33 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2022

  1. Merge pull request etcd-io#13904 from serathius/term-v3.5

    [release-3.5] server: Save consistency index and term to backend even when they decrease
    serathius committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    3ace622 View commit details
    Browse the repository at this point in the history