Baoyuantop commented on code in PR #12734:
URL: https://github.com/apache/apisix/pull/12734#discussion_r2570816546
##########
apisix/discovery/nacos/init.lua:
##########
@@ -277,69 +288,118 @@ local function is_grpc(scheme)
end
local curr_service_in_use = {}
-local function fetch_full_registry(premature)
- if premature then
- return
- end
- local base_uri, username, password = get_base_uri()
+
+local function fetch_from_host(base_uri, username, password, services)
local token_param, err = get_token_param(base_uri, username, password)
if err then
- log.error('get_token_param error:', err)
- return
+ return false, err
end
- local infos = get_nacos_services()
- if #infos == 0 then
- return
- end
local service_names = {}
- for _, service_info in ipairs(infos) do
- local data, err
+ local nodes_cache = {}
+ local had_success = false
+ local last_err
+
+ for _, service_info in ipairs(services) do
local namespace_id = service_info.namespace_id
local group_name = service_info.group_name
local scheme = service_info.scheme or ''
- local namespace_param = get_namespace_param(service_info.namespace_id)
- local group_name_param = get_group_name_param(service_info.group_name)
- local signature_param = get_signed_param(service_info.group_name,
service_info.service_name)
+ local namespace_param = get_namespace_param(namespace_id)
+ local group_name_param = get_group_name_param(group_name)
+ local signature_param = get_signed_param(group_name,
service_info.service_name)
local query_path = instance_list_path .. service_info.service_name
.. token_param .. namespace_param ..
group_name_param
.. signature_param
- data, err = get_url(base_uri, query_path)
- if err then
- log.error('get_url:', query_path, ' err:', err)
- goto CONTINUE
- end
+ local data, req_err = get_url(base_uri, query_path)
+ if req_err then
+ last_err = req_err
+ log.warn('get_url:', query_path, ' err:', req_err, ', host:',
base_uri)
+ else
+ had_success = true
- local nodes = {}
- local key = get_key(namespace_id, group_name,
service_info.service_name)
- service_names[key] = true
- for _, host in ipairs(data.hosts) do
- local node = {
- host = host.ip,
- port = host.port,
- weight = host.weight or default_weight,
- }
- -- docs:
https://github.com/yidongnan/grpc-spring-boot-starter/pull/496
- if is_grpc(scheme) and host.metadata and host.metadata.gRPC_port
then
- node.port = host.metadata.gRPC_port
+ local key = get_key(namespace_id, group_name,
service_info.service_name)
+ service_names[key] = true
+
+ local hosts = data.hosts
+ if type(hosts) ~= 'table' then
+ hosts = {}
end
- core.table.insert(nodes, node)
- end
- if #nodes > 0 then
- local content = core.json.encode(nodes)
- nacos_dict:set(key, content)
+ local nodes = {}
+ for _, host in ipairs(hosts) do
+ local node = {
+ host = host.ip,
+ port = host.port,
+ weight = host.weight or default_weight,
+ }
+ -- docs:
https://github.com/yidongnan/grpc-spring-boot-starter/pull/496
+ if is_grpc(scheme) and host.metadata and
host.metadata.gRPC_port then
+ node.port = host.metadata.gRPC_port
+ end
+
+ core.table.insert(nodes, node)
+ end
+
+ if #nodes > 0 then
+ nodes_cache[key] = nodes
+ end
end
- ::CONTINUE::
end
- -- remove services that are not in use anymore
+
+ if not had_success then
+ return false, last_err or 'no available nacos services'
+ end
+
+ for key, nodes in pairs(nodes_cache) do
+ local content = core.json.encode(nodes)
+ nacos_dict:set(key, content)
+ end
+
for key, _ in pairs(curr_service_in_use) do
if not service_names[key] then
nacos_dict:delete(key)
end
end
+
curr_service_in_use = service_names
+ return true
+end
+
+
+local function fetch_full_registry(premature)
+ if premature then
+ return
+ end
+
+ local infos = get_nacos_services()
+ if #infos == 0 then
+ return
+ end
+
+ local host_list = local_conf.discovery.nacos.host
+ local host_count = #host_list
+ local start = math_random(host_count)
+ local last_err
+
+ for i = 0, host_count - 1 do
+ local idx = (start + i - 1) % host_count + 1
+ local base_uri, username, password = get_base_uri_by_index(idx)
+
+ if not base_uri then
+ last_err = 'invalid nacos host entry'
+ log.warn('nacos host at index ', idx, ' is invalid, skip')
+ else
+ local ok, err = fetch_from_host(base_uri, username, password,
infos)
+ if ok then
+ return
+ end
+ last_err = err
+ log.warn('fetch_from_host failed from host ', base_uri, ': ', err)
+ end
+ end
+
+ log.error('failed to fetch nacos registry from all hosts: ', last_err)
Review Comment:
I removed `last_err` and now print each error in the loop, and if all errors
occur, I print an error log at the end.
--
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]
