Skip to content

Commit

Permalink
change(etcd): the health_check_retry should be named as startup_retry (
Browse files Browse the repository at this point in the history
…apache#7304)

As it only affects the startup.

Signed-off-by: spacewander <spacewanderlzx@gmail.com>
  • Loading branch information
spacewander authored and Liu-Junlin committed Nov 4, 2022
1 parent 86930c6 commit 50bb124
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions apisix/cli/etcd.lua
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,10 @@ function _M.init(env, args)
local res, err
local retry_time = 0

local health_check_retry = tonumber(yaml_conf.etcd.health_check_retry) or 2
while retry_time < health_check_retry do
local etcd = yaml_conf.etcd
-- TODO: remove deprecated health_check_retry option in APISIX v3
local max_retry = tonumber(etcd.startup_retry or etcd.health_check_retry) or 2
while retry_time < max_retry do
res, err = request(version_url, yaml_conf)
-- In case of failure, request returns nil followed by an error message.
-- Else the first return value is the response body
Expand Down
2 changes: 1 addition & 1 deletion conf/config-default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ etcd:
timeout: 30 # 30 seconds
#resync_delay: 5 # when sync failed and a rest is needed, resync after the configured seconds plus 50% random jitter
#health_check_timeout: 10 # etcd retry the unhealthy nodes after the configured seconds
health_check_retry: 2 # etcd retry time that only affects the health check, default 2
startup_retry: 2 # the number of retry to etcd during the startup, default to 2
#user: root # root username for etcd
#password: 5tHkHhYkjr6cQY # root password for etcd
tls:
Expand Down

0 comments on commit 50bb124

Please sign in to comment.