[apisix] branch master updated: fix: update_count is reset once updated, cause cache key conflict (#9811)

[monkeydluffy]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 9758a3e94 fix: update_count is reset once updated, cause cache key 
conflict  (#9811)
9758a3e94 is described below

commit 9758a3e944f7523612dec063ce92624240a2b75e
Author: jinhua luo <home_k...@163.com>
AuthorDate: Fri Jul 14 14:16:44 2023 +0800

    fix: update_count is reset once updated, cause cache key conflict  (#9811)
---
 apisix/plugin_config.lua              | 3 +--
 apisix/router.lua                     | 1 -
 docs/en/latest/control-api.md         | 2 --
 t/config-center-yaml/plugin-configs.t | 2 +-
 t/node/plugin-configs.t               | 6 +++---
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/apisix/plugin_config.lua b/apisix/plugin_config.lua
index 828ebf1e2..88b17d4b8 100644
--- a/apisix/plugin_config.lua
+++ b/apisix/plugin_config.lua
@@ -78,8 +78,7 @@ function _M.merge(route_conf, plugin_config)
         end
     end
 
-    route_conf.update_count = route_conf.update_count + 1
-    route_conf.modifiedIndex = route_conf.orig_modifiedIndex .. "#" .. 
route_conf.update_count
+    route_conf.modifiedIndex = route_conf.orig_modifiedIndex .. "#" .. 
plugin_config.modifiedIndex
     route_conf.prev_plugin_config_ver = plugin_config.modifiedIndex
 
     return route_conf
diff --git a/apisix/router.lua b/apisix/router.lua
index 7e7d50d4a..93b123e5b 100644
--- a/apisix/router.lua
+++ b/apisix/router.lua
@@ -27,7 +27,6 @@ local _M = {version = 0.3}
 
 local function filter(route)
     route.orig_modifiedIndex = route.modifiedIndex
-    route.update_count = 0
 
     route.has_domain = false
     if not route.value then
diff --git a/docs/en/latest/control-api.md b/docs/en/latest/control-api.md
index a068d4411..e21ca86d5 100644
--- a/docs/en/latest/control-api.md
+++ b/docs/en/latest/control-api.md
@@ -210,7 +210,6 @@ Returns all configured [Routes](./terminology/route.md):
 ```json
 [
   {
-    "update_count": 0,
     "value": {
       "priority": 0,
       "uris": [
@@ -249,7 +248,6 @@ Returns the Route with the specified `route_id`:
 
 ```json
 {
-  "update_count": 0,
   "value": {
     "priority": 0,
     "uris": [
diff --git a/t/config-center-yaml/plugin-configs.t 
b/t/config-center-yaml/plugin-configs.t
index 2958b1378..f10c3651a 100644
--- a/t/config-center-yaml/plugin-configs.t
+++ b/t/config-center-yaml/plugin-configs.t
@@ -115,7 +115,7 @@ world
 --- response_headers
 in: out
 --- error_log eval
-qr/conf_version: \d+#1,/
+qr/conf_version: \d+#\d+,/
 
 
 
diff --git a/t/node/plugin-configs.t b/t/node/plugin-configs.t
index 11f960103..f601ae86d 100644
--- a/t/node/plugin-configs.t
+++ b/t/node/plugin-configs.t
@@ -113,10 +113,10 @@ __DATA__
 hello
 world
 --- grep_error_log eval
-qr/conf_version: \d+#\d/
+qr/conf_version: \d+#\d+/
 --- grep_error_log_out eval
-qr/conf_version: \d+#1
-conf_version: \d+#2
+qr/conf_version: \d+#\d+
+conf_version: \d+#\d+
 /