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.

Sign up for GitHub

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

Jump to bottom

feat: enable etcd health-check #4191

Merged
merged 27 commits into from
Jun 30, 2021
Merged

feat: enable etcd health-check #4191

merged 27 commits into from
Jun 30, 2021

Commits on May 6, 2021

  1. fix: enable etcd health-check, so one etcd node failure would not mak… 

    …e apisix fail

Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed May 6, 2021
    Configuration menu
    Copy the full SHA
    5b9fc40 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/apache/incubator-apisix i… 

    …nto fix/etcd-retry
    @Yiyiyimu
    Yiyiyimu committed May 6, 2021
    Configuration menu
    Copy the full SHA
    83a1a31 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2021

  1. fix lint 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed May 7, 2021
    Configuration menu
    Copy the full SHA
    c42c307 View commit details
    Browse the repository at this point in the history

  2. fix: move init health check away from config_etcd init, to make it wo… 

    …rks in stream mode

Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed May 7, 2021
    Configuration menu
    Copy the full SHA
    eede91f View commit details
    Browse the repository at this point in the history

Commits on May 8, 2021

  1. fix lint 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed May 8, 2021
    Configuration menu
    Copy the full SHA
    803389f View commit details
    Browse the repository at this point in the history

Commits on May 10, 2021

  1. add test 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed May 10, 2021
    Configuration menu
    Copy the full SHA
    feccb69 View commit details
    Browse the repository at this point in the history

  2. fix typo 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed May 10, 2021
    Configuration menu
    Copy the full SHA
    21fae75 View commit details
    Browse the repository at this point in the history

  3. turn health_check init error log level to warn, so stream init would … 

    …not been blocked

Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed May 10, 2021
    Configuration menu
    Copy the full SHA
    1c32984 View commit details
    Browse the repository at this point in the history

  4. compatible with etcd return format 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed May 10, 2021
    Configuration menu
    Copy the full SHA
    3c03ffe View commit details
    Browse the repository at this point in the history

  5. fix lint 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed May 10, 2021
    Configuration menu
    Copy the full SHA
    e91d5af View commit details
    Browse the repository at this point in the history

  6. fix privilige 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed May 10, 2021
    Configuration menu
    Copy the full SHA
    acd2528 View commit details
    Browse the repository at this point in the history

  7. fix docker compose file path 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed May 10, 2021
    Configuration menu
    Copy the full SHA
    78790e1 View commit details
    Browse the repository at this point in the history

  8. fix docker compose command 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed May 10, 2021
    Configuration menu
    Copy the full SHA
    f598b3c View commit details
    Browse the repository at this point in the history

  9. fix docker compose command 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed May 10, 2021
    Configuration menu
    Copy the full SHA
    4f794de View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2021

  1. Merge branch 'master' of https://github.com/apache/incubator-apisix i… 

    …nto fix/etcd-retry
    @Yiyiyimu
    Yiyiyimu committed Jun 2, 2021
    Configuration menu
    Copy the full SHA
    3cf74c0 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2021

  1. forcely generate new etcd client when needed 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    d3954fc View commit details
    Browse the repository at this point in the history

  2. test: change to kill etcd-1 since new etcd client would use it as fir… 

    …st etcd endpoint

Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    5bc39f6 View commit details
    Browse the repository at this point in the history

  3. add more logs 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    30d9146 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2021

  1. no need to get new etcd client 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    742c543 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2021

  1. move one-node-down retry to lua-resty-etcd 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    f1790f0 View commit details
    Browse the repository at this point in the history

  2. fix lint 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    14f6006 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2021

  1. update etcd to v1.5.3 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    49b2121 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2021

  1. make etcd health check timeout configurable 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    36561c1 View commit details
    Browse the repository at this point in the history

  2. test both the first and second etcd endpoint due to the original endp… 

    …oint choose problem in etcd (https://github.com/api7/lua-resty-etcd/pull/131\#discussion_r655804238)

Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    aefe2d6 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2021

  1. fix test 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    bb577f6 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2021

  1. remove loop increment 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed Jun 29, 2021
    Configuration menu
    Copy the full SHA
    043eafc View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2021

  1. avoid keep nginx timer too long time 

    Signed-off-by: yiyiyimu <wosoyoung@gmail.com>
    @Yiyiyimu
    Yiyiyimu committed Jun 30, 2021
    Configuration menu
    Copy the full SHA
    091b194 View commit details
    Browse the repository at this point in the history