From 2620eb9e02259c8f190f0ae57afc881e58dd4ee1 Mon Sep 17 00:00:00 2001
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Date: Thu, 6 Jun 2024 22:19:16 +0200
Subject: [PATCH] box: move recovery_journal creation
Recovery journal uses word "recovery" to say that it works with
xlogs. For snapshot recovery there is bootstrap_journal. Lets use
it during local snapshot recovery.
The reasoning is that while right now there is no difference, in
next commits the recovery_journal will do more.
Part of #10113
NO_DOC=refactoring
NO_TEST=refactoring
NO_CHANGELOG=refactoring
---
src/box/box.cc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/box/box.cc b/src/box/box.cc
index 983be84baa..ebb537a326 100644
--- a/src/box/box.cc
+++ b/src/box/box.cc
@@ -5349,8 +5349,6 @@ local_recovery(const struct vclock *checkpoint_vclock)
memtx = (struct memtx_engine *)engine_by_name("memtx");
assert(memtx != NULL);
- recovery_journal_create(&recovery->vclock);
-
/*
* We explicitly request memtx to recover its
* snapshot as a separate phase since it contains
@@ -5362,6 +5360,7 @@ local_recovery(const struct vclock *checkpoint_vclock)
box_run_on_recovery_state(RECOVERY_STATE_SNAPSHOT_RECOVERED);
+ recovery_journal_create(&recovery->vclock);
engine_begin_final_recovery_xc();
recover_remaining_wals(recovery, &wal_stream.base, NULL, false);
if (wal_stream_has_unfinished_tx(&wal_stream)) {
--
GitLab