From 6ad11634f700a5f156cc87ba4175b9e28ea7328f Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Thu, 7 Apr 2016 21:14:49 +0300
Subject: [PATCH] g-1433: a follow up fix
Delete the previous checkpoint in sophia only if we have a new one.
---
src/box/sophia_engine.cc | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/box/sophia_engine.cc b/src/box/sophia_engine.cc
index 0423208d27..ca03ebc679 100644
--- a/src/box/sophia_engine.cc
+++ b/src/box/sophia_engine.cc
@@ -768,10 +768,12 @@ SophiaEngine::waitCheckpoint()
void
SophiaEngine::commitCheckpoint()
{
- if (m_prev_checkpoint_lsn >= 0)
- sophia_delete_checkpoint(env, m_prev_checkpoint_lsn);
- m_prev_checkpoint_lsn = m_checkpoint_lsn;
- m_checkpoint_lsn = -1;
+ if (m_checkpoint_lsn >= 0) {
+ if (m_prev_checkpoint_lsn >= 0)
+ sophia_delete_checkpoint(env, m_prev_checkpoint_lsn);
+ m_prev_checkpoint_lsn = m_checkpoint_lsn;
+ m_checkpoint_lsn = -1;
+ }
}
void
--
GitLab