hnlq715 commented on a change in pull request #3300:
URL: https://github.com/apache/apisix/pull/3300#discussion_r566542656
##########
File path: apisix/balancer/ewma.lua
##########
@@ -119,38 +137,75 @@ local function _trans_format(up_nodes)
return next(peers) and peers or nil
end
-
local function _ewma_find(ctx, up_nodes)
local peers
- local endpoint
- if not up_nodes
- or core.table.nkeys(up_nodes) == 0 then
+ if not up_nodes or nkeys(up_nodes) == 0 then
return nil, 'up_nodes empty'
end
- peers = lrucache_trans_format(ctx.upstream_key, ctx.upstream_version,
- _trans_format, up_nodes)
+ if ctx.balancer_tried_servers and ctx.balancer_tried_servers_count ==
nkeys(up_nodes) then
+ return nil, "all upstream servers tried"
+ end
+
+ peers = lrucache_trans_format(ctx.upstream_key, ctx.upstream_version,
_trans_format, up_nodes)
if not peers then
return nil, 'up_nodes trans error'
end
- if #peers > 1 then
- endpoint = pick_and_score(peers)
- else
- endpoint = peers[1]
+ local filtered_peers
+ for _, peer in ipairs(peers) do
+ if ctx.balancer_tried_servers then
+ if not ctx.balancer_tried_servers[get_upstream_name(peer)] then
+ if not filtered_peers then
+ filtered_peers = {}
+ end
+
+ table_insert(filtered_peers, peer)
+ end
+ end
end
- return endpoint.host .. ":" .. endpoint.port
-end
+ if not filtered_peers then
+ core.log.warn("all endpoints have been retried")
Review comment:
done
##########
File path: apisix/balancer/ewma.lua
##########
@@ -119,38 +137,75 @@ local function _trans_format(up_nodes)
return next(peers) and peers or nil
end
-
local function _ewma_find(ctx, up_nodes)
local peers
- local endpoint
- if not up_nodes
- or core.table.nkeys(up_nodes) == 0 then
+ if not up_nodes or nkeys(up_nodes) == 0 then
return nil, 'up_nodes empty'
end
- peers = lrucache_trans_format(ctx.upstream_key, ctx.upstream_version,
- _trans_format, up_nodes)
+ if ctx.balancer_tried_servers and ctx.balancer_tried_servers_count ==
nkeys(up_nodes) then
+ return nil, "all upstream servers tried"
+ end
+
+ peers = lrucache_trans_format(ctx.upstream_key, ctx.upstream_version,
_trans_format, up_nodes)
if not peers then
return nil, 'up_nodes trans error'
end
- if #peers > 1 then
- endpoint = pick_and_score(peers)
- else
- endpoint = peers[1]
+ local filtered_peers
+ for _, peer in ipairs(peers) do
+ if ctx.balancer_tried_servers then
Review comment:
done
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
