From: Vladimir Davydov <vdavydov.dev@gmail.com> To: kostja@tarantool.org Cc: tarantool-patches@freelists.org Subject: [RFC PATCH 05/12] box: retrieve instance uuid before starting local recovery Date: Wed, 6 Jun 2018 20:45:05 +0300 [thread overview] Message-ID: <18c468271e92ad05c24e49fa47d448f3b60961ba.1528305232.git.vdavydov.dev@gmail.com> (raw) In-Reply-To: <cover.1528305232.git.vdavydov.dev@gmail.com> In-Reply-To: <cover.1528305232.git.vdavydov.dev@gmail.com> In order to find out if the current instance fell too much behind its peers in the cluster and so needs to be rebootstrapped, we need to connect it to remote peers before proceeding to local recovery. The problem is box.cfg.replication may have an entry corresponding to the instance itself so before connecting we have to start listening to incoming connections. Since an instance is supposed to sent its uuid in the greeting message, we also have to initialize INSTANCE_UUID early, before we start local recovery. So this patch makes memtx engine constructor not only scan the snapshot directory, but also read the header of the most recent snapshot to initialize INSTANCE_UUID. Needed for #461 --- src/box/box.cc | 18 ++++++++++-------- src/box/memtx_engine.c | 11 ++++++++++- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/box/box.cc b/src/box/box.cc index 61bfa117..e1bf3934 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -1839,6 +1839,15 @@ box_cfg_xc(void) } bool is_bootstrap_leader = false; if (last_checkpoint_lsn >= 0) { + /* Check instance UUID. */ + assert(!tt_uuid_is_nil(&INSTANCE_UUID)); + if (!tt_uuid_is_nil(&instance_uuid) && + !tt_uuid_is_equal(&instance_uuid, &INSTANCE_UUID)) { + tnt_raise(ClientError, ER_INSTANCE_UUID_MISMATCH, + tt_uuid_str(&instance_uuid), + tt_uuid_str(&INSTANCE_UUID)); + } + struct wal_stream wal_stream; wal_stream_create(&wal_stream, cfg_geti64("rows_per_wal")); @@ -1882,7 +1891,6 @@ box_cfg_xc(void) cfg_getd("wal_dir_rescan_delay")); title("hot_standby"); - assert(!tt_uuid_is_nil(&INSTANCE_UUID)); /* * Leave hot standby mode, if any, only * after acquiring the lock. @@ -1902,13 +1910,7 @@ box_cfg_xc(void) recovery_finalize(recovery, &wal_stream.base); engine_end_recovery_xc(); - /* Check replica set and instance UUID. */ - if (!tt_uuid_is_nil(&instance_uuid) && - !tt_uuid_is_equal(&instance_uuid, &INSTANCE_UUID)) { - tnt_raise(ClientError, ER_INSTANCE_UUID_MISMATCH, - tt_uuid_str(&instance_uuid), - tt_uuid_str(&INSTANCE_UUID)); - } + /* Check replica set UUID. */ if (!tt_uuid_is_nil(&replicaset_uuid) && !tt_uuid_is_equal(&replicaset_uuid, &REPLICASET_UUID)) { tnt_raise(ClientError, ER_REPLICASET_UUID_MISMATCH, diff --git a/src/box/memtx_engine.c b/src/box/memtx_engine.c index fac84ce1..df0c6c28 100644 --- a/src/box/memtx_engine.c +++ b/src/box/memtx_engine.c @@ -164,7 +164,6 @@ memtx_engine_recover_snapshot(struct memtx_engine *memtx, struct xlog_cursor cursor; if (xlog_cursor_open(&cursor, filename) < 0) return -1; - INSTANCE_UUID = cursor.meta.instance_uuid; int rc; struct xrow_header row; @@ -1001,6 +1000,16 @@ memtx_engine_new(const char *snap_dirname, bool force_recovery, if (xdir_scan(&memtx->snap_dir) != 0) goto fail; + int64_t snap_signature = xdir_last_vclock(&memtx->snap_dir, NULL); + if (snap_signature >= 0) { + struct xlog_cursor cursor; + if (xdir_open_cursor(&memtx->snap_dir, + snap_signature, &cursor) != 0) + goto fail; + INSTANCE_UUID = cursor.meta.instance_uuid; + xlog_cursor_close(&cursor, false); + } + stailq_create(&memtx->gc_queue); memtx->gc_fiber = fiber_new("memtx.gc", memtx_engine_gc_f); if (memtx->gc_fiber == NULL) -- 2.11.0
next prev parent reply other threads:[~2018-06-06 17:45 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-06-06 17:45 [RFC PATCH 00/12] Replica rejoin Vladimir Davydov 2018-06-06 17:45 ` [RFC PATCH 01/12] recovery: drop unused recovery_exit Vladimir Davydov 2018-06-08 4:13 ` Konstantin Osipov 2018-06-06 17:45 ` [RFC PATCH 02/12] recovery: constify vclock argument Vladimir Davydov 2018-06-08 4:14 ` Konstantin Osipov 2018-06-06 17:45 ` [RFC PATCH 03/12] applier: remove extra new line in log message printed on connect Vladimir Davydov 2018-06-08 4:15 ` Konstantin Osipov 2018-06-06 17:45 ` [RFC PATCH 04/12] xrow: add helper function for encoding vclock Vladimir Davydov 2018-06-08 4:16 ` Konstantin Osipov 2018-06-06 17:45 ` Vladimir Davydov [this message] 2018-06-08 4:22 ` [RFC PATCH 05/12] box: retrieve instance uuid before starting local recovery Konstantin Osipov 2018-06-06 17:45 ` [RFC PATCH 06/12] box: refactor hot standby recovery Vladimir Davydov 2018-06-08 4:40 ` Konstantin Osipov 2018-06-08 6:43 ` Vladimir Davydov 2018-06-08 13:15 ` Konstantin Osipov 2018-06-08 13:30 ` Vladimir Davydov 2018-06-06 17:45 ` [RFC PATCH 07/12] box: retrieve end vclock before starting local recovery Vladimir Davydov 2018-06-06 17:45 ` [RFC PATCH 08/12] box: open the port " Vladimir Davydov 2018-06-06 17:45 ` [RFC PATCH 09/12] box: connect to remote peers " Vladimir Davydov 2018-06-06 17:45 ` [RFC PATCH 10/12] box: factor out local recovery function Vladimir Davydov 2018-06-06 17:45 ` [RFC PATCH 11/12] applier: inquire oldest vclock on connect Vladimir Davydov 2018-06-06 17:45 ` [RFC PATCH 12/12] replication: rebootstrap instance on startup if it fell behind Vladimir Davydov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=18c468271e92ad05c24e49fa47d448f3b60961ba.1528305232.git.vdavydov.dev@gmail.com \ --to=vdavydov.dev@gmail.com \ --cc=kostja@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [RFC PATCH 05/12] box: retrieve instance uuid before starting local recovery' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox