mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-12 23:04:52 +09:00
Check the run token on every prefetched chunk
Chunks of an earlier controller run's copy still in flight could land in a newer run's copy of the same generation. Every chunk now carries the token, and the scenario ignores a chunk whose token differs from its record's. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
5e4dcada50
commit
17f029e39e
3 files changed
+10
-9
No files matched your search
@@ -701,11 +701,11 @@ end
|
||||
|
||||
-- Called by instance.ts as /sc player_sync.prefetch_inventory('name', generation, 'chunk', number, total, components,
|
||||
-- token) with a copy of a player's stored data that the controller sent ahead (PrefetchEvent) while they switch to this
|
||||
-- server. It holds
|
||||
-- the copy for a player who is offline here or doesn't exist yet. It prints only when it refuses or ignores a chunk,
|
||||
-- which stops the host sending the rest.
|
||||
-- server. It holds the copy for a player who is offline here or doesn't exist yet. Every chunk carries the token, so
|
||||
-- chunks of an earlier controller run's copy never land in a newer one. It prints only when it refuses or ignores a
|
||||
-- chunk, which stops the host sending the rest.
|
||||
--- @param components string? JSON of the components the instance stripped the copy by, given with the first chunk
|
||||
--- @param token string? The controller run that sent the copy, given with the first chunk
|
||||
--- @param token string? The controller run that sent the copy
|
||||
function player_sync.prefetch_inventory(player_name, generation, data, number, total, components, token)
|
||||
local script_data = get_script_data()
|
||||
if number == 1 then
|
||||
@@ -744,7 +744,7 @@ function player_sync.prefetch_inventory(player_name, generation, data, number, t
|
||||
end
|
||||
|
||||
local record = script_data.active_downloads[player_name]
|
||||
if not (record and record.prefetch and record.generation == generation) then
|
||||
if not (record and record.prefetch and record.generation == generation and record.token == token) then
|
||||
-- Refused at chunk 1, dropped by the acquire reply or the inactivity check, or replaced by a newer copy
|
||||
rcon.print("Ignored prefetch chunk " .. number .. " for " .. player_name)
|
||||
return
|
||||
|
||||
Reference in new issue
Block a user