fix: skip onClientJoin cleanup while a prior drain is still running#99
Open
terbin wants to merge 1 commit into
Open
fix: skip onClientJoin cleanup while a prior drain is still running#99terbin wants to merge 1 commit into
terbin wants to merge 1 commit into
Conversation
Reconnecting during the post-stop StorageFlow drain re-entered Events.onClientJoin which unconditionally ran StatisticManager.reset() and HotCache.clear(). The reset zeroed chunks/entities/players/containers mid-drain so EndFlow read all-zero counters and reported nothing_saved_yet, and the clear wiped HotCache.entities for chunks the IO coroutine had not yet processed, causing RegionBasedChunk.writeToStorage's null-branch to overwrite entity data for those chunks with an empty entities NBT. Guard onClientJoin with if (capturing) return so an in-flight drain keeps its state. When autoDownload is enabled, emit a MessageManager sendInfo before the guard so users who opted into capture-on-join see why no capture started on the new server. autoDownload on the new server is forgone in this window; acceptable trade-off, the prior capture is finishing.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reconnecting during the post-stop StorageFlow drain re-entered Events.onClientJoin which unconditionally ran StatisticManager.reset() and HotCache.clear(). The reset zeroed chunks/entities/players/containers mid-drain so EndFlow read all-zero counters and reported nothing_saved_yet, and the clear wiped HotCache.entities for chunks the IO coroutine had not yet processed, causing RegionBasedChunk.writeToStorage's null-branch to overwrite entity data for those chunks with an empty entities NBT.
Guard onClientJoin with if (capturing) return so an in-flight drain keeps its state. When autoDownload is enabled, emit a MessageManager sendInfo before the guard so users who opted into capture-on-join see why no capture started on the new server. autoDownload on the new server is forgone in this window; acceptable trade-off, the prior capture is finishing.
Verification
Drain survives reconnect to a different server without state wipe: EndFlow counters stay accurate and the captured region keeps its entity data instead of being overwritten with empty entity NBT.