[apisix] branch master updated: fix(upstream): load imbalance when it's referred by multiple routes (#5462)

[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 f06f6cc  fix(upstream): load imbalance when it's referred by multiple routes (#5462)
f06f6cc is described below

commit f06f6cc0e8e41875bf105cf2c18457339002df53
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Thu Nov 11 09:27:58 2021 +0800

    fix(upstream): load imbalance when it's referred by multiple routes (#5462)
---
 apisix/upstream.lua  |   2 +-
 t/node/least_conn2.t | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+), 1 deletion(-)

diff --git a/apisix/upstream.lua b/apisix/upstream.lua
index 8c4919a..4e23fbf 100644
--- a/apisix/upstream.lua
+++ b/apisix/upstream.lua
@@ -273,7 +273,7 @@ function _M.set_by_route(route, api_ctx)
     end
 
     set_directly(api_ctx, up_conf.type .. "#upstream_" .. tostring(up_conf),
-                 api_ctx.conf_version, up_conf)
+                 tostring(up_conf), up_conf)
 
     local nodes_count = up_conf.nodes and #up_conf.nodes or 0
     if nodes_count == 0 then
diff --git a/t/node/least_conn2.t b/t/node/least_conn2.t
new file mode 100644
index 0000000..1141ab5
--- /dev/null
+++ b/t/node/least_conn2.t
@@ -0,0 +1,109 @@
+#
+# 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(2);
+log_level('info');
+no_root_location();
+worker_connections(1024);
+no_shuffle();
+
+add_block_preprocessor(sub {
+    my ($block) = @_;
+
+    if (!$block->request) {
+        $block->set_value("request", "GET /t");
+    }
+
+    if ((!defined $block->error_log) && (!defined $block->no_error_log)) {
+        $block->set_value("no_error_log", "[error]");
+    }
+});
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: upstream across multiple routes should not share the same version
+--- config
+    location /t {
+        content_by_lua_block {
+            local t = require("lib.test_admin").test
+            local code, body = t('/apisix/admin/upstreams/1',
+                 ngx.HTTP_PUT,
+                 [[{
+                    "type": "least_conn",
+                    "nodes": {
+                        "127.0.0.1:1980": 3,
+                        "0.0.0.0:1980": 2
+                    }
+                 }]]
+            )
+            assert(code < 300, body)
+            local code, body = t('/apisix/admin/routes/1',
+                 ngx.HTTP_PUT,
+                 [[{
+                    "host": "1.com",
+                    "uri": "/mysleep",
+                    "upstream_id": "1"
+                 }]]
+            )
+            assert(code < 300, body)
+            local code, body = t('/apisix/admin/routes/2',
+                 ngx.HTTP_PUT,
+                 [[{
+                    "host": "2.com",
+                    "uri": "/mysleep",
+                    "upstream_id": "1"
+                 }]]
+            )
+            assert(code < 300, body)
+        }
+    }
+
+
+
+=== TEST 2: hit
+--- config
+    location /t {
+        content_by_lua_block {
+            local http = require "resty.http"
+            local uri = "http://127.0.0.1:" .. ngx.var.server_port
+                        .. "/mysleep?seconds=0.1"
+
+            local t = {}
+            for i = 1, 2 do
+                local th = assert(ngx.thread.spawn(function(i)
+                    local httpc = http.new()
+                    local res, err = httpc:request_uri(uri, {headers = {Host = i..".com"}})
+                    if not res then
+                        ngx.log(ngx.ERR, err)
+                        return
+                    end
+                end, i))
+                table.insert(t, th)
+            end
+            for i, th in ipairs(t) do
+                ngx.thread.wait(th)
+            end
+        }
+    }
+--- grep_error_log eval
+qr/proxy request to \S+ while connecting to upstream/
+--- grep_error_log_out
+proxy request to 127.0.0.1:1980 while connecting to upstream
+proxy request to 0.0.0.0:1980 while connecting to upstream