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:
us...@infra.apache.org
