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 95AA22AC1E for ; Fri, 22 Mar 2019 06:18:50 -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 mME6KC5qJrQO for ; Fri, 22 Mar 2019 06:18:50 -0400 (EDT) Received: from smtp49.i.mail.ru (smtp49.i.mail.ru [94.100.177.109]) (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 4A99A25FC5 for ; Fri, 22 Mar 2019 06:18:50 -0400 (EDT) Subject: [tarantool-patches] Re: [PATCH v2 3/9] box: fix Tarantool upgrade from 2.1.0 to 2.1.1 References: <1e4434445b60b5a5e0c3b289505595b0e00c8f8c.1548838034.git.kshcherbatov@tarantool.org> <4F67EA78-E237-4424-BEF6-ECE8ADCD5CBF@tarantool.org> <860C81EF-4B1E-4648-A638-C804DB32A3EF@tarantool.org> <628af1ea-16b5-b805-016a-05d7a6866944@tarantool.org> <64334100-a983-2254-2f04-8ec51dd1e3e6@tarantool.org> From: Kirill Shcherbatov Message-ID: Date: Fri, 22 Mar 2019 13:18:47 +0300 MIME-Version: 1.0 In-Reply-To: <64334100-a983-2254-2f04-8ec51dd1e3e6@tarantool.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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, Vladislav Shpilevoy Cc: Kirill Yukhin , "n.pettik" On 22.03.2019 12:28, Vladislav Shpilevoy wrote: > Hi! Thanks for the patch! Hi! Thank you for review and fixes. > 1. Why 'priv'? upgrade_priv_to_2_1_0 contains 'priv' suffix, > because it upgrades _priv system space and privileges. Ok, just move this code block down. > 2. Looks like a debug print, that you've forgotten to drop. > Please, do it. Yep. Dropped. > 3. As I understand, legacy means that whatever is stored here, it > should be skipped. But it contradicts with other member of struct > opt_def - your legacy structure contains a type in enum opt_type type. > Moreover - invalid type. Already fixed on branch. =================================================== 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 1831 -> 1830 bytes src/box/index_def.c | 1 + src/box/lua/upgrade.lua | 19 ++++++- src/box/opt_def.c | 4 ++ src/box/opt_def.h | 4 ++ test/box-py/bootstrap.result | 2 +- test/sql/upgrade.result | 49 ++++++++++++++++++ test/sql/upgrade.test.lua | 18 +++++++ .../upgrade/2.1.0/00000000000000000003.snap | Bin 0 -> 2124 bytes 9 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 test/sql/upgrade/2.1.0/00000000000000000003.snap diff --git a/src/box/bootstrap.snap b/src/box/bootstrap.snap index 0bb446fb6903ac3ef630c419b909f7db3df0372a..ae7b488633edd4a422f8a1fb60738f2cf5ff8ce5 100644 GIT binary patch diff --git a/src/box/index_def.c b/src/box/index_def.c index 6c37f9f1d..c743d12ce 100644 --- a/src/box/index_def.c +++ b/src/box/index_def.c @@ -62,6 +62,7 @@ const struct opt_def index_opts_reg[] = { OPT_DEF("run_size_ratio", OPT_FLOAT, struct index_opts, run_size_ratio), OPT_DEF("bloom_fpr", OPT_FLOAT, struct index_opts, bloom_fpr), OPT_DEF("lsn", OPT_INT64, struct index_opts, lsn), + OPT_DEF_LEGACY("sql"), OPT_END, }; diff --git a/src/box/lua/upgrade.lua b/src/box/lua/upgrade.lua index c72711ff7..dc7328714 100644 --- a/src/box/lua/upgrade.lua +++ b/src/box/lua/upgrade.lua @@ -616,6 +616,22 @@ local function upgrade_to_2_1_0() upgrade_priv_to_2_1_0() end +-------------------------------------------------------------------------------- +-- Tarantool 2.1.1 +-------------------------------------------------------------------------------- + +local function upgrade_to_2_1_1() + local _index = box.space[box.schema.INDEX_ID] + for _, index in _index:pairs() do + local opts = index.opts + if opts['sql'] ~= nil then + opts['sql'] = nil + _index:replace(box.tuple.new({index.id, index.iid, index.name, + index.type, opts, index.parts})) + end + end +end + local function get_version() local version = box.space._schema:get{'version'} if version == nil then @@ -643,7 +659,8 @@ local function upgrade(options) {version = mkversion(1, 7, 7), func = upgrade_to_1_7_7, auto = true}, {version = mkversion(1, 10, 0), func = upgrade_to_1_10_0, auto = true}, {version = mkversion(1, 10, 2), func = upgrade_to_1_10_2, auto = true}, - {version = mkversion(2, 1, 0), func = upgrade_to_2_1_0, auto = true} + {version = mkversion(2, 1, 0), func = upgrade_to_2_1_0, auto = true}, + {version = mkversion(2, 1, 1), func = upgrade_to_2_1_1, auto = true} } for _, handler in ipairs(handlers) do diff --git a/src/box/opt_def.c b/src/box/opt_def.c index 1d1f09ed5..c78021440 100644 --- a/src/box/opt_def.c +++ b/src/box/opt_def.c @@ -45,6 +45,7 @@ const char *opt_type_strs[] = { /* [OPT_STRPTR] = */ "string", /* [OPT_ENUM] = */ "enum", /* [OPT_ARRAY] = */ "array", + /* [OPT_LEGACY] = */ "legacy", }; static int @@ -145,6 +146,9 @@ opt_set(void *opts, const struct opt_def *def, const char **val, if (def->to_array(val, ival, opt, errcode, field_no) != 0) return -1; break; + case OPT_LEGACY: + mp_next(val); + break; default: unreachable(); } diff --git a/src/box/opt_def.h b/src/box/opt_def.h index 318204e91..21544412c 100644 --- a/src/box/opt_def.h +++ b/src/box/opt_def.h @@ -48,6 +48,7 @@ enum opt_type { OPT_STRPTR, /* char* */ OPT_ENUM, /* enum */ OPT_ARRAY, /* array */ + OPT_LEGACY, /* any type, skipped */ opt_type_MAX, }; @@ -106,6 +107,9 @@ struct opt_def { { key, OPT_ARRAY, offsetof(opts, field), sizeof(((opts *)0)->field), \ NULL, 0, NULL, 0, {(void *)to_array} } +#define OPT_DEF_LEGACY(key) \ + { key, OPT_LEGACY, 0, 0, NULL, 0, NULL, 0, {NULL} } + #define OPT_END {NULL, opt_type_MAX, 0, 0, NULL, 0, NULL, 0, {NULL}} struct region; diff --git a/test/box-py/bootstrap.result b/test/box-py/bootstrap.result index 3e4394557..cdf07117e 100644 --- a/test/box-py/bootstrap.result +++ b/test/box-py/bootstrap.result @@ -4,7 +4,7 @@ box.internal.bootstrap() box.space._schema:select{} --- - - ['max_id', 511] - - ['version', 2, 1, 0] + - ['version', 2, 1, 1] ... box.space._cluster:select{} --- diff --git a/test/sql/upgrade.result b/test/sql/upgrade.result index 02ab9b42b..fb1682ace 100644 --- a/test/sql/upgrade.result +++ b/test/sql/upgrade.result @@ -158,3 +158,52 @@ test_run:cmd('cleanup server upgrade') --- - true ... +-- Test Tarantool 2.1.0 to 2.1.1 migration. +work_dir = 'sql/upgrade/2.1.0/' +--- +... +test_run:cmd('create server upgrade210 with script="sql/upgrade/upgrade.lua", workdir="' .. work_dir .. '"') +--- +- true +... +test_run:cmd('start server upgrade210') +--- +- true +... +test_run:switch('upgrade210') +--- +- true +... +s = box.space.T2 +--- +... +s ~= nil +--- +- true +... +i = box.space._index:select(s.id) +--- +... +i ~= nil +--- +- true +... +i[1].opts.sql == nil +--- +- true +... +s:drop() +--- +... +test_run:switch('default') +--- +- true +... +test_run:cmd('stop server upgrade210') +--- +- true +... +test_run:cmd('cleanup server upgrade210') +--- +- true +... diff --git a/test/sql/upgrade.test.lua b/test/sql/upgrade.test.lua index cd4dd3cca..581833b9e 100644 --- a/test/sql/upgrade.test.lua +++ b/test/sql/upgrade.test.lua @@ -53,3 +53,21 @@ box.sql.execute("DROP TABLE T_OUT;") test_run:switch('default') test_run:cmd('stop server upgrade') test_run:cmd('cleanup server upgrade') + +-- Test Tarantool 2.1.0 to 2.1.1 migration. +work_dir = 'sql/upgrade/2.1.0/' +test_run:cmd('create server upgrade210 with script="sql/upgrade/upgrade.lua", workdir="' .. work_dir .. '"') +test_run:cmd('start server upgrade210') + +test_run:switch('upgrade210') + +s = box.space.T2 +s ~= nil +i = box.space._index:select(s.id) +i ~= nil +i[1].opts.sql == nil +s:drop() + +test_run:switch('default') +test_run:cmd('stop server upgrade210') +test_run:cmd('cleanup server upgrade210') diff --git a/test/sql/upgrade/2.1.0/00000000000000000003.snap b/test/sql/upgrade/2.1.0/00000000000000000003.snap new file mode 100644 index 0000000000000000000000000000000000000000..25bb78734dd5680c510bdb36cf94776f19c4b0c2 -- 2.21.0