From 3715d2da3ea6b1cb631c21855ba8404c0947ce31 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 8 Jul 2018 04:39:33 +0200 Subject: [PATCH] slightly refactor write_commit using new "want_new" flag --- src/borg/repository.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/borg/repository.py b/src/borg/repository.py index 16e6e38e6..0b2a20bf2 100644 --- a/src/borg/repository.py +++ b/src/borg/repository.py @@ -1482,14 +1482,11 @@ class LoggedIO: return self.segment, self.put_header_fmt.size def write_commit(self, intermediate=False): + # Intermediate commits go directly into the current segment - this makes checking their validity more + # expensive, but is faster and reduces clobber. Final commits go into a new segment. + fd = self.get_write_fd(want_new=not intermediate) if intermediate: - # Intermediate commits go directly into the current segment - this makes checking their validity more - # expensive, but is faster and reduces clobber. - fd = self.get_write_fd() fd.sync() - else: - self.close_segment() - fd = self.get_write_fd() header = self.header_no_crc_fmt.pack(self.header_fmt.size, TAG_COMMIT) crc = self.crc_fmt.pack(crc32(header) & 0xffffffff) fd.write(b''.join((crc, header)))