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/09/04 08:42:57 UTC
[GitHub] [apisix] membphis opened a new pull request #2168: bugfix: clear all cached object when got `delete` action, and removing stale boolean data in table `self.values` with a safer way
membphis opened a new pull request #2168:
URL: https://github.com/apache/apisix/pull/2168
### What this PR does / why we need it:
If the administrator user creates and deletes the same route multiple times, the new route will not be correctly synchronized to the APISIX gateway node, resulting in some request route matching failures and a 404 response.
bugfix: clear all cached data when get delete action, and removing stale boolean data in table self.values with a safer way
it is not easy to add test case. will add later
### 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 #2168: bugfix: clear all cached object when got `delete` action, and removing stale boolean data in table `self.values` with a safer way
Posted by GitBox <gi...@apache.org>.
membphis commented on a change in pull request #2168:
URL: https://github.com/apache/apisix/pull/2168#discussion_r486898710
##########
File path: t/node/route-delete.t
##########
@@ -0,0 +1,93 @@
+#
+# 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');
+worker_connections(256);
+no_root_location();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: create 130 routes + delete them
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ ngx.say("done")
+ }
+ }
+--- request
+GET /t
+--- response_body
+done
+--- no_error_log
+[error]
+--- grep_error_log eval
+qr/\w+ (data by key: 126)/
+--- grep_error_log_out
+insert data by key: 126
+delete data by key: 126
+insert data by key: 126
+delete data by key: 126
+--- timeout: 20
Review comment:
fixed
----------------------------------------------------------------
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 #2168: bugfix: clear all cached object when got `delete` action, and removing stale boolean data in table `self.values` with a safer way
Posted by GitBox <gi...@apache.org>.
nic-chen commented on a change in pull request #2168:
URL: https://github.com/apache/apisix/pull/2168#discussion_r483684355
##########
File path: t/node/route-delete.t
##########
@@ -0,0 +1,93 @@
+#
+# 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');
+worker_connections(256);
+no_root_location();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: create 130 routes + delete them
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ ngx.say("done")
+ }
+ }
+--- request
+GET /t
+--- response_body
+done
+--- no_error_log
+[error]
+--- grep_error_log eval
+qr/\w+ (data by key: 126)/
+--- grep_error_log_out
+insert data by key: 126
+delete data by key: 126
+insert data by key: 126
+delete data by key: 126
+--- timeout: 20
Review comment:
has some more test cases ?
----------------------------------------------------------------
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 #2168: bugfix: clear all cached object when got `delete` action, and removing stale boolean data in table `self.values` with a safer way
Posted by GitBox <gi...@apache.org>.
membphis commented on a change in pull request #2168:
URL: https://github.com/apache/apisix/pull/2168#discussion_r486876889
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
Review comment:
we can remove this comment now. we have added test cases about it.
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`original`
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
+ table.clear(self.values)
+
+ for i = 1, #values_org do
Review comment:
We don't want the "value" table to grow larger and larger, which will cause memory overflow.
Therefore, we need to delete the useless items in the "value" to keep it at an acceptable size.
##########
File path: t/node/route-delete.t
##########
@@ -0,0 +1,93 @@
+#
+# 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');
+worker_connections(256);
+no_root_location();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: create 130 routes + delete them
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ ngx.say("done")
+ }
+ }
+--- request
+GET /t
+--- response_body
+done
+--- no_error_log
+[error]
+--- grep_error_log eval
+qr/\w+ (data by key: 126)/
+--- grep_error_log_out
+insert data by key: 126
+delete data by key: 126
+insert data by key: 126
+delete data by key: 126
+--- timeout: 20
Review comment:
fixed
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
Review comment:
we can remove this comment now. we have added test cases about it.
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`original`
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
+ table.clear(self.values)
+
+ for i = 1, #values_org do
Review comment:
We don't want the "value" table to grow larger and larger, which will cause memory overflow.
Therefore, we need to delete the useless items in the "value" to keep it at an acceptable size.
##########
File path: t/node/route-delete.t
##########
@@ -0,0 +1,93 @@
+#
+# 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');
+worker_connections(256);
+no_root_location();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: create 130 routes + delete them
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ ngx.say("done")
+ }
+ }
+--- request
+GET /t
+--- response_body
+done
+--- no_error_log
+[error]
+--- grep_error_log eval
+qr/\w+ (data by key: 126)/
+--- grep_error_log_out
+insert data by key: 126
+delete data by key: 126
+insert data by key: 126
+delete data by key: 126
+--- timeout: 20
Review comment:
fixed
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
Review comment:
we can remove this comment now. we have added test cases about it.
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`original`
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
+ table.clear(self.values)
+
+ for i = 1, #values_org do
Review comment:
We don't want the "value" table to grow larger and larger, which will cause memory overflow.
Therefore, we need to delete the useless items in the "value" to keep it at an acceptable size.
##########
File path: t/node/route-delete.t
##########
@@ -0,0 +1,93 @@
+#
+# 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');
+worker_connections(256);
+no_root_location();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: create 130 routes + delete them
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ ngx.say("done")
+ }
+ }
+--- request
+GET /t
+--- response_body
+done
+--- no_error_log
+[error]
+--- grep_error_log eval
+qr/\w+ (data by key: 126)/
+--- grep_error_log_out
+insert data by key: 126
+delete data by key: 126
+insert data by key: 126
+delete data by key: 126
+--- timeout: 20
Review comment:
fixed
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
Review comment:
we can remove this comment now. we have added test cases about it.
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`original`
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
+ table.clear(self.values)
+
+ for i = 1, #values_org do
Review comment:
We don't want the "value" table to grow larger and larger, which will cause memory overflow.
Therefore, we need to delete the useless items in the "value" to keep it at an acceptable size.
##########
File path: t/node/route-delete.t
##########
@@ -0,0 +1,93 @@
+#
+# 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');
+worker_connections(256);
+no_root_location();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: create 130 routes + delete them
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ ngx.say("done")
+ }
+ }
+--- request
+GET /t
+--- response_body
+done
+--- no_error_log
+[error]
+--- grep_error_log eval
+qr/\w+ (data by key: 126)/
+--- grep_error_log_out
+insert data by key: 126
+delete data by key: 126
+insert data by key: 126
+delete data by key: 126
+--- timeout: 20
Review comment:
fixed
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
Review comment:
we can remove this comment now. we have added test cases about it.
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`original`
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
+ table.clear(self.values)
+
+ for i = 1, #values_org do
Review comment:
We don't want the "value" table to grow larger and larger, which will cause memory overflow.
Therefore, we need to delete the useless items in the "value" to keep it at an acceptable size.
##########
File path: t/node/route-delete.t
##########
@@ -0,0 +1,93 @@
+#
+# 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');
+worker_connections(256);
+no_root_location();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: create 130 routes + delete them
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ ngx.say("done")
+ }
+ }
+--- request
+GET /t
+--- response_body
+done
+--- no_error_log
+[error]
+--- grep_error_log eval
+qr/\w+ (data by key: 126)/
+--- grep_error_log_out
+insert data by key: 126
+delete data by key: 126
+insert data by key: 126
+delete data by key: 126
+--- timeout: 20
Review comment:
fixed
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
Review comment:
we can remove this comment now. we have added test cases about it.
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`original`
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
+ table.clear(self.values)
+
+ for i = 1, #values_org do
Review comment:
We don't want the "value" table to grow larger and larger, which will cause memory overflow.
Therefore, we need to delete the useless items in the "value" to keep it at an acceptable size.
##########
File path: t/node/route-delete.t
##########
@@ -0,0 +1,93 @@
+#
+# 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');
+worker_connections(256);
+no_root_location();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: create 130 routes + delete them
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ ngx.say("done")
+ }
+ }
+--- request
+GET /t
+--- response_body
+done
+--- no_error_log
+[error]
+--- grep_error_log eval
+qr/\w+ (data by key: 126)/
+--- grep_error_log_out
+insert data by key: 126
+delete data by key: 126
+insert data by key: 126
+delete data by key: 126
+--- timeout: 20
Review comment:
fixed
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
Review comment:
we can remove this comment now. we have added test cases about it.
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`original`
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
+ table.clear(self.values)
+
+ for i = 1, #values_org do
Review comment:
We don't want the "value" table to grow larger and larger, which will cause memory overflow.
Therefore, we need to delete the useless items in the "value" to keep it at an acceptable size.
##########
File path: t/node/route-delete.t
##########
@@ -0,0 +1,93 @@
+#
+# 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');
+worker_connections(256);
+no_root_location();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: create 130 routes + delete them
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ ngx.say("done")
+ }
+ }
+--- request
+GET /t
+--- response_body
+done
+--- no_error_log
+[error]
+--- grep_error_log eval
+qr/\w+ (data by key: 126)/
+--- grep_error_log_out
+insert data by key: 126
+delete data by key: 126
+insert data by key: 126
+delete data by key: 126
+--- timeout: 20
Review comment:
fixed
----------------------------------------------------------------
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 #2168: bugfix: clear all cached object when got `delete` action, and removing stale boolean data in table `self.values` with a safer way
Posted by GitBox <gi...@apache.org>.
moonming commented on a change in pull request #2168:
URL: https://github.com/apache/apisix/pull/2168#discussion_r483895397
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
What does this suffix mean? `_org`
##########
File path: t/node/route-delete.t
##########
@@ -0,0 +1,93 @@
+#
+# 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');
+worker_connections(256);
+no_root_location();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: create 130 routes + delete them
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ ngx.say("done")
+ }
+ }
+--- request
+GET /t
+--- response_body
+done
+--- no_error_log
+[error]
+--- grep_error_log eval
+qr/\w+ (data by key: 126)/
+--- grep_error_log_out
+insert data by key: 126
+delete data by key: 126
+insert data by key: 126
+delete data by key: 126
+--- timeout: 20
Review comment:
not cover https://github.com/apache/apisix/pull/2168/files#diff-f2239cc9d5659a13ba363ebc30959916R319
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
Review comment:
Is it still a TODO?
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
+ table.clear(self.values)
+
+ for i = 1, #values_org do
Review comment:
Why do we need to delete nil elements in the array? We can make judgments in this for loop：https://github.com/apache/apisix/pull/2168/files#diff-f2239cc9d5659a13ba363ebc30959916R352
----------------------------------------------------------------
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 #2168: bugfix: clear all cached object when got `delete` action, and removing stale boolean data in table `self.values` with a safer way
Posted by GitBox <gi...@apache.org>.
moonming commented on a change in pull request #2168:
URL: https://github.com/apache/apisix/pull/2168#discussion_r486902889
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`org` means organization
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
so `values_original`
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`org` means organization
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
so `values_original`
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`org` means organization
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
so `values_original`
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`org` means organization
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
so `values_original`
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`org` means organization
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
so `values_original`
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`org` means organization
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
so `values_original`
----------------------------------------------------------------
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 #2168: bugfix: clear all cached object when got `delete` action, and removing stale boolean data in table `self.values` with a safer way
Posted by GitBox <gi...@apache.org>.
moonming commented on a change in pull request #2168:
URL: https://github.com/apache/apisix/pull/2168#discussion_r486902889
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`org` means organization
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
so `values_original`
----------------------------------------------------------------
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 #2168: bugfix: clear all cached object when got `delete` action, and removing stale boolean data in table `self.values` with a safer way
Posted by GitBox <gi...@apache.org>.
membphis commented on a change in pull request #2168:
URL: https://github.com/apache/apisix/pull/2168#discussion_r486876889
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
Review comment:
we can remove this comment now. we have added test cases about it.
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`original`
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
+ table.clear(self.values)
+
+ for i = 1, #values_org do
Review comment:
We don't want the "value" table to grow larger and larger, which will cause memory overflow.
Therefore, we need to delete the useless items in the "value" to keep it at an acceptable size.
##########
File path: t/node/route-delete.t
##########
@@ -0,0 +1,93 @@
+#
+# 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');
+worker_connections(256);
+no_root_location();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: create 130 routes + delete them
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ ngx.say("done")
+ }
+ }
+--- request
+GET /t
+--- response_body
+done
+--- no_error_log
+[error]
+--- grep_error_log eval
+qr/\w+ (data by key: 126)/
+--- grep_error_log_out
+insert data by key: 126
+delete data by key: 126
+insert data by key: 126
+delete data by key: 126
+--- timeout: 20
Review comment:
fixed
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
Review comment:
we can remove this comment now. we have added test cases about it.
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`original`
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
+ table.clear(self.values)
+
+ for i = 1, #values_org do
Review comment:
We don't want the "value" table to grow larger and larger, which will cause memory overflow.
Therefore, we need to delete the useless items in the "value" to keep it at an acceptable size.
##########
File path: t/node/route-delete.t
##########
@@ -0,0 +1,93 @@
+#
+# 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');
+worker_connections(256);
+no_root_location();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: create 130 routes + delete them
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_PUT,
+ [[{
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello]] .. i .. [["
+ }]]
+ )
+ end
+
+ for i = 1, 130 do
+ local code, body = t('/apisix/admin/routes/' .. i,
+ ngx.HTTP_DELETE
+ )
+ end
+
+ ngx.say("done")
+ }
+ }
+--- request
+GET /t
+--- response_body
+done
+--- no_error_log
+[error]
+--- grep_error_log eval
+qr/\w+ (data by key: 126)/
+--- grep_error_log_out
+insert data by key: 126
+delete data by key: 126
+insert data by key: 126
+delete data by key: 126
+--- timeout: 20
Review comment:
fixed
----------------------------------------------------------------
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 #2168: bugfix: clear all cached object when got `delete` action, and removing stale boolean data in table `self.values` with a safer way
Posted by GitBox <gi...@apache.org>.
membphis commented on a change in pull request #2168:
URL: https://github.com/apache/apisix/pull/2168#discussion_r486880701
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`original`
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
+ table.clear(self.values)
+
+ for i = 1, #values_org do
Review comment:
We don't want the "value" table to grow larger and larger, which will cause memory overflow.
Therefore, we need to delete the useless items in the "value" to keep it at an acceptable size.
----------------------------------------------------------------
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 #2168: bugfix: clear all cached object when got `delete` action, and removing stale boolean data in table `self.values` with a safer way
Posted by GitBox <gi...@apache.org>.
membphis commented on a change in pull request #2168:
URL: https://github.com/apache/apisix/pull/2168#discussion_r486876889
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
Review comment:
we can remove this comment now. we have added test cases about it.
----------------------------------------------------------------
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 merged pull request #2168: bugfix: clear all cached object when got `delete` action, and removing stale boolean data in table `self.values` with a safer way
Posted by GitBox <gi...@apache.org>.
moonming merged pull request #2168:
URL: https://github.com/apache/apisix/pull/2168
----------------------------------------------------------------
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 #2168: bugfix: clear all cached object when got `delete` action, and removing stale boolean data in table `self.values` with a safer way
Posted by GitBox <gi...@apache.org>.
moonming commented on a change in pull request #2168:
URL: https://github.com/apache/apisix/pull/2168#discussion_r486902889
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`org` means organization
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
so `values_original`
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`org` means organization
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
so `values_original`
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
`org` means organization
##########
File path: apisix/core/config_etcd.lua
##########
@@ -314,36 +316,44 @@ local function sync_data(self)
res.value.id = key
self.values[pre_index] = res
res.clean_handlers = {}
+ log.info("update data by key: ", key)
else
self.sync_times = self.sync_times + 1
self.values[pre_index] = false
+ self.values_hash[key] = nil
+ log.info("delete data by key: ", key)
end
elseif res.value then
res.clean_handlers = {}
insert_tab(self.values, res)
self.values_hash[key] = #self.values
res.value.id = key
+ log.info("insert data by key: ", key)
end
-- avoid space waste
-- todo: need to cover this path, it is important.
if self.sync_times > 100 then
- local count = 0
- for i = 1, #self.values do
- local val = self.values[i]
- self.values[i] = nil
+ local values_org = table.clone(self.values)
Review comment:
so `values_original`
----------------------------------------------------------------
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