From 0c5560003019c1ab0a0bec84e7a4ea04c97877aa Mon Sep 17 00:00:00 2001 From: xumin Date: Wed, 30 Oct 2024 15:23:09 +0800 Subject: [PATCH] fix(clustering): avoid 500 accessing v1 api when inc_sync enabled fix KAG-5551 --- kong/init.lua | 6 ++++++ spec/02-integration/09-hybrid_mode/01-sync_spec.lua | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/kong/init.lua b/kong/init.lua index 81b5d2c3817c..e8d9a0964cd7 100644 --- a/kong/init.lua +++ b/kong/init.lua @@ -892,6 +892,12 @@ function Kong.init_worker() return end + if kong.configuration.role == "control_plane" then + if kong.clustering then + kong.clustering:init_worker() + end + end + kong.vault.init_worker() kong.timing = kong_global.init_timing() diff --git a/spec/02-integration/09-hybrid_mode/01-sync_spec.lua b/spec/02-integration/09-hybrid_mode/01-sync_spec.lua index a1d2f9b37641..bbb6ff516f65 100644 --- a/spec/02-integration/09-hybrid_mode/01-sync_spec.lua +++ b/spec/02-integration/09-hybrid_mode/01-sync_spec.lua @@ -13,7 +13,7 @@ local KEY_AUTH_PLUGIN --- XXX FIXME: enable inc_sync = on -for _, inc_sync in ipairs { "off" } do +for _, inc_sync in ipairs { "on", "off" } do for _, strategy in helpers.each_strategy() do describe("CP/DP communication #" .. strategy .. " inc_sync=" .. inc_sync, function() @@ -624,6 +624,12 @@ describe("CP/DP #version check #" .. strategy, function() end) end) +-- skips the rest of the tests. We will fix them in a follow-up PR +if inc_sync == "on" then + pending("fix this!") + return +end + describe("CP/DP config sync #" .. strategy, function() lazy_setup(function() helpers.get_db_utils(strategy) -- runs migrations