refactor: add healthcheck manager to decouple upstream

apisix/balancer.lua

@@ -19,6 +19,7 @@ local balancer          = require("ngx.balancer")
 local core              = require("apisix.core")
 local priority_balancer = require("apisix.balancer.priority")
 local apisix_upstream   = require("apisix.upstream")
+local healthcheck_manager = require("apisix.healthcheck_manager")
 local ipairs            = ipairs
 local is_http           = ngx.config.subsystem == "http"
 local enable_keepalive = balancer.enable_keepalive and is_http
@@ -28,7 +29,6 @@ local set_timeouts     = balancer.set_timeouts
 local ngx_now          = ngx.now
 local str_byte         = string.byte
 
-
 local module_name = "balancer"
 local pickers = {}
 
@@ -75,7 +75,8 @@ local function fetch_health_nodes(upstream, checker)
     local port = upstream.checks and upstream.checks.active and upstream.checks.active.port
     local up_nodes = core.table.new(0, #nodes)
     for _, node in ipairs(nodes) do
-        local ok, err = checker:get_target_status(node.host, port or node.port, host)
+        local ok, err = healthcheck_manager.fetch_node_status(checker,
+                                             node.host, port or node.port, host)
         if ok then
             up_nodes = transform_node(up_nodes, node)
         elseif err then

apisix/control/v1.lua

@@ -20,6 +20,7 @@ local plugin = require("apisix.plugin")
 local get_routes = require("apisix.router").http_routes
 local get_services = require("apisix.http.service").services
 local upstream_mod = require("apisix.upstream")
+local healthcheck_manager = require("apisix.healthcheck_manager")
 local get_upstreams = upstream_mod.upstreams
 local collectgarbage = collectgarbage
 local ipairs = ipairs
@@ -66,14 +67,13 @@ function _M.schema()
     return 200, schema
 end
 
-
 local healthcheck
 local function extra_checker_info(value)
     if not healthcheck then
         healthcheck = require("resty.healthcheck")
     end
 
-    local name = upstream_mod.get_healthchecker_name(value)
+    local name = healthcheck_manager.get_healthchecker_name(value.value)
     local nodes, err = healthcheck.get_target_list(name, "upstream-healthcheck")
     if err then
         core.log.error("healthcheck.get_target_list failed: ", err)
@@ -214,7 +214,6 @@ local function iter_and_find_healthcheck_info(values, src_type, src_id)
             if not checks then
                 return nil, str_format("no checker for %s[%s]", src_type, src_id)
             end
-
             local info = extra_checker_info(value)
             info.type = get_checker_type(checks)
             return info
@@ -249,7 +248,6 @@ function _M.get_health_checker()
     if not info then
         return 404, {error_msg = err}
     end
-
     local out, err = try_render_html({stats={info}})
     if out then
         core.response.set_header("Content-Type", "text/html")
@@ -266,9 +264,6 @@ local function iter_add_get_routes_info(values, route_id)
     local infos = {}
     for _, route in core.config_util.iterate_values(values) do
         local new_route = core.table.deepcopy(route)
-        if new_route.value.upstream and new_route.value.upstream.parent then
-            new_route.value.upstream.parent = nil
-        end
         -- remove healthcheck info
         new_route.checker = nil
         new_route.checker_idx = nil
@@ -312,9 +307,6 @@ local function iter_add_get_upstream_info(values, upstream_id)
     for _, upstream in core.config_util.iterate_values(values) do
         local new_upstream = core.table.deepcopy(upstream)
         core.table.insert(infos, new_upstream)
-        if new_upstream.value and new_upstream.value.parent then
-            new_upstream.value.parent = nil
-        end
         -- check the upstream id
         if upstream_id and upstream.value.id == upstream_id then
             return new_upstream
@@ -332,6 +324,7 @@ function _M.dump_all_upstreams_info()
     return 200, infos
 end
 
+
 function _M.dump_upstream_info()
     local upstreams = get_upstreams()
     local uri_segs = core.utils.split_uri(ngx_var.uri)
@@ -354,9 +347,6 @@ local function iter_add_get_services_info(values, svc_id)
     local infos = {}
     for _, svc in core.config_util.iterate_values(values) do
         local new_svc = core.table.deepcopy(svc)
-        if new_svc.value.upstream and new_svc.value.upstream.parent then
-            new_svc.value.upstream.parent = nil
-        end
         -- remove healthcheck info
         new_svc.checker = nil
         new_svc.checker_idx = nil