raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge pull request #26605 from akka/wip-26601-snap-race-patriknw

Browse source 
fix race condition in Running.storingSnapshot, #26601
This commit is contained in:
Patrik Nordwall 2019-03-25 14:38:13 +01:00 • committed by GitHub
commit 482aa29a41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/Running.scala
View file

@ -321,11 +321,11 @@ private[akka] object Running {
Behaviors.unhandled
} else {
stashUser(cmd)
storingSnapshot(state, sideEffects)
Behaviors.same
}
}
def onSnapshotterResponse(response: SnapshotProtocol.Response): Unit = {
def onSaveSnapshotResponse(response: SnapshotProtocol.Response): Unit = {
val signal = response match {
case e @ SaveSnapshotSuccess(meta) =>
// # 24698 The deletion of old events are automatic, snapshots are triggered by the SaveSnapshotSuccess.
@ -342,7 +342,6 @@ private[akka] object Running {
Some(SnapshotFailed(SnapshotMetadata.fromUntyped(meta), error))
case _ =>
onDeleteSnapshotResponse(response)
None
}
@ -356,9 +355,14 @@ private[akka] object Running {
onCommand(cmd)
case JournalResponse(r) =>
onDeleteEventsJournalResponse(r)
case SnapshotterResponse(r) =>
onSnapshotterResponse(r)
tryUnstashOne(applySideEffects(sideEffects, state))
case SnapshotterResponse(response) =>
response match {
case _: SaveSnapshotSuccess | _: SaveSnapshotFailure =>
onSaveSnapshotResponse(response)
tryUnstashOne(applySideEffects(sideEffects, state))
case _ =>
onDeleteSnapshotResponse(response)
}
case _ =>
Behaviors.unhandled
}