Skip to content

fix(core): wait for in-flight save before shutting down systems #5385

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.

Sign up for GitHub

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

Open
soloturn wants to merge 1 commit into
base: develop
Choose a base branch
from
+11 −4
Open

fix(core): wait for in-flight save before shutting down systems #5385

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions engine/src/main/java/org/terasology/engine/core/modes/StateIngame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,16 +147,23 @@ public void dispose(boolean shuttingDown) {
worldRenderer.dispose();
worldRenderer = null;
}

// The save started above (waitForCompletionOfPreviousSaveAndStartSaving) runs on a
// background scheduler and, as part of serializing entities, sends deactivation events to
// ComponentSystems - the same systems componentSystemManager.shutdown() is about to tear
// down. Blocking on it here, before any system/entity teardown, keeps that in-flight save
// from dispatching events into systems (or entities) that have already been shut down.
// See #704.
if (storageManager != null) {
storageManager.finishSavingAndShutdown();
}

componentSystemManager.shutdown();

context.get(PhysicsEngine.class).dispose();

entityManager.clear();

if (storageManager != null) {
storageManager.finishSavingAndShutdown();
}

ModuleEnvironment oldEnvironment = context.get(ModuleManager.class).getEnvironment();
context.get(ModuleManager.class).loadEnvironment(Collections.<Module>emptySet(), true);
if (!shuttingDown) {
Expand Down
Loading