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.

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

Jump to bottom

fix: state sent to be saved twice #11488

Merged
merged 3 commits into from
Feb 13, 2024
Merged

fix: state sent to be saved twice #11488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ff02a6
fix: state sent to be saved twice
lpetrovic05 Feb 12, 2024
aa33b4c
Merge branch 'develop' into 11458-D-reconnect-state-saved-twice
lpetrovic05 Feb 12, 2024
b01a5fe
Merge branch 'develop' into 11458-D-reconnect-state-saved-twice
lpetrovic05 Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/SwirldsPlatform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,10 +910,12 @@ private void loadReconnectState(final SignedState signedState) {
// this guarantees that the platform status will be RECONNECT_COMPLETE before the state is saved
platformStatusManager.submitStatusAction(new ReconnectCompleteAction(signedState.getRound()));
latestImmutableState.setState(signedState.reserve("set latest immutable to reconnect state"));
stateManagementComponent.stateToLoad(signedState, SourceOfSignedState.RECONNECT);
savedStateController.reconnectStateReceived(
signedState.reserve("savedStateController.reconnectStateReceived"));
platformWiring.getSaveStateToDiskInput().put(signedState.reserve("save reconnect state to disk"));
// this will send the state to the signature collector which will send it to be written to disk.
// in the future, we might not send it to the collector because it already has all the signatures
// if this is the case, we must make sure to send it to the writer directly
stateManagementComponent.stateToLoad(signedState, SourceOfSignedState.RECONNECT);

loadStateIntoConsensus(signedState);

Expand Down
3 changes: 1 addition & 2 deletions ...platform-core/src/main/java/com/swirlds/platform/state/signed/SignedStateFileManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import static com.swirlds.common.io.utility.FileUtils.deleteDirectoryAndLog;
import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;
import static com.swirlds.logging.legacy.LogMarker.STATE_TO_DISK;
import static com.swirlds.platform.state.signed.StateToDiskReason.UNKNOWN;

import com.swirlds.base.time.Time;
Expand Down Expand Up @@ -126,7 +125,7 @@ public SignedStateFileManager(
final SignedState signedState = reservedSignedState.get();
if (signedState.hasStateBeenSavedToDisk()) {
logger.info(
STATE_TO_DISK.getMarker(),
EXCEPTION.getMarker(),
"Not saving signed state for round {} to disk because it has already been saved.",
signedState.getRound());
return null;
Expand Down