You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by GitBox <gi...@apache.org> on 2020/10/13 06:45:54 UTC
[GitHub] [apisix] membphis opened a new pull request #2406: feature: plugin `limit-count` support to use `redis` cluster
membphis opened a new pull request #2406:
URL: https://github.com/apache/apisix/pull/2406
### What this PR does / why we need it:
<!--- Why is this change required? What problem does it solve? -->
<!--- If it fixes an open issue, please link to the issue here. -->
Support for using redis cluster in limit-count plugin.
fix https://github.com/apache/apisix/issues/638
continue PR: https://github.com/apache/apisix/pull/2340
### Pre-submission checklist:
* [ ] Did you explain what problem does this PR solve? Or what new features have been added?
* [ ] Have you added corresponding test cases?
* [ ] Have you modified the corresponding document?
* [ ] Is this PR backward compatible?
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [apisix] membphis commented on a change in pull request #2406: feature: plugin `limit-count` support to use `redis` cluster
Posted by GitBox <gi...@apache.org>.
membphis commented on a change in pull request #2406:
URL: https://github.com/apache/apisix/pull/2406#discussion_r505632349
##########
File path: apisix/plugins/limit-count/limit-count-redis-cluster.lua
##########
@@ -0,0 +1,134 @@
+--
+-- 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.
+--
+
+local rediscluster = require("resty.rediscluster")
+local core = require("apisix.core")
+local resty_lock = require("resty.lock")
+local setmetatable = setmetatable
+local tostring = tostring
+local ipairs = ipairs
+
+local _M = {}
+
+
+local mt = {
+ __index = _M
+}
+
+
+local function new_redis_cluster(conf)
+ local config = {
+ name = "apisix-redis-cluster",
+ serv_list = {},
+ read_timeout = conf.redis_timeout,
+ auth = conf.redis_password,
+ dict_name = "plugin-limit-count-redis-cluster-slot-lock",
+ }
+
+ for i, conf_item in ipairs(conf.redis_cluster_nodes) do
+ local host, port, err = core.utils.parse_addr(conf_item)
+ if err then
+ return nil, "failed to parse address: " .. conf_item
+ .. " err: " .. err
+ end
+
+ config.serv_list[i] = {ip = host, port = port}
+ end
+
+ local red_cli, err = rediscluster:new(config)
+ if not red_cli then
+ return nil, "failed to new redis cluster: " .. err
+ end
+
+ return red_cli
+end
+
+
+function _M.new(plugin_name, limit, window, conf)
+ local red_cli, err = new_redis_cluster(conf)
+ if not red_cli then
+ return nil, err
+ end
+
+ local self = {
+ limit = limit, window = window, conf = conf,
+ plugin_name = plugin_name, red_cli =red_cli
+ }
+
+ return setmetatable(self, mt)
+end
+
+
Review comment:
@moonming I think we can merge this PR now. please take a look at this PR.
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [apisix] nic-chen commented on a change in pull request #2406: feature: plugin `limit-count` support to use `redis` cluster
Posted by GitBox <gi...@apache.org>.
nic-chen commented on a change in pull request #2406:
URL: https://github.com/apache/apisix/pull/2406#discussion_r504348516
##########
File path: apisix/plugins/limit-count/limit-count-redis-cluster.lua
##########
@@ -0,0 +1,134 @@
+--
+-- 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.
+--
+
+local rediscluster = require("resty.rediscluster")
+local core = require("apisix.core")
+local resty_lock = require("resty.lock")
+local setmetatable = setmetatable
+local tostring = tostring
+local ipairs = ipairs
+
+local _M = {}
+
+
+local mt = {
+ __index = _M
+}
+
+
+local function new_redis_cluster(conf)
+ local config = {
+ name = "apisix-redis-cluster",
+ serv_list = {},
+ read_timeout = conf.redis_timeout,
+ auth = conf.redis_password,
+ dict_name = "plugin-limit-count-redis-cluster-slot-lock",
+ }
+
+ for i, conf_item in ipairs(conf.redis_cluster_nodes) do
+ local host, port, err = core.utils.parse_addr(conf_item)
+ if err then
+ return nil, "failed to parse address: " .. conf_item
+ .. " err: " .. err
+ end
+
+ config.serv_list[i] = {ip = host, port = port}
+ end
+
+ local red_cli, err = rediscluster:new(config)
+ if not red_cli then
+ return nil, "failed to new redis cluster: " .. err
+ end
+
+ return red_cli
+end
+
+
+function _M.new(plugin_name, limit, window, conf)
+ local red_cli, err = new_redis_cluster(conf)
+ if not red_cli then
+ return nil, err
+ end
+
+ local self = {
+ limit = limit, window = window, conf = conf,
+ plugin_name = plugin_name, red_cli =red_cli
+ }
+
+ return setmetatable(self, mt)
+end
+
+
+function _M.incoming(self, key)
+ local red = self.red_cli
+ local limit = self.limit
+ local window = self.window
+ local remaining
+ key = self.plugin_name .. tostring(key)
+
+ local ret, err = red:ttl(key)
+ if not ret then
+ return false, "failed to get redis `" .. key .."` ttl: " .. err
+ end
+
+ core.log.info("ttl key: ", key, " ret: ", ret, " err: ", err)
+ if ret < 0 then
+ local lock, err = resty_lock:new("plugin-limit-count")
+ if not lock then
+ return false, "failed to create lock: " .. err
+ end
+
+ local elapsed, err = lock:lock(key)
+ if not elapsed then
+ return false, "failed to acquire the lock: " .. err
+ end
+
+ ret = red:ttl(key)
Review comment:
why read ttl twice ? a little confuse
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [apisix] moonming commented on a change in pull request #2406: feature: plugin `limit-count` support to use `redis` cluster
Posted by GitBox <gi...@apache.org>.
moonming commented on a change in pull request #2406:
URL: https://github.com/apache/apisix/pull/2406#discussion_r504409374
##########
File path: apisix/plugins/limit-count/limit-count-redis-cluster.lua
##########
@@ -0,0 +1,134 @@
+--
+-- 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.
+--
+
+local rediscluster = require("resty.rediscluster")
+local core = require("apisix.core")
+local resty_lock = require("resty.lock")
+local setmetatable = setmetatable
+local tostring = tostring
+local ipairs = ipairs
+
+local _M = {}
+
+
+local mt = {
+ __index = _M
+}
+
+
+local function new_redis_cluster(conf)
+ local config = {
+ name = "apisix-redis-cluster",
+ serv_list = {},
+ read_timeout = conf.redis_timeout,
+ auth = conf.redis_password,
+ dict_name = "plugin-limit-count-redis-cluster-slot-lock",
+ }
+
+ for i, conf_item in ipairs(conf.redis_cluster_nodes) do
+ local host, port, err = core.utils.parse_addr(conf_item)
+ if err then
+ return nil, "failed to parse address: " .. conf_item
+ .. " err: " .. err
+ end
+
+ config.serv_list[i] = {ip = host, port = port}
+ end
+
+ local red_cli, err = rediscluster:new(config)
+ if not red_cli then
+ return nil, "failed to new redis cluster: " .. err
+ end
+
+ return red_cli
+end
+
+
+function _M.new(plugin_name, limit, window, conf)
+ local red_cli, err = new_redis_cluster(conf)
+ if not red_cli then
+ return nil, err
+ end
+
+ local self = {
+ limit = limit, window = window, conf = conf,
+ plugin_name = plugin_name, red_cli =red_cli
+ }
+
+ return setmetatable(self, mt)
+end
+
+
Review comment:
I don't think copy-paste is good
##########
File path: apisix/plugins/limit-count/limit-count-redis-cluster.lua
##########
@@ -0,0 +1,134 @@
+--
+-- 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.
+--
+
+local rediscluster = require("resty.rediscluster")
+local core = require("apisix.core")
+local resty_lock = require("resty.lock")
+local setmetatable = setmetatable
+local tostring = tostring
+local ipairs = ipairs
+
+local _M = {}
+
+
+local mt = {
+ __index = _M
+}
+
+
+local function new_redis_cluster(conf)
+ local config = {
+ name = "apisix-redis-cluster",
+ serv_list = {},
+ read_timeout = conf.redis_timeout,
+ auth = conf.redis_password,
+ dict_name = "plugin-limit-count-redis-cluster-slot-lock",
+ }
+
+ for i, conf_item in ipairs(conf.redis_cluster_nodes) do
+ local host, port, err = core.utils.parse_addr(conf_item)
+ if err then
+ return nil, "failed to parse address: " .. conf_item
+ .. " err: " .. err
+ end
+
+ config.serv_list[i] = {ip = host, port = port}
+ end
+
+ local red_cli, err = rediscluster:new(config)
+ if not red_cli then
+ return nil, "failed to new redis cluster: " .. err
+ end
+
+ return red_cli
+end
+
+
+function _M.new(plugin_name, limit, window, conf)
+ local red_cli, err = new_redis_cluster(conf)
+ if not red_cli then
+ return nil, err
+ end
+
+ local self = {
+ limit = limit, window = window, conf = conf,
+ plugin_name = plugin_name, red_cli =red_cli
+ }
+
+ return setmetatable(self, mt)
+end
+
+
+function _M.incoming(self, key)
+ local red = self.red_cli
+ local limit = self.limit
+ local window = self.window
+ local remaining
+ key = self.plugin_name .. tostring(key)
+
+ local ret, err = red:ttl(key)
+ if not ret then
+ return false, "failed to get redis `" .. key .."` ttl: " .. err
+ end
+
+ core.log.info("ttl key: ", key, " ret: ", ret, " err: ", err)
+ if ret < 0 then
+ local lock, err = resty_lock:new("plugin-limit-count")
+ if not lock then
+ return false, "failed to create lock: " .. err
+ end
+
+ local elapsed, err = lock:lock(key)
+ if not elapsed then
+ return false, "failed to acquire the lock: " .. err
+ end
+
+ ret = red:ttl(key)
+ if ret < 0 then
+ local ok, err = lock:unlock()
+ if not ok then
+ return false, "failed to unlock: " .. err
+ end
+
+ ret, err = red:set(key, limit -1, "EX", window)
+ if not ret then
+ return nil, err
+ end
+
+ return 0, limit -1
Review comment:
Code style
##########
File path: t/plugin/limit-count-redis-cluster.t
##########
@@ -0,0 +1,308 @@
+#
+# 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);
+no_long_string();
+no_shuffle();
+no_root_location();
+
+run_tests;
+
+__DATA__
+
+=== TEST 1: set route, missing redis host
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+ "plugins": {
+ "limit-count": {
+ "count": 2,
+ "time_window": 60,
+ "rejected_code": 503,
+ "key": "remote_addr",
+ "policy": "redis-cluster"
+ }
+ },
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello"
+ }]]
+ )
+
+ if code >= 300 then
+ ngx.status = code
+ end
+ ngx.print(body)
+ }
+ }
+--- request
+GET /t
+--- error_code: 400
+--- response_body
+{"error_msg":"failed to check the configuration of plugin limit-count err: failed to validate dependent schema for \"policy\": value should match only one schema, but matches none"}
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: set route, with redis host and port
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+ "uri": "/hello",
+ "plugins": {
+ "limit-count": {
+ "count": 2,
+ "time_window": 60,
+ "rejected_code": 503,
+ "key": "remote_addr",
+ "policy": "redis-cluster",
+ "redis_timeout": 1001,
+ "redis_cluster_nodes": [
+ "127.0.0.1:5000",
+ "127.0.0.1:5001"
+ ]
+ }
+ },
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ }
+ }]]
+ )
+
+ if code >= 300 then
+ ngx.status = code
+ end
+ ngx.say(body)
+ }
+ }
+--- request
+GET /t
+--- response_body
+passed
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: set route
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+ "uri": "/hello",
+ "plugins": {
+ "limit-count": {
+ "count": 2,
Review comment:
There is no test case to cover what happens after the configuration value is changed
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [apisix] membphis commented on a change in pull request #2406: feature: plugin `limit-count` support to use `redis` cluster
Posted by GitBox <gi...@apache.org>.
membphis commented on a change in pull request #2406:
URL: https://github.com/apache/apisix/pull/2406#discussion_r504419435
##########
File path: apisix/plugins/limit-count/limit-count-redis-cluster.lua
##########
@@ -0,0 +1,134 @@
+--
+-- 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.
+--
+
+local rediscluster = require("resty.rediscluster")
+local core = require("apisix.core")
+local resty_lock = require("resty.lock")
+local setmetatable = setmetatable
+local tostring = tostring
+local ipairs = ipairs
+
+local _M = {}
+
+
+local mt = {
+ __index = _M
+}
+
+
+local function new_redis_cluster(conf)
+ local config = {
+ name = "apisix-redis-cluster",
+ serv_list = {},
+ read_timeout = conf.redis_timeout,
+ auth = conf.redis_password,
+ dict_name = "plugin-limit-count-redis-cluster-slot-lock",
+ }
+
+ for i, conf_item in ipairs(conf.redis_cluster_nodes) do
+ local host, port, err = core.utils.parse_addr(conf_item)
+ if err then
+ return nil, "failed to parse address: " .. conf_item
+ .. " err: " .. err
+ end
+
+ config.serv_list[i] = {ip = host, port = port}
+ end
+
+ local red_cli, err = rediscluster:new(config)
+ if not red_cli then
+ return nil, "failed to new redis cluster: " .. err
+ end
+
+ return red_cli
+end
+
+
+function _M.new(plugin_name, limit, window, conf)
+ local red_cli, err = new_redis_cluster(conf)
+ if not red_cli then
+ return nil, err
+ end
+
+ local self = {
+ limit = limit, window = window, conf = conf,
+ plugin_name = plugin_name, red_cli =red_cli
+ }
+
+ return setmetatable(self, mt)
+end
+
+
Review comment:
in `limit-count-redis`, the main process of `incoming` is `connect` -> `process` -> `keepalive`.
but in `limit-count-redis-cluster`, the main process of `incoming`is only the `process` . they were different.
I think it is acceptable for those copied code.
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [apisix] moonming commented on a change in pull request #2406: feature: plugin `limit-count` support to use `redis` cluster
Posted by GitBox <gi...@apache.org>.
moonming commented on a change in pull request #2406:
URL: https://github.com/apache/apisix/pull/2406#discussion_r504408432
##########
File path: t/plugin/limit-count-redis-cluster.t
##########
@@ -0,0 +1,308 @@
+#
+# 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);
+no_long_string();
+no_shuffle();
+no_root_location();
+
+run_tests;
+
+__DATA__
+
+=== TEST 1: set route, missing redis host
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+ "plugins": {
+ "limit-count": {
+ "count": 2,
+ "time_window": 60,
+ "rejected_code": 503,
+ "key": "remote_addr",
+ "policy": "redis-cluster"
+ }
+ },
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello"
+ }]]
+ )
+
+ if code >= 300 then
+ ngx.status = code
+ end
+ ngx.print(body)
+ }
+ }
+--- request
+GET /t
+--- error_code: 400
+--- response_body
+{"error_msg":"failed to check the configuration of plugin limit-count err: failed to validate dependent schema for \"policy\": value should match only one schema, but matches none"}
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: set route, with redis host and port
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+ "uri": "/hello",
+ "plugins": {
+ "limit-count": {
+ "count": 2,
+ "time_window": 60,
+ "rejected_code": 503,
+ "key": "remote_addr",
+ "policy": "redis-cluster",
+ "redis_timeout": 1001,
+ "redis_cluster_nodes": [
+ "127.0.0.1:5000",
+ "127.0.0.1:5001"
+ ]
+ }
+ },
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ }
+ }]]
+ )
+
+ if code >= 300 then
+ ngx.status = code
+ end
+ ngx.say(body)
+ }
+ }
+--- request
+GET /t
+--- response_body
+passed
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: set route
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+ "uri": "/hello",
+ "plugins": {
+ "limit-count": {
+ "count": 2,
+ "time_window": 60,
+ "rejected_code": 503,
+ "key": "remote_addr",
+ "policy": "redis-cluster",
+ "redis_cluster_nodes": [
+ "127.0.0.1:5000",
+ "127.0.0.1:5001"
+ ]
+ }
+ },
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ }
+ }]],
+ [[{
+ "node": {
+ "value": {
+ "plugins": {
+ "limit-count": {
+ "count": 2,
+ "time_window": 60,
+ "rejected_code": 503,
+ "key": "remote_addr",
+ "policy": "redis-cluster",
+ "redis_timeout": 1000,
+ "redis_cluster_nodes": [
+ "127.0.0.1:5000",
+ "127.0.0.1:5001"
+ ]
+ }
+ },
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello"
+ },
+ "key": "/apisix/routes/1"
+ },
+ "action": "set"
+ }]]
+ )
+
+ if code >= 300 then
+ ngx.status = code
+ end
+ ngx.say(body)
+ }
+ }
+--- request
+GET /t
+--- response_body
+passed
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: up the limit
+--- pipelined_requests eval
+["GET /hello", "GET /hello", "GET /hello", "GET /hello"]
+--- error_code eval
+[200, 200, 503, 503]
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: up the limit
+--- pipelined_requests eval
+["GET /hello1", "GET /hello", "GET /hello2", "GET /hello", "GET /hello"]
+--- error_code eval
+[404, 503, 404, 503, 503]
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: up the limit
Review comment:
Repeated test case
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [apisix] membphis merged pull request #2406: feature: plugin `limit-count` support to use `redis` cluster
Posted by GitBox <gi...@apache.org>.
membphis merged pull request #2406:
URL: https://github.com/apache/apisix/pull/2406
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [apisix] moonming commented on a change in pull request #2406: feature: plugin `limit-count` support to use `redis` cluster
Posted by GitBox <gi...@apache.org>.
moonming commented on a change in pull request #2406:
URL: https://github.com/apache/apisix/pull/2406#discussion_r504408951
##########
File path: apisix/plugins/limit-count/limit-count-redis-cluster.lua
##########
@@ -0,0 +1,134 @@
+--
+-- 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.
+--
+
+local rediscluster = require("resty.rediscluster")
+local core = require("apisix.core")
+local resty_lock = require("resty.lock")
+local setmetatable = setmetatable
+local tostring = tostring
+local ipairs = ipairs
+
+local _M = {}
+
+
+local mt = {
+ __index = _M
+}
+
+
+local function new_redis_cluster(conf)
+ local config = {
+ name = "apisix-redis-cluster",
+ serv_list = {},
+ read_timeout = conf.redis_timeout,
+ auth = conf.redis_password,
+ dict_name = "plugin-limit-count-redis-cluster-slot-lock",
+ }
+
+ for i, conf_item in ipairs(conf.redis_cluster_nodes) do
+ local host, port, err = core.utils.parse_addr(conf_item)
+ if err then
+ return nil, "failed to parse address: " .. conf_item
+ .. " err: " .. err
+ end
+
+ config.serv_list[i] = {ip = host, port = port}
+ end
+
+ local red_cli, err = rediscluster:new(config)
+ if not red_cli then
+ return nil, "failed to new redis cluster: " .. err
+ end
+
+ return red_cli
+end
+
+
+function _M.new(plugin_name, limit, window, conf)
+ local red_cli, err = new_redis_cluster(conf)
+ if not red_cli then
+ return nil, err
+ end
+
+ local self = {
+ limit = limit, window = window, conf = conf,
+ plugin_name = plugin_name, red_cli =red_cli
+ }
+
+ return setmetatable(self, mt)
+end
+
+
+function _M.incoming(self, key)
+ local red = self.red_cli
+ local limit = self.limit
+ local window = self.window
+ local remaining
+ key = self.plugin_name .. tostring(key)
+
+ local ret, err = red:ttl(key)
+ if not ret then
+ return false, "failed to get redis `" .. key .."` ttl: " .. err
+ end
+
+ core.log.info("ttl key: ", key, " ret: ", ret, " err: ", err)
+ if ret < 0 then
+ local lock, err = resty_lock:new("plugin-limit-count")
+ if not lock then
+ return false, "failed to create lock: " .. err
+ end
+
+ local elapsed, err = lock:lock(key)
+ if not elapsed then
+ return false, "failed to acquire the lock: " .. err
+ end
+
+ ret = red:ttl(key)
Review comment:
why？
----------------------------------------------------------------
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:
users@infra.apache.org