spacewander commented on a change in pull request #5158:
URL: https://github.com/apache/apisix/pull/5158#discussion_r727948592
##########
File path: apisix/cli/etcd.lua
##########
@@ -206,29 +209,38 @@ function _M.init(env, args)
version_url, err, retry_time))
end
- if not res then
- errmsg = str_format("request etcd endpoint \'%s\' error, %s\n",
version_url, err)
- util.die(errmsg)
- end
+ if res then
+ local body, _, err = dkjson.decode(res)
+ if err or (body and not body["etcdcluster"]) then
+ errmsg = str_format("got malformed version message: \"%s\"
from etcd \"%s\"\n", res,
+ version_url)
+ util.die(errmsg)
+ end
- local body, _, err = dkjson.decode(res)
- if err or (body and not body["etcdcluster"]) then
- errmsg = str_format("got malformed version message: \"%s\" from
etcd \"%s\"\n", res,
- version_url)
- util.die(errmsg)
- end
+ local cluster_version = body["etcdcluster"]
+ if compare_semantic_version(cluster_version, env.min_etcd_version)
then
+ util.die("etcd cluster version ", cluster_version,
+ " is less than the required version ",
env.min_etcd_version,
+ ", please upgrade your etcd cluster\n")
+ end
- local cluster_version = body["etcdcluster"]
- if compare_semantic_version(cluster_version, env.min_etcd_version) then
- util.die("etcd cluster version ", cluster_version,
- " is less than the required version ",
- env.min_etcd_version,
- ", please upgrade your etcd cluster\n")
+ table_insert(etcd_healthy_hosts, host)
+ else
+ io_stderr:write(str_format("request etcd endpoint \'%s\' error,
%s\n", version_url,
+ err))
end
end
+ if #etcd_healthy_hosts <= 0 then
+ util.die("all etcd nodes are unavailable\n")
+ end
+
+ if host_count >= 2 and (#etcd_healthy_hosts / host_count * 100) < 50 then
Review comment:
Is `host_count >= 2` necessary?
##########
File path: apisix/cli/etcd.lua
##########
@@ -206,29 +209,38 @@ function _M.init(env, args)
version_url, err, retry_time))
end
- if not res then
- errmsg = str_format("request etcd endpoint \'%s\' error, %s\n",
version_url, err)
- util.die(errmsg)
- end
+ if res then
+ local body, _, err = dkjson.decode(res)
+ if err or (body and not body["etcdcluster"]) then
+ errmsg = str_format("got malformed version message: \"%s\"
from etcd \"%s\"\n", res,
+ version_url)
+ util.die(errmsg)
+ end
- local body, _, err = dkjson.decode(res)
- if err or (body and not body["etcdcluster"]) then
- errmsg = str_format("got malformed version message: \"%s\" from
etcd \"%s\"\n", res,
- version_url)
- util.die(errmsg)
- end
+ local cluster_version = body["etcdcluster"]
+ if compare_semantic_version(cluster_version, env.min_etcd_version)
then
+ util.die("etcd cluster version ", cluster_version,
+ " is less than the required version ",
env.min_etcd_version,
Review comment:
Bad indent
##########
File path: t/cli/test_etcd_ha.sh
##########
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+ETCD_NAME_0=etcd0
Review comment:
Should we merge it into test_etcd_healthcheck?
##########
File path: apisix/cli/etcd.lua
##########
@@ -206,29 +209,38 @@ function _M.init(env, args)
version_url, err, retry_time))
end
- if not res then
- errmsg = str_format("request etcd endpoint \'%s\' error, %s\n",
version_url, err)
- util.die(errmsg)
- end
+ if res then
+ local body, _, err = dkjson.decode(res)
+ if err or (body and not body["etcdcluster"]) then
+ errmsg = str_format("got malformed version message: \"%s\"
from etcd \"%s\"\n", res,
+ version_url)
+ util.die(errmsg)
+ end
- local body, _, err = dkjson.decode(res)
- if err or (body and not body["etcdcluster"]) then
- errmsg = str_format("got malformed version message: \"%s\" from
etcd \"%s\"\n", res,
- version_url)
- util.die(errmsg)
- end
+ local cluster_version = body["etcdcluster"]
+ if compare_semantic_version(cluster_version, env.min_etcd_version)
then
+ util.die("etcd cluster version ", cluster_version,
+ " is less than the required version ",
env.min_etcd_version,
+ ", please upgrade your etcd cluster\n")
+ end
- local cluster_version = body["etcdcluster"]
- if compare_semantic_version(cluster_version, env.min_etcd_version) then
- util.die("etcd cluster version ", cluster_version,
- " is less than the required version ",
- env.min_etcd_version,
- ", please upgrade your etcd cluster\n")
+ table_insert(etcd_healthy_hosts, host)
+ else
+ io_stderr:write(str_format("request etcd endpoint \'%s\' error,
%s\n", version_url,
+ err))
end
end
+ if #etcd_healthy_hosts <= 0 then
+ util.die("all etcd nodes are unavailable\n")
+ end
+
+ if host_count >= 2 and (#etcd_healthy_hosts / host_count * 100) < 50 then
+ util.die("the etcd cluster needs at least 50% and above healthy
nodes\n")
Review comment:
We need > 50%, not just >= 50%
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
