From: Vladimir Davydov <vdavydov.dev@gmail.com> To: kostja@tarantool.org Cc: tarantool-patches@freelists.org Subject: [PATCH 2/2] vinyl: fix backup skipping vylog created after recovery Date: Sun, 19 Aug 2018 23:44:40 +0300 [thread overview] Message-ID: <a45ad75c932b7998a45d358c75a3a10968648984.1534710806.git.vdavydov.dev@gmail.com> (raw) In-Reply-To: <70ba3452fba34b4a1529f17e4872924005ea439b.1534710806.git.vdavydov.dev@gmail.com> In-Reply-To: <70ba3452fba34b4a1529f17e4872924005ea439b.1534710806.git.vdavydov.dev@gmail.com> Commit 8e710090fcbc ("vinyl: simplify vylog recovery from backup") broke backup in case the vylog directory is empty at the time of recovery (i.e. vinyl isn't in use): before the commit we added the last checkpoint vclock to the vylog directory index in this case while now we don't. As a result, if the user starts using vinyl (creates a vinyl space) after recovery, backup will not return the newly created vylog, because it hasn't been indexed. Fix this issue by restoring the code that adds the last checkpoint vclock to the vylog directory index in case no vylog exists on recovery. Closes #3624 --- https://github.com/tarantool/tarantool/issues/3624 https://github.com/tarantool/tarantool/commits/dv/gh-3624-vy-fix-vylog-backup src/box/vy_log.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/box/vy_log.c b/src/box/vy_log.c index d8613170..fc8ede59 100644 --- a/src/box/vy_log.c +++ b/src/box/vy_log.c @@ -912,8 +912,17 @@ vy_log_begin_recovery(const struct vclock *vclock) if (xdir_scan(&vy_log.dir) < 0 && errno != ENOENT) return NULL; - if (xdir_last_vclock(&vy_log.dir, &vy_log.last_checkpoint) < 0) + if (xdir_last_vclock(&vy_log.dir, &vy_log.last_checkpoint) < 0) { + /* + * Even if there's no vylog (i.e. vinyl isn't in use), + * we still have to add the vclock to the xdir index, + * because we may need it for garbage collection or + * backup in case the user starts using vinyl after + * recovery. + */ + xdir_add_vclock(&vy_log.dir, vclock); vclock_copy(&vy_log.last_checkpoint, vclock); + } int cmp = vclock_compare(&vy_log.last_checkpoint, vclock); if (cmp > 0) { -- 2.11.0
next prev parent reply other threads:[~2018-08-19 20:44 UTC|newest] Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-08-19 20:44 [PATCH 1/2] xlog: simplify xdir_add_vclock protocol Vladimir Davydov 2018-08-19 20:44 ` Vladimir Davydov [this message] 2018-08-22 8:03 ` [tarantool-patches] " Kirill Yukhin
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=a45ad75c932b7998a45d358c75a3a10968648984.1534710806.git.vdavydov.dev@gmail.com \ --to=vdavydov.dev@gmail.com \ --cc=kostja@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [PATCH 2/2] vinyl: fix backup skipping vylog created after 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