Merge pull request #922 from graydon/bug-869-state-machine-publish-as…

…sert-again Make retry-states idempotent in state machines, fix #869. Reviewed-by: jedmccaleb
stellar · Nov 17, 2015 · c9bfa9f · c9bfa9f
2 parents 9cafcfb + ca89c5d
commit c9bfa9f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/history/CatchupStateMachine.cpp b/src/history/CatchupStateMachine.cpp
@@ -618,7 +618,13 @@ CatchupStateMachine::enterRetryingState(uint64_t nseconds)
 {
     assert(mState == CATCHUP_BEGIN || mState == CATCHUP_ANCHORED ||
            mState == CATCHUP_FETCHING || mState == CATCHUP_APPLYING ||
-           mState == CATCHUP_VERIFYING);
+           mState == CATCHUP_VERIFYING || mState == CATCHUP_RETRYING);
+
+    if (mState == CATCHUP_RETRYING)
+    {
+        return;
+    }
+
     bool anchored = mState >= CATCHUP_ANCHORED;
     bool verifying = mState >= CATCHUP_VERIFYING;
     mState = CATCHUP_RETRYING;

diff --git a/src/history/PublishStateMachine.cpp b/src/history/PublishStateMachine.cpp
@@ -69,7 +69,13 @@ void
 ArchivePublisher::enterRetryingState()
 {
     assert(mState == PUBLISH_BEGIN || mState == PUBLISH_SENDING ||
-           mState == PUBLISH_COMMITTING);
+           mState == PUBLISH_COMMITTING || mState == PUBLISH_RETRYING);
+
+    if (mState == PUBLISH_RETRYING)
+    {
+        return;
+    }
+
     mState = PUBLISH_RETRYING;
     mRetryTimer.expires_from_now(std::chrono::seconds(2));
     std::weak_ptr<ArchivePublisher> weak(shared_from_this());