From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp29.i.mail.ru (smtp29.i.mail.ru [94.100.177.89]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 199CA46970F for ; Sun, 24 Nov 2019 20:24:47 +0300 (MSK) From: Vladislav Shpilevoy Date: Sun, 24 Nov 2019 18:24:42 +0100 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 1/1] Fix bootstrap.snap corrupted file. List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org, kyukhin@tarantool.org Bootstrap.snap is created from a normal snapshot file, but with erased VClock option in the header: SNAP 0.13 Version: 2.2.1-122-g1146bb78d Instance: 03d3836a-e608-421c-9f8d-ad9beefe7440 VClock: {} In a normal snapshot it is 'VClock: {1: ...}'. To erase the option usually developers use 'vim'. But when a binary file is opened in vim without any arguments, like this: vim bootstrap.snap on close it will edit some parts of the file in unexpected ways, depending on local vim settings. To forbid any implicit changes binary mode should be used: vim -b bootstrap.snap The patch regenerates bootstrap.snap and drops VClock using binary mode vim. Closes #4510 --- Branch: https://github.com/tarantool/tarantool/tree/gerold103/gh-4510-bootstrap-corrupt-2.2 Issue: https://github.com/tarantool/tarantool/issues/4510 src/box/bootstrap.snap | Bin 5907 -> 5905 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/box/bootstrap.snap b/src/box/bootstrap.snap index 828bb5b2230add7882f80c1560d29199a308e98a..4e9955be811cc8ed0cf232c4d47053fcc989b569 100644 GIT binary patch delta 2398 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 UsDpDmno@{n006T$4B83-3i8x_AOHXW -- 2.21.0 (Apple Git-122.2)