From: Vladimir Davydov <vdavydov.dev@gmail.com> To: kostja@tarantool.org Cc: tarantool-patches@freelists.org Subject: [PATCH 1/3] xlog: erase eof marker when reopening existing file for writing Date: Fri, 15 Jun 2018 18:48:20 +0300 [thread overview] Message-ID: <3ce2e8070f75cbd3022add41faf940a8809a8d1c.1529075903.git.vdavydov.dev@gmail.com> (raw) In-Reply-To: <cover.1529075903.git.vdavydov.dev@gmail.com> In-Reply-To: <cover.1529075903.git.vdavydov.dev@gmail.com> When reopening an existing xlog file (as in case of vylog), we do not erase the eof marker immediately. Instead we reposition file offset to (file_size - sizeof eof_marker), assuming the eof marker will be overwritten on the first write. However, it isn't enough if we want to reuse this function for reopening WAL files, because when scanning the WAL directory we close a file if we read eof marker and never reopen it again, see recover_remaining_wals(). So to avoid skipping rows written to a once closed WAL, we have to erase the eof marker when reopening an xlog file. Let's do it with truncate(). --- src/box/xlog.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/box/xlog.c b/src/box/xlog.c index be7b3459..142262b4 100644 --- a/src/box/xlog.c +++ b/src/box/xlog.c @@ -787,10 +787,7 @@ xlog_open(struct xlog *xlog, const char *name) goto err_read; } - /* - * If the file has eof marker, reposition the file pointer so - * that the next write will overwrite it. - */ + /* Check if the file has EOF marker. */ xlog->offset = fio_lseek(xlog->fd, -(off_t)sizeof(magic), SEEK_END); if (xlog->offset < 0) goto no_eof; @@ -809,6 +806,13 @@ no_eof: xlog->filename); goto err_read; } + } else { + /* Truncate the file to erase the EOF marker. */ + if (ftruncate(xlog->fd, xlog->offset) != 0) { + diag_set(SystemError, "failed to truncate file '%s'", + xlog->filename); + goto err_read; + } } return 0; err_read: -- 2.11.0
next prev parent reply other threads:[~2018-06-15 15:48 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-06-08 17:34 [PATCH v2 00/11] Replica rejoin Vladimir Davydov 2018-06-08 17:34 ` [PATCH v2 01/11] box: retrieve instance uuid before starting local recovery Vladimir Davydov 2018-06-08 17:51 ` Konstantin Osipov 2018-06-08 17:34 ` [PATCH v2 02/11] box: refactor hot standby recovery Vladimir Davydov 2018-06-08 17:34 ` [PATCH v2 03/11] box: retrieve end vclock before starting local recovery Vladimir Davydov 2018-06-14 12:58 ` Konstantin Osipov 2018-06-08 17:34 ` [PATCH v2 04/11] box: open the port " Vladimir Davydov 2018-06-13 20:43 ` Konstantin Osipov 2018-06-14 8:31 ` Vladimir Davydov 2018-06-14 12:59 ` Konstantin Osipov 2018-06-15 15:48 ` [PATCH 0/3] Speed up recovery in case rebootstrap is not needed Vladimir Davydov 2018-06-15 15:48 ` Vladimir Davydov [this message] 2018-06-27 17:09 ` [PATCH 1/3] xlog: erase eof marker when reopening existing file for writing Konstantin Osipov 2018-06-15 15:48 ` [PATCH 2/3] wal: rollback vclock on write failure Vladimir Davydov 2018-06-27 17:22 ` Konstantin Osipov 2018-06-15 15:48 ` [PATCH 3/3] wal: create empty xlog on shutdown Vladimir Davydov 2018-06-27 17:29 ` Konstantin Osipov 2018-06-08 17:34 ` [PATCH v2 05/11] box: connect to remote peers before starting local recovery Vladimir Davydov 2018-06-13 20:45 ` Konstantin Osipov 2018-06-14 8:34 ` Vladimir Davydov 2018-06-14 12:59 ` Konstantin Osipov 2018-06-08 17:34 ` [PATCH v2 06/11] box: factor out local recovery function Vladimir Davydov 2018-06-13 20:50 ` Konstantin Osipov 2018-06-08 17:34 ` [PATCH v2 07/11] applier: inquire oldest vclock on connect Vladimir Davydov 2018-06-13 20:51 ` Konstantin Osipov 2018-06-14 8:40 ` Vladimir Davydov 2018-06-08 17:34 ` [PATCH v2 08/11] replication: rebootstrap instance on startup if it fell behind Vladimir Davydov 2018-06-13 20:55 ` Konstantin Osipov 2018-06-14 8:58 ` Vladimir Davydov 2018-06-08 17:34 ` [PATCH v2 09/11] vinyl: simplify vylog recovery from backup Vladimir Davydov 2018-06-08 17:34 ` [PATCH v2 10/11] vinyl: pass flags to vy_recovery_new Vladimir Davydov 2018-06-13 20:56 ` Konstantin Osipov 2018-06-08 17:34 ` [PATCH v2 11/11] vinyl: implement rebootstrap support Vladimir Davydov 2018-06-10 12:02 ` 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=3ce2e8070f75cbd3022add41faf940a8809a8d1c.1529075903.git.vdavydov.dev@gmail.com \ --to=vdavydov.dev@gmail.com \ --cc=kostja@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [PATCH 1/3] xlog: erase eof marker when reopening existing file for writing' \ /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