[tarantool-patches] [PATCH v1 2/2] box: fix Tarantool upgrade from 2.1.0 to 2.1.1

[Kirill Shcherbatov <kshcherbatov@tarantool.org>]

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/index_def.c                           |   1 +
 src/box/lua/upgrade.lua                       |  26 +++++++++++++++++-
 src/box/opt_def.c                             |   3 ++
 src/box/opt_def.h                             |  12 +++++---
 test/sql/upgrade.test.lua                     |  17 ++++++++++++
 .../upgrade/2.1.0/00000000000000000003.snap   | Bin 0 -> 2124 bytes
 6 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 test/sql/upgrade/2.1.0/00000000000000000003.snap

diff --git a/src/box/index_def.c b/src/box/index_def.c
index 2ba57ee9d..7d2c11729 100644
--- a/src/box/index_def.c
+++ b/src/box/index_def.c
@@ -60,6 +60,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 81f578e58..b5ef043eb 100644
--- a/src/box/lua/upgrade.lua
+++ b/src/box/lua/upgrade.lua
@@ -615,6 +615,29 @@ local function upgrade_to_2_1_0()
     upgrade_priv_to_2_1_0()
 end
 
+--------------------------------------------------------------------------------
+-- Tarantool 2.1.1
+--------------------------------------------------------------------------------
+
+local function upgrade_priv_to_2_1_1()
+    local _index = box.space[box.schema.INDEX_ID]
+    for _, index in _index:pairs() do
+        local opts = index.opts
+        for field, _ in pairs(opts) do
+            if field == 'sql' then
+                opts[field] = nil
+            end
+        end
+        _index:replace(box.tuple.new({index.id, index.iid, index.name,
+                                      index.type, opts, index.parts}))
+    end
+end
+
+local function upgrade_to_2_1_1()
+    log.info("started upgrade_to_2_1_1")
+    upgrade_priv_to_2_1_1()
+end
+
 local function get_version()
     local version = box.space._schema:get{'version'}
     if version == nil then
@@ -642,7 +665,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..17c555a0e 100644
--- a/src/box/opt_def.c
+++ b/src/box/opt_def.c
@@ -167,6 +167,8 @@ opts_parse_key(void *opts, const struct opt_def *reg, const char *key,
 		if (key_len != strlen(def->name) ||
 		    memcmp(key, def->name, key_len) != 0)
 			continue;
+		if (def->is_legacy)
+			goto skip;
 
 		return opt_set(opts, def, data, region, errcode, field_no);
 	}
@@ -177,6 +179,7 @@ opts_parse_key(void *opts, const struct opt_def *reg, const char *key,
 		diag_set(ClientError, errcode, field_no, errmsg);
 		return -1;
 	}
+skip:
 	mp_next(data);
 	return 0;
 }
diff --git a/src/box/opt_def.h b/src/box/opt_def.h
index 318204e91..27d088e74 100644
--- a/src/box/opt_def.h
+++ b/src/box/opt_def.h
@@ -86,6 +86,7 @@ struct opt_def {
 	int enum_size;
 	const char **enum_strs;
 	uint32_t enum_max;
+	bool is_legacy;
 	/** MsgPack data decode callbacks. */
 	union {
 		opt_def_to_enum_cb to_enum;
@@ -95,18 +96,21 @@ struct opt_def {
 
 #define OPT_DEF(key, type, opts, field) \
 	{ key, type, offsetof(opts, field), sizeof(((opts *)0)->field), \
-	  NULL, 0, NULL, 0, {NULL} }
+	  NULL, 0, NULL, 0, false, {NULL} }
 
 #define OPT_DEF_ENUM(key, enum_name, opts, field, to_enum) \
 	{ key, OPT_ENUM, offsetof(opts, field), sizeof(int), #enum_name, \
 	  sizeof(enum enum_name), enum_name##_strs, enum_name##_MAX, \
-	  {(void *)to_enum} }
+	  false, {(void *)to_enum} }
 
 #define OPT_DEF_ARRAY(key, opts, field, to_array) \
 	 { key, OPT_ARRAY, offsetof(opts, field), sizeof(((opts *)0)->field), \
-	   NULL, 0, NULL, 0, {(void *)to_array} }
+	   NULL, 0, NULL, 0, false, {(void *)to_array} }
 
-#define OPT_END {NULL, opt_type_MAX, 0, 0, NULL, 0, NULL, 0, {NULL}}
+#define OPT_DEF_LEGACY(key) \
+	{ key, opt_type_MAX, 0, 0, NULL, 0, NULL, 0, true, {NULL} }
+
+#define OPT_END {NULL, opt_type_MAX, 0, 0, NULL, 0, NULL, 0, false, {NULL}}
 
 struct region;
 
diff --git a/test/sql/upgrade.test.lua b/test/sql/upgrade.test.lua
index cd4dd3cca..4a4cd63a9 100644
--- a/test/sql/upgrade.test.lua
+++ b/test/sql/upgrade.test.lua
@@ -53,3 +53,20 @@ 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._space.index['name']:get('T2')
+s
+i = box.space._index:select(s.id)
+i
+i[1].opts.sql == nil
+
+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
GIT binary patch
literal 2124
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
C;_w&%

literal 0
HcmV?d00001

-- 
2.19.2