Skip to content

[bugfix(CLI)]: check whether the user has enabled etcd v2 protocol. #1665

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

Merged
merged 5 commits into from
Jun 9, 2020
Merged

[bugfix(CLI)]: check whether the user has enabled etcd v2 protocol. #1665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd2eb52
check if the user has enabled etcd v2 protocol
dabue Jun 7, 2020
6fa3655
update the etcd v2 check.
dabue Jun 8, 2020
620df23
use std_err
dabue Jun 8, 2020
75e85e7
use io.stderr
dabue Jun 9, 2020
5f134b4
recorrect the format
dabue Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis/apisix_cli_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,4 +115,4 @@ fi

set -ex

echo "rollback to the default admin config"
echo "passed: rollback to the default admin config"
11 changes: 11 additions & 0 deletions bin/apisix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,17 @@ local function init_etcd(show_output)

local host_count = #(yaml_conf.etcd.host)

-- check whether the user has enabled etcd v2 protocol
for index, host in ipairs(yaml_conf.etcd.host) do
uri = host .. "/v2/keys"
local cmd = "curl -i -m ".. timeout * 2 .. " -o /dev/null -s -w %{http_code} " .. uri
local res = excute_cmd(cmd)
if res == "404" then
io.stderr:write(string.format("failed: please make sure that you have enabled the v2 protocol of etcd on %s.\n", host))
return
end
end

local etcd_ok = false
for index, host in ipairs(yaml_conf.etcd.host) do

Expand Down