[apisix] branch master updated: fix: checker leak for domain nodes (#9090)

[sp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

spacewander pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new 8e9c051db fix: checker leak for domain nodes (#9090)
8e9c051db is described below

commit 8e9c051db20353a09aa843124fae9569b2d4d9ff
Author: jinhua luo <ho...@163.com>
AuthorDate: Tue Mar 21 09:21:13 2023 +0800

    fix: checker leak for domain nodes (#9090)
---
 apisix/init.lua                  |  12 +++--
 t/node/healthcheck-leak-bugfix.t | 112 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+), 3 deletions(-)

diff --git a/apisix/init.lua b/apisix/init.lua
index 388af426e..aef5b7ebe 100644
--- a/apisix/init.lua
+++ b/apisix/init.lua
@@ -223,9 +223,15 @@ local function parse_domain_in_route(route)
     -- don't modify the modifiedIndex to avoid plugin cache miss because of DNS resolve result
     -- has changed
 
-    -- Here we copy the whole route instead of part of it,
-    -- so that we can avoid going back from route.value to route during copying.
-    route.dns_value = core.table.deepcopy(route).value
+    local parent = route.value.upstream.parent
+    if parent then
+        route.value.upstream.parent = nil
+    end
+    route.dns_value = core.table.deepcopy(route.value)
+    if parent then
+        route.value.upstream.parent = parent
+        route.dns_value.upstream.parent = parent
+    end
     route.dns_value.upstream.nodes = new_nodes
     core.log.info("parse route which contain domain: ",
                   core.json.delay_encode(route, true))
diff --git a/t/node/healthcheck-leak-bugfix.t b/t/node/healthcheck-leak-bugfix.t
new file mode 100644
index 000000000..d3ada8c17
--- /dev/null
+++ b/t/node/healthcheck-leak-bugfix.t
@@ -0,0 +1,112 @@
+#
+# 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.
+#
+use t::APISIX 'no_plan';
+
+repeat_each(1);
+log_level('warn');
+no_root_location();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: ensure the old check is cleared after configuration updated
+--- extra_init_worker_by_lua
+    local healthcheck = require("resty.healthcheck")
+    local new = healthcheck.new
+    healthcheck.new = function(...)
+        local obj = new(...)
+        local clear = obj.clear
+        obj.clear = function(...)
+            ngx.log(ngx.WARN, "clear checker")
+            return clear(...)
+        end
+        return obj
+    end
+
+--- extra_init_by_lua
+    local utils = require("apisix.core.utils")
+    local count = 0
+    utils.dns_parse = function (domain)  -- mock: DNS parser
+        count = count + 1
+        if domain == "test1.com" then
+            return {address = "127.0.0." .. count}
+        end
+        if domain == "test2.com" then
+            return {address = "127.0.0." .. count+100}
+        end
+
+        error("unknown domain: " .. domain)
+    end
+
+--- config
+location /t {
+    content_by_lua_block {
+        local cfg = [[{
+            "upstream": {
+                "nodes": {
+                    "test1.com:1980": 1,
+                    "test2.com:1980": 1
+                },
+                "type": "roundrobin",
+                "checks":{
+                    "active":{
+                        "healthy":{
+                            "http_statuses":[
+                                200,
+                                302
+                            ],
+                            "interval":1,
+                            "successes":2
+                        },
+                        "http_path":"/hello",
+                        "timeout":1,
+                        "type":"http",
+                        "unhealthy":{
+                            "http_failures":5,
+                            "http_statuses":[
+                                429,
+                                404,
+                                500,
+                                501,
+                                502,
+                                503,
+                                504,
+                                505
+                            ],
+                            "interval":1,
+                            "tcp_failures":2,
+                            "timeouts":3
+                        }
+                    }
+                }
+            },
+            "uri": "/hello"
+        }]]
+        local t = require("lib.test_admin").test
+        assert(t('/apisix/admin/routes/1', ngx.HTTP_PUT, cfg) < 300)
+        t('/hello', ngx.HTTP_GET)
+        assert(t('/apisix/admin/routes/1', ngx.HTTP_PUT, cfg) < 300)
+        ngx.sleep(1)
+    }
+}
+
+--- request
+GET /t
+--- error_log
+clear checker