From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id C1D9925FED for ; Tue, 26 Mar 2019 05:52:10 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gfuxHJEiptjc for ; Tue, 26 Mar 2019 05:52:10 -0400 (EDT) Received: from smtp53.i.mail.ru (smtp53.i.mail.ru [94.100.177.113]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 0BC1925FB5 for ; Tue, 26 Mar 2019 05:52:09 -0400 (EDT) Date: Tue, 26 Mar 2019 12:52:04 +0300 From: Kirill Yukhin Subject: [tarantool-patches] Re: [PATCH v2 3/9] box: fix Tarantool upgrade from 2.1.0 to 2.1.1 Message-ID: <20190326095204.j64duii2mcdbx52o@tarantool.org> References: <1e4434445b60b5a5e0c3b289505595b0e00c8f8c.1548838034.git.kshcherbatov@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1e4434445b60b5a5e0c3b289505595b0e00c8f8c.1548838034.git.kshcherbatov@tarantool.org> Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: tarantool-patches@freelists.org Cc: korablev@tarantool.org, Kirill Shcherbatov Hello, On 30 Jan 11:59, Kirill Shcherbatov wrote: > Tarantool could not start from the snapshot created by version > 2.1.0 because the new version 2.1.1 does not support the > index.opts.sql index opt and stops the execution. > Introduced a special state OPT_DEF_LEGACY macro to ignore legacy > options and introduced migration code in upgrade.lua. > --- > src/box/bootstrap.snap | Bin 1911 -> 1914 bytes > src/box/index_def.c | 1 + > src/box/lua/upgrade.lua | 24 +++++++- > src/box/opt_def.c | 3 + > src/box/opt_def.h | 12 ++-- > test/box-py/bootstrap.result | 2 +- > test/sql/upgrade.result | 52 ++++++++++++++++++ > test/sql/upgrade.test.lua | 17 ++++++ > .../upgrade/2.1.0/00000000000000000003.snap | Bin 0 -> 2124 bytes > 9 files changed, 105 insertions(+), 6 deletions(-) > create mode 100644 test/sql/upgrade/2.1.0/00000000000000000003.snap I've checked your patch into 2.1 branch. -- Regards, Kirill Yukhin