From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gorcunov@gmail.com>
Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com
[209.85.208.181])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by dev.tarantool.org (Postfix) with ESMTPS id 7D568469719
for <tarantool-patches@dev.tarantool.org>;
Thu, 19 Mar 2020 12:05:53 +0300 (MSK)
Received: by mail-lj1-f181.google.com with SMTP id a2so1552204ljk.6
for <tarantool-patches@dev.tarantool.org>;
Thu, 19 Mar 2020 02:05:53 -0700 (PDT)
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Thu, 19 Mar 2020 12:05:27 +0300
Message-Id: <20200319090537.5613-2-gorcunov@gmail.com>
In-Reply-To: <20200319090537.5613-1-gorcunov@gmail.com>
References: <20200319090537.5613-1-gorcunov@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [Tarantool-patches] [PATCH v13 01/11] box: recovery_journal_create
-- set journal here
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>,
<mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>,
<mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: tml <tarantool-patches@dev.tarantool.org>
Allows to eliminate code duplication.
Acked-by: Konstantin Osipov <kostja.osipov@gmail.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
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 09dd67ab4..eb5931e37 100644
--- a/src/box/box.cc
+++ b/src/box/box.cc
@@ -331,6 +331,7 @@ recovery_journal_create(struct recovery_journal *journal, struct vclock *v)
{
journal_create(&journal->base, recovery_journal_write, NULL);
journal->vclock = v;
+ journal_set(&journal->base);
}
static void
@@ -2055,7 +2056,6 @@ bootstrap_from_master(struct replica *master)
engine_begin_final_recovery_xc();
struct recovery_journal journal;
recovery_journal_create(&journal, &replicaset.vclock);
- journal_set(&journal.base);
if (!replication_anon) {
applier_resume_to_state(applier, APPLIER_JOINED,
@@ -2221,7 +2221,6 @@ local_recovery(const struct tt_uuid *instance_uuid,
struct recovery_journal journal;
recovery_journal_create(&journal, &recovery->vclock);
- journal_set(&journal.base);
/*
* We explicitly request memtx to recover its
--
2.20.1