lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-24 12:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix:params changed when cluster sender is connecting (#1420)

Browse Source 
Co-authored-by: LiuYang <cm.yang@alibaba-inc.com>
This commit is contained in:
cm
2021-06-08 17:03:20 +08:00
committed by GitHub
parent c90e288601
commit 3900067026
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lualib/skynet/cluster.lua
View File

@@ -5,6 +5,10 @@ local cluster = {}
local sender = {} local sender = {}
local task_queue = {} local task_queue = {}
local function repack(address, ...)
return address, skynet.pack(...)
end
local function request_sender(q, node) local function request_sender(q, node)
local ok, c = pcall(skynet.call, clusterd, "lua", "sender", node) local ok, c = pcall(skynet.call, clusterd, "lua", "sender", node)
if not ok then if not ok then
@@ -16,9 +20,9 @@ local function request_sender(q, node)
q.confirm = confirm q.confirm = confirm
q.sender = c q.sender = c
for _, task in ipairs(q) do for _, task in ipairs(q) do
if type(task) == "table" then if type(task) == "string" then
if c then if c then
skynet.send(c, "lua", "push", task[1], skynet.pack(table.unpack(task,2,task.n))) skynet.send(c, "lua", "push", repack(skynet.unpack(task)))
end end
else else
skynet.wakeup(task) skynet.wakeup(task)
@@ -53,14 +57,19 @@ end
function cluster.call(node, address, ...) function cluster.call(node, address, ...)
-- skynet.pack(...) will free by cluster.core.packrequest -- skynet.pack(...) will free by cluster.core.packrequest
return skynet.call(get_sender(node), "lua", "req", address, skynet.pack(...)) local s = sender[node]
if not s then
local task = skynet.packstring(address, ...)
return skynet.call(get_sender(node), "lua", "req", repack(skynet.unpack(task)))
end
return skynet.call(s, "lua", "req", address, skynet.pack(...))
end end
function cluster.send(node, address, ...) function cluster.send(node, address, ...)
-- push is the same with req, but no response -- push is the same with req, but no response
local s = sender[node] local s = sender[node]
if not s then if not s then
table.insert(task_queue[node], table.pack(address, ...)) table.insert(task_queue[node], skynet.packstring(address, ...))
else else
skynet.send(sender[node], "lua", "push", address, skynet.pack(...)) skynet.send(sender[node], "lua", "push", address, skynet.pack(...))
end end