feat(clustering): remove rpc of dynamic log level

kong-3.9.0-0.rockspec

@@ -98,7 +98,6 @@ build = {
     ["kong.clustering.rpc.utils"] = "kong/clustering/rpc/utils.lua",
     ["kong.clustering.rpc.concentrator"] = "kong/clustering/rpc/concentrator.lua",
 
-    ["kong.clustering.services.debug"] = "kong/clustering/services/debug.lua",
     ["kong.clustering.services.sync"] = "kong/clustering/services/sync/init.lua",
     ["kong.clustering.services.sync.rpc"] = "kong/clustering/services/sync/rpc.lua",
     ["kong.clustering.services.sync.hooks"] = "kong/clustering/services/sync/hooks.lua",

kong/init.lua

@@ -699,10 +699,6 @@ function Kong.init()
         kong.sync = require("kong.clustering.services.sync").new(db, is_control_plane(config))
         kong.sync:init(kong.rpc)
       end
-
-      if is_data_plane(config) then
-        require("kong.clustering.services.debug").init(kong.rpc)
-      end
     end
   end
 

spec/02-integration/18-hybrid_rpc/01-rpc_spec.lua

@@ -1,7 +1,8 @@
 local helpers = require "spec.helpers"
 local cjson = require("cjson.safe")
 
-for _, inc_sync in ipairs { "on", "off"  } do
+-- we need incremental sync to verify rpc
+for _, inc_sync in ipairs { "on" } do
 for _, strategy in helpers.each_strategy() do
   describe("Hybrid Mode RPC #" .. strategy .. " inc_sync=" .. inc_sync, function()
 
@@ -50,12 +51,15 @@ for _, strategy in helpers.each_strategy() do
           local body = assert.res_status(200, res)
           local json = cjson.decode(body)
 
+          assert(json)
+
+          -- TODO: perhaps need a new test method
           for _, v in pairs(json.data) do
             if v.ip == "127.0.0.1" and v.rpc_capabilities and #v.rpc_capabilities ~= 0 then
               table.sort(v.rpc_capabilities)
               assert.near(14 * 86400, v.ttl, 3)
-              -- kong.debug.log_level.v1 should be the first rpc service
-              assert.same("kong.debug.log_level.v1", v.rpc_capabilities[1])
+              -- check the available rpc service
+              assert.same("kong.sync.v2", v.rpc_capabilities[1])
               return true
             end
           end

spec/02-integration/18-hybrid_rpc/04-concentrator_spec.lua

@@ -2,7 +2,8 @@ local helpers = require "spec.helpers"
 local cjson = require("cjson.safe")
 
 
-local function obtain_dp_node_id()
+-- keep it for future usage
+local function obtain_dp_node_id()  -- luacheck: ignore
   local dp_node_id
 
   helpers.wait_until(function()
@@ -27,7 +28,8 @@ local function obtain_dp_node_id()
 end
 
 
-for _, inc_sync in ipairs { "on", "off"  } do
+-- we need incremental sync to verify rpc
+for _, inc_sync in ipairs { "on" } do
 for _, strategy in helpers.each_strategy() do
   describe("Hybrid Mode RPC over DB concentrator #" .. strategy .. " inc_sync=" .. inc_sync, function()
 
@@ -77,35 +79,9 @@ for _, strategy in helpers.each_strategy() do
       helpers.stop_kong()
     end)
 
-    describe("Dynamic log level over RPC", function()
-      it("can get the current log level", function()
-        local dp_node_id = obtain_dp_node_id()
-
-        -- this sleep is *not* needed for the below wait_until to succeed,
-        -- but it makes the wait_until tried succeed sooner because this
-        -- extra time gives the concentrator enough time to report the node is
-        -- online inside the DB. Without it, the first call to "/log-level"
-        -- will always timeout after 5 seconds
-        ngx.sleep(1)
-
-        helpers.wait_until(function()
-          local admin_client = helpers.admin_client()
-          finally(function()
-            admin_client:close()
-          end)
-
-          local res = assert(admin_client:get("/clustering/data-planes/" .. dp_node_id .. "/log-level"))
-          if res.status == 200 then
-            local body = assert.res_status(200, res)
-            local json = cjson.decode(body)
-            assert.equal(0, json.timeout)
-            assert.equal("debug", json.current_level)
-            assert.equal("debug", json.original_level)
-            return true
-          end
-        end, 10)
-      end)
-    end)
+    -- TODO: test with other rpc
+    --describe("XXX over RPC", function()
+    --end)
   end)
 end -- for _, strategy
 end -- for inc_sync