[apisix] branch master updated: fix: use original modifiedIndex if possible (#4192)

[to...@apache.org]

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

tokers 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 19dbe34  fix: use original modifiedIndex if possible (#4192)
19dbe34 is described below

commit 19dbe3456f29c7847b64da8e72136e548c131114
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Sun May 9 10:31:33 2021 +0800

    fix: use original modifiedIndex if possible (#4192)
    
    Signed-off-by: spacewander <sp...@gmail.com>
---
 apisix/plugins/prometheus/exporter.lua |  2 +-
 t/plugin/prometheus3.t                 | 92 ++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+), 1 deletion(-)

diff --git a/apisix/plugins/prometheus/exporter.lua b/apisix/plugins/prometheus/exporter.lua
index a4648b8..8bb6fce 100644
--- a/apisix/plugins/prometheus/exporter.lua
+++ b/apisix/plugins/prometheus/exporter.lua
@@ -206,7 +206,7 @@ local function set_modify_index(key, items, items_ver, global_max_index)
     if items_ver and items then
         for _, item in ipairs(items) do
             if type(item) == "table" then
-                local modify_index = item.modifiedIndex
+                local modify_index = item.orig_modifiedIndex or item.modifiedIndex
                 if modify_index > max_idx then
                     max_idx = modify_index
                 end
diff --git a/t/plugin/prometheus3.t b/t/plugin/prometheus3.t
new file mode 100644
index 0000000..eb11d37
--- /dev/null
+++ b/t/plugin/prometheus3.t
@@ -0,0 +1,92 @@
+#
+# 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.
+#
+BEGIN {
+    if ($ENV{TEST_NGINX_CHECK_LEAK}) {
+        $SkipReason = "unavailable for the hup tests";
+
+    } else {
+        $ENV{TEST_NGINX_USE_HUP} = 1;
+        undef $ENV{TEST_NGINX_USE_STAP};
+    }
+}
+
+use t::APISIX 'no_plan';
+
+repeat_each(1);
+no_long_string();
+no_shuffle();
+no_root_location();
+run_tests;
+
+__DATA__
+
+=== TEST 1: use original etcd modified index
+--- config
+    location /t {
+        content_by_lua_block {
+            local t = require("lib.test_admin").test
+            local code, body = t('/apisix/admin/plugin_configs/1',
+                ngx.HTTP_PUT,
+                [[{
+                    "plugins": {
+                        "prometheus":{}
+                    }
+                }]]
+                )
+
+            if code >= 300 then
+                ngx.status = code
+                ngx.say(body)
+                return
+            end
+
+            local code, body = t('/apisix/admin/routes/1',
+                ngx.HTTP_PUT,
+                [[{
+                    "plugin_config_id": 1,
+                    "upstream": {
+                        "nodes": {
+                            "127.0.0.1:1980": 1
+                        },
+                        "type": "roundrobin"
+                    },
+                    "uri": "/hello"
+                }]]
+                )
+
+            if code >= 300 then
+                ngx.status = code
+            end
+            ngx.say(body)
+        }
+    }
+--- request
+GET /t
+--- response_body
+passed
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: hit
+--- pipelined_requests eval
+["GET /hello", "GET /apisix/prometheus/metrics"]
+--- error_code eval
+[200, 200]
+--- no_error_log
+[error]