From aa2963152d97cb42200173eabbc1ff5899113e53 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Wed, 28 Jan 2015 20:38:51 +0300
Subject: [PATCH] Add missing initialization of r->signature.
---
src/box/recovery.cc | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/box/recovery.cc b/src/box/recovery.cc
index 8e2fe068a3..be5c4e500f 100644
--- a/src/box/recovery.cc
+++ b/src/box/recovery.cc
@@ -394,8 +394,13 @@ recover_remaining_wals(struct recovery_state *r)
last_signature = current_vclock != NULL ?
vclock_signature(current_vclock) : -1;
/* if the caller already opened WAL for us, recover from it first */
- if (r->current_wal != NULL)
+ if (r->current_wal != NULL) {
+ if (r->signature == -1) {
+ r->signature
+ = vclock_signature(&r->current_wal->vclock);
+ }
goto recover_current_wal;
+ }
while (1) {
current_vclock = vclockset_isearch(&r->wal_dir.index, &r->vclock);
--
GitLab