Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(clustering/rpc): dp does not need concentrator #13829

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions kong/clustering/rpc/manager.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ local _MT = { __index = _M, }
local server = require("resty.websocket.server")
local client = require("resty.websocket.client")
local socket = require("kong.clustering.rpc.socket")
local concentrator = require("kong.clustering.rpc.concentrator")
local future = require("kong.clustering.rpc.future")
local utils = require("kong.clustering.rpc.utils")
local callbacks = require("kong.clustering.rpc.callbacks")
Expand Down Expand Up @@ -42,15 +41,17 @@ function _M.new(conf, node_id)
-- clients[node_id]: { socket1 => true, socket2 => true, ... }
clients = {},
client_capabilities = {},
client_ips = {}, -- store DP node's ip addr
node_id = node_id,
conf = conf,
cluster_cert = assert(clustering_tls.get_cluster_cert(conf)),
cluster_cert_key = assert(clustering_tls.get_cluster_cert_key(conf)),
callbacks = callbacks.new(),
}

self.concentrator = concentrator.new(self, kong.db)
if conf.role == "control_plane" then
self.concentrator = require("kong.clustering.rpc.concentrator").new(self, kong.db)
self.client_ips = {} -- store DP node's ip addr
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about make client_ips a part of concerntrator

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure about it, but I think collecting ip addresses is not the responsibility of concentrator.

end

return setmetatable(self, _MT)
end
Expand All @@ -59,7 +60,10 @@ end
function _M:_add_socket(socket, capabilities_list)
local sockets = self.clients[socket.node_id]
if not sockets then
assert(self.concentrator:_enqueue_subscribe(socket.node_id))
if self.concentrator then
assert(self.concentrator:_enqueue_subscribe(socket.node_id))
end

sockets = setmetatable({}, { __mode = "k", })
self.clients[socket.node_id] = sockets
end
Expand All @@ -85,9 +89,12 @@ function _M:_remove_socket(socket)

if table_isempty(sockets) then
self.clients[node_id] = nil
self.client_ips[node_id] = nil
self.client_capabilities[node_id] = nil
assert(self.concentrator:_enqueue_unsubscribe(node_id))

if self.concentrator then
self.client_ips[node_id] = nil
assert(self.concentrator:_enqueue_unsubscribe(node_id))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and so it can be a part of unsubscribe

end
end
end

Expand Down
Loading