prosody
031382b207ec
tools/migration/prosody-migrator.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Annotate

tools/migration/prosody-migrator.lua @ 13080:031382b207ec

util.error: Add test for #1805 Checks that it doesn't fail on a stanza without <error> tag
author Kim Alvefur <zash@zash.se>
date Wed, 19 Apr 2023 12:03:34 +0200
parent 12387:05c250fa335a
child 13142:879a6a33c21b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4216
ff80a8471e86 tools/migration/*: Numerous changes and restructuring, and the addition of a Makefile
Matthew Wild <mwild1@gmail.com>
parents: 4211
diff changeset
1 #!/usr/bin/env lua
ff80a8471e86 tools/migration/*: Numerous changes and restructuring, and the addition of a Makefile
Matthew Wild <mwild1@gmail.com>
parents: 4211
diff changeset
2
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
3 CFG_SOURCEDIR=CFG_SOURCEDIR or os.getenv("PROSODY_SRCDIR");
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
4 CFG_CONFIGDIR=CFG_CONFIGDIR or os.getenv("PROSODY_CFGDIR");
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
5 CFG_PLUGINDIR=CFG_PLUGINDIR or os.getenv("PROSODY_PLUGINDIR");
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
6 CFG_DATADIR=CFG_DATADIR or os.getenv("PROSODY_DATADIR");
4216
ff80a8471e86 tools/migration/*: Numerous changes and restructuring, and the addition of a Makefile
Matthew Wild <mwild1@gmail.com>
parents: 4211
diff changeset
7
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
8 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
9
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
10 local function is_relative(path)
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
11 local path_sep = package.config:sub(1,1);
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
12 return ((path_sep == "/" and path:sub(1,1) ~= "/")
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
13 or (path_sep == "\\" and (path:sub(1,1) ~= "/" and path:sub(2,3) ~= ":\\")))
4239
69fe5fd861e7 tools/migration: Support for ~/ in paths
Matthew Wild <mwild1@gmail.com>
parents: 4235
diff changeset
14 end
69fe5fd861e7 tools/migration: Support for ~/ in paths
Matthew Wild <mwild1@gmail.com>
parents: 4235
diff changeset
15
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
16 -- Tell Lua where to find our libraries
4239
69fe5fd861e7 tools/migration: Support for ~/ in paths
Matthew Wild <mwild1@gmail.com>
parents: 4235
diff changeset
17 if CFG_SOURCEDIR then
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
18 local function filter_relative_paths(path)
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
19 if is_relative(path) then return ""; end
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
20 end
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
21 local function sanitise_paths(paths)
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
22 return (paths:gsub("[^;]+;?", filter_relative_paths):gsub(";;+", ";"));
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
23 end
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
24 package.path = sanitise_paths(CFG_SOURCEDIR.."/?.lua;"..package.path);
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
25 package.cpath = sanitise_paths(CFG_SOURCEDIR.."/?.so;"..package.cpath);
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
26 end
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
27
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
28 -- Substitute ~ with path to home directory in data path
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
29 if CFG_DATADIR then
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
30 if os.getenv("HOME") then
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
31 CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME"));
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
32 end
4239
69fe5fd861e7 tools/migration: Support for ~/ in paths
Matthew Wild <mwild1@gmail.com>
parents: 4235
diff changeset
33 end
69fe5fd861e7 tools/migration: Support for ~/ in paths
Matthew Wild <mwild1@gmail.com>
parents: 4235
diff changeset
34
4216
ff80a8471e86 tools/migration/*: Numerous changes and restructuring, and the addition of a Makefile
Matthew Wild <mwild1@gmail.com>
parents: 4211
diff changeset
35 local default_config = (CFG_CONFIGDIR or ".").."/migrator.cfg.lua";
4211
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
36
12162
b7ee14ba09c9 migrator: Reuse earlier usage text
Kim Alvefur <zash@zash.se>
parents: 12161
diff changeset
37 local function usage()
12163
59b65cc6312f migrator: Include --options in usage info
Kim Alvefur <zash@zash.se>
parents: 12162
diff changeset
38 print("Usage: " .. arg[0] .. " [OPTIONS] FROM_STORE TO_STORE");
59b65cc6312f migrator: Include --options in usage info
Kim Alvefur <zash@zash.se>
parents: 12162
diff changeset
39 print(" --config FILE Specify config file")
12166
39483b4099b4 migrator: Add option to keep going despite errors
Kim Alvefur <zash@zash.se>
parents: 12165
diff changeset
40 print(" --keep-going Keep going in case of errors");
12387
05c250fa335a Spelling: Fix various spelling mistakes (thanks timeless)
Kim Alvefur <zash@zash.se>
parents: 12168
diff changeset
41 print(" -v, --verbose Increase log-level");
12163
59b65cc6312f migrator: Include --options in usage info
Kim Alvefur <zash@zash.se>
parents: 12162
diff changeset
42 print("");
12162
b7ee14ba09c9 migrator: Reuse earlier usage text
Kim Alvefur <zash@zash.se>
parents: 12161
diff changeset
43 print("If no stores are specified, 'input' and 'output' are used.");
b7ee14ba09c9 migrator: Reuse earlier usage text
Kim Alvefur <zash@zash.se>
parents: 12161
diff changeset
44 end
b7ee14ba09c9 migrator: Reuse earlier usage text
Kim Alvefur <zash@zash.se>
parents: 12161
diff changeset
45
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
46 local startup = require "util.startup";
11728
826d57c16d1c migrator: Customise startup sequence to fix #1673 (Thanks acidsys)
Kim Alvefur <zash@zash.se>
parents: 10004
diff changeset
47 do
12161
6e7678f6fe9a migrator: Customise cli argument parsing (--help, --verbose)
Kim Alvefur <zash@zash.se>
parents: 11731
diff changeset
48 startup.parse_args({
6e7678f6fe9a migrator: Customise cli argument parsing (--help, --verbose)
Kim Alvefur <zash@zash.se>
parents: 11731
diff changeset
49 short_params = { v = "verbose", h = "help", ["?"] = "help" };
6e7678f6fe9a migrator: Customise cli argument parsing (--help, --verbose)
Kim Alvefur <zash@zash.se>
parents: 11731
diff changeset
50 value_params = { config = true };
6e7678f6fe9a migrator: Customise cli argument parsing (--help, --verbose)
Kim Alvefur <zash@zash.se>
parents: 11731
diff changeset
51 });
11728
826d57c16d1c migrator: Customise startup sequence to fix #1673 (Thanks acidsys)
Kim Alvefur <zash@zash.se>
parents: 10004
diff changeset
52 startup.init_global_state();
826d57c16d1c migrator: Customise startup sequence to fix #1673 (Thanks acidsys)
Kim Alvefur <zash@zash.se>
parents: 10004
diff changeset
53 prosody.process_type = "migrator";
12161
6e7678f6fe9a migrator: Customise cli argument parsing (--help, --verbose)
Kim Alvefur <zash@zash.se>
parents: 11731
diff changeset
54 if prosody.opts.help then
12162
b7ee14ba09c9 migrator: Reuse earlier usage text
Kim Alvefur <zash@zash.se>
parents: 12161
diff changeset
55 usage();
12161
6e7678f6fe9a migrator: Customise cli argument parsing (--help, --verbose)
Kim Alvefur <zash@zash.se>
parents: 11731
diff changeset
56 os.exit(0);
6e7678f6fe9a migrator: Customise cli argument parsing (--help, --verbose)
Kim Alvefur <zash@zash.se>
parents: 11731
diff changeset
57 end
11728
826d57c16d1c migrator: Customise startup sequence to fix #1673 (Thanks acidsys)
Kim Alvefur <zash@zash.se>
parents: 10004
diff changeset
58 startup.force_console_logging();
826d57c16d1c migrator: Customise startup sequence to fix #1673 (Thanks acidsys)
Kim Alvefur <zash@zash.se>
parents: 10004
diff changeset
59 startup.init_logging();
826d57c16d1c migrator: Customise startup sequence to fix #1673 (Thanks acidsys)
Kim Alvefur <zash@zash.se>
parents: 10004
diff changeset
60 startup.init_gc();
826d57c16d1c migrator: Customise startup sequence to fix #1673 (Thanks acidsys)
Kim Alvefur <zash@zash.se>
parents: 10004
diff changeset
61 startup.init_errors();
826d57c16d1c migrator: Customise startup sequence to fix #1673 (Thanks acidsys)
Kim Alvefur <zash@zash.se>
parents: 10004
diff changeset
62 startup.setup_plugindir();
826d57c16d1c migrator: Customise startup sequence to fix #1673 (Thanks acidsys)
Kim Alvefur <zash@zash.se>
parents: 10004
diff changeset
63 startup.setup_plugin_install_path();
826d57c16d1c migrator: Customise startup sequence to fix #1673 (Thanks acidsys)
Kim Alvefur <zash@zash.se>
parents: 10004
diff changeset
64 startup.setup_datadir();
826d57c16d1c migrator: Customise startup sequence to fix #1673 (Thanks acidsys)
Kim Alvefur <zash@zash.se>
parents: 10004
diff changeset
65 startup.chdir();
826d57c16d1c migrator: Customise startup sequence to fix #1673 (Thanks acidsys)
Kim Alvefur <zash@zash.se>
parents: 10004
diff changeset
66 startup.read_version();
826d57c16d1c migrator: Customise startup sequence to fix #1673 (Thanks acidsys)
Kim Alvefur <zash@zash.se>
parents: 10004
diff changeset
67 startup.switch_user();
826d57c16d1c migrator: Customise startup sequence to fix #1673 (Thanks acidsys)
Kim Alvefur <zash@zash.se>
parents: 10004
diff changeset
68 startup.check_dependencies();
826d57c16d1c migrator: Customise startup sequence to fix #1673 (Thanks acidsys)
Kim Alvefur <zash@zash.se>
parents: 10004
diff changeset
69 startup.log_startup_warnings();
11729
f37cafeb75d6 migrator: Trick net.server into thinking the config is loaded
Kim Alvefur <zash@zash.se>
parents: 11728
diff changeset
70 prosody.config_loaded = true;
11728
826d57c16d1c migrator: Customise startup sequence to fix #1673 (Thanks acidsys)
Kim Alvefur <zash@zash.se>
parents: 10004
diff changeset
71 startup.load_libraries();
826d57c16d1c migrator: Customise startup sequence to fix #1673 (Thanks acidsys)
Kim Alvefur <zash@zash.se>
parents: 10004
diff changeset
72 startup.init_http_client();
11731
076ceb405b94 migrator: Silence assert in core.moduleapi
Kim Alvefur <zash@zash.se>
parents: 11730
diff changeset
73 prosody.core_post_stanza = function ()
076ceb405b94 migrator: Silence assert in core.moduleapi
Kim Alvefur <zash@zash.se>
parents: 11730
diff changeset
74 -- silence assert in core.moduleapi
076ceb405b94 migrator: Silence assert in core.moduleapi
Kim Alvefur <zash@zash.se>
parents: 11730
diff changeset
75 error("Attempt to send stanzas from inside migrator.", 0);
076ceb405b94 migrator: Silence assert in core.moduleapi
Kim Alvefur <zash@zash.se>
parents: 11730
diff changeset
76 end
11728
826d57c16d1c migrator: Customise startup sequence to fix #1673 (Thanks acidsys)
Kim Alvefur <zash@zash.se>
parents: 10004
diff changeset
77 end
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
78
4210
4583473dcce4 tools/migration/main.lua: Add command-line parsing, including --config=CONFIG_FILE, and the ability to specify to/from stores to migrate
Matthew Wild <mwild1@gmail.com>
parents: 4166
diff changeset
79 -- Command-line parsing
11730
9bf8a0607d12 migrator: Use parsed command line flags already parsed by util.startup
Kim Alvefur <zash@zash.se>
parents: 11729
diff changeset
80 local options = prosody.opts;
5021
85b2689dbcfe Eliminate direct setfenv usage
Florian Zeitz <florob@babelmonkeys.de>
parents: 4240
diff changeset
81
85b2689dbcfe Eliminate direct setfenv usage
Florian Zeitz <florob@babelmonkeys.de>
parents: 4240
diff changeset
82 local envloadfile = require "util.envload".envloadfile;
85b2689dbcfe Eliminate direct setfenv usage
Florian Zeitz <florob@babelmonkeys.de>
parents: 4240
diff changeset
83
4211
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
84 local config_file = options.config or default_config;
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
85 local from_store = arg[1] or "input";
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
86 local to_store = arg[2] or "output";
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
87
4166
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
88 config = {};
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
89 local config_env = setmetatable({}, { __index = function(t, k) return function(tbl) config[k] = tbl; end; end });
7880
1d998891c967 migrator: Remove wrapper around envloadfile since envloadfile does the right thing in a compatible way
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
90 local config_chunk, err = envloadfile(config_file, config_env);
4211
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
91 if not config_chunk then
7895
1e1c18012048 migrator: Fix missing word
Kim Alvefur <zash@zash.se>
parents: 7894
diff changeset
92 print("There was an error loading the config file, check that the file exists");
4211
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
93 print("and that the syntax is correct:");
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
94 print("", err);
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
95 os.exit(1);
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
96 end
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
97
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
98 config_chunk();
4166
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
99
4211
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
100 local have_err;
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
101 if #arg > 0 and #arg ~= 2 then
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
102 have_err = true;
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
103 print("Error: Incorrect number of parameters supplied.");
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
104 end
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
105 if not config[from_store] then
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
106 have_err = true;
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
107 print("Error: Input store '"..from_store.."' not found in the config file.");
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
108 end
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
109 if not config[to_store] then
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
110 have_err = true;
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
111 print("Error: Output store '"..to_store.."' not found in the config file.");
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
112 end
4235
899ffc1674b5 tools/migration/prosody-migrator.lua: Refactor store handler loading to report errors they throw
Matthew Wild <mwild1@gmail.com>
parents: 4229
diff changeset
113
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
114 for store, conf in pairs(config) do -- COMPAT
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
115 if conf.type == "prosody_files" then
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
116 conf.type = "internal";
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
117 elseif conf.type == "prosody_sql" then
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
118 conf.type = "sql";
4235
899ffc1674b5 tools/migration/prosody-migrator.lua: Refactor store handler loading to report errors they throw
Matthew Wild <mwild1@gmail.com>
parents: 4229
diff changeset
119 end
4211
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
120 end
4235
899ffc1674b5 tools/migration/prosody-migrator.lua: Refactor store handler loading to report errors they throw
Matthew Wild <mwild1@gmail.com>
parents: 4229
diff changeset
121
4211
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
122 if have_err then
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
123 print("");
12162
b7ee14ba09c9 migrator: Reuse earlier usage text
Kim Alvefur <zash@zash.se>
parents: 12161
diff changeset
124 usage();
4211
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
125 print("");
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
126 print("The available stores in your migrator config are:");
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
127 print("");
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
128 for store in pairs(config) do
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
129 print("", store);
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
130 end
4216
ff80a8471e86 tools/migration/*: Numerous changes and restructuring, and the addition of a Makefile
Matthew Wild <mwild1@gmail.com>
parents: 4211
diff changeset
131 print("");
4211
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
132 os.exit(1);
9a12fc2baa37 tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling for config and command-line parameters
Matthew Wild <mwild1@gmail.com>
parents: 4210
diff changeset
133 end
5776
bd0ff8ae98a8 Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 5021
diff changeset
134
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
135 local async = require "util.async";
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
136 local server = require "net.server";
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
137 local watchers = {
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
138 error = function (_, err)
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
139 error(err);
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
140 end;
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
141 waiting = function ()
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
142 server.loop();
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
143 end;
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
144 };
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
145
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
146 local cm = require "core.configmanager";
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
147 local hm = require "core.hostmanager";
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
148 local sm = require "core.storagemanager";
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
149 local um = require "core.usermanager";
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
150
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
151 local function users(store, host)
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
152 if store.users then
12167
03f551510b1e migrator: Enhance logging
Kim Alvefur <zash@zash.se>
parents: 12166
diff changeset
153 log("debug", "Using store user iterator")
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
154 return store:users();
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
155 else
12387
05c250fa335a Spelling: Fix various spelling mistakes (thanks timeless)
Kim Alvefur <zash@zash.se>
parents: 12168
diff changeset
156 log("debug", "Using usermanager user iterator")
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
157 return um.users(host);
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
158 end
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
159 end
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
160
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
161 local function prepare_config(host, conf)
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
162 if conf.type == "internal" then
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
163 sm.olddm.set_data_path(conf.path or prosody.paths.data);
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
164 elseif conf.type == "sql" then
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
165 cm.set(host, "sql", conf);
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
166 end
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
167 end
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
168
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
169 local function get_driver(host, conf)
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
170 prepare_config(host, conf);
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
171 return assert(sm.load_driver(host, conf.type));
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
172 end
4166
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
173
12164
85f03b29ec72 migrator: Refactor out individual item migrator for code deduplication
Kim Alvefur <zash@zash.se>
parents: 12163
diff changeset
174 local migrate_once = {
85f03b29ec72 migrator: Refactor out individual item migrator for code deduplication
Kim Alvefur <zash@zash.se>
parents: 12163
diff changeset
175 keyval = function(origin, destination, user)
85f03b29ec72 migrator: Refactor out individual item migrator for code deduplication
Kim Alvefur <zash@zash.se>
parents: 12163
diff changeset
176 local data, err = origin:get(user);
85f03b29ec72 migrator: Refactor out individual item migrator for code deduplication
Kim Alvefur <zash@zash.se>
parents: 12163
diff changeset
177 assert(not err, err);
85f03b29ec72 migrator: Refactor out individual item migrator for code deduplication
Kim Alvefur <zash@zash.se>
parents: 12163
diff changeset
178 assert(destination:set(user, data));
85f03b29ec72 migrator: Refactor out individual item migrator for code deduplication
Kim Alvefur <zash@zash.se>
parents: 12163
diff changeset
179 end;
85f03b29ec72 migrator: Refactor out individual item migrator for code deduplication
Kim Alvefur <zash@zash.se>
parents: 12163
diff changeset
180 archive = function(origin, destination, user)
85f03b29ec72 migrator: Refactor out individual item migrator for code deduplication
Kim Alvefur <zash@zash.se>
parents: 12163
diff changeset
181 local iter, err = origin:find(user);
85f03b29ec72 migrator: Refactor out individual item migrator for code deduplication
Kim Alvefur <zash@zash.se>
parents: 12163
diff changeset
182 assert(iter, err);
85f03b29ec72 migrator: Refactor out individual item migrator for code deduplication
Kim Alvefur <zash@zash.se>
parents: 12163
diff changeset
183 for id, item, when, with in iter do
85f03b29ec72 migrator: Refactor out individual item migrator for code deduplication
Kim Alvefur <zash@zash.se>
parents: 12163
diff changeset
184 assert(destination:append(user, id, item, when, with));
85f03b29ec72 migrator: Refactor out individual item migrator for code deduplication
Kim Alvefur <zash@zash.se>
parents: 12163
diff changeset
185 end
85f03b29ec72 migrator: Refactor out individual item migrator for code deduplication
Kim Alvefur <zash@zash.se>
parents: 12163
diff changeset
186 end;
85f03b29ec72 migrator: Refactor out individual item migrator for code deduplication
Kim Alvefur <zash@zash.se>
parents: 12163
diff changeset
187 }
12168
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
188 migrate_once.pubsub = function(origin, destination, user, prefix, input_driver, output_driver)
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
189 if not user and prefix == "pubsub_" then return end
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
190 local data, err = origin:get(user);
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
191 assert(not err, err);
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
192 if not data then return end
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
193 assert(destination:set(user, data));
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
194 if prefix == "pubsub_" then user = nil end
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
195 for node in pairs(data) do
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
196 local pep_origin = assert(input_driver:open(prefix .. node, "archive"));
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
197 local pep_destination = assert(output_driver:open(prefix .. node, "archive"));
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
198 migrate_once.archive(pep_origin, pep_destination, user);
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
199 end
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
200 end
12164
85f03b29ec72 migrator: Refactor out individual item migrator for code deduplication
Kim Alvefur <zash@zash.se>
parents: 12163
diff changeset
201
12166
39483b4099b4 migrator: Add option to keep going despite errors
Kim Alvefur <zash@zash.se>
parents: 12165
diff changeset
202 if options["keep-going"] then
39483b4099b4 migrator: Add option to keep going despite errors
Kim Alvefur <zash@zash.se>
parents: 12165
diff changeset
203 local xpcall = require "util.xpcall".xpcall;
39483b4099b4 migrator: Add option to keep going despite errors
Kim Alvefur <zash@zash.se>
parents: 12165
diff changeset
204 for t, f in pairs(migrate_once) do
12168
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
205 migrate_once[t] = function (origin, destination, user, ...)
12167
03f551510b1e migrator: Enhance logging
Kim Alvefur <zash@zash.se>
parents: 12166
diff changeset
206 local function log_err(err)
03f551510b1e migrator: Enhance logging
Kim Alvefur <zash@zash.se>
parents: 12166
diff changeset
207 if user then
03f551510b1e migrator: Enhance logging
Kim Alvefur <zash@zash.se>
parents: 12166
diff changeset
208 log("error", "Error migrating data for user %q: %s", user, err);
03f551510b1e migrator: Enhance logging
Kim Alvefur <zash@zash.se>
parents: 12166
diff changeset
209 else
03f551510b1e migrator: Enhance logging
Kim Alvefur <zash@zash.se>
parents: 12166
diff changeset
210 log("error", "Error migrating data for host: %s", err);
03f551510b1e migrator: Enhance logging
Kim Alvefur <zash@zash.se>
parents: 12166
diff changeset
211 end
03f551510b1e migrator: Enhance logging
Kim Alvefur <zash@zash.se>
parents: 12166
diff changeset
212 log("debug", "%s", debug.traceback(nil, 2));
03f551510b1e migrator: Enhance logging
Kim Alvefur <zash@zash.se>
parents: 12166
diff changeset
213 end
12168
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
214 xpcall(f, log_err, origin, destination, user, ...);
12166
39483b4099b4 migrator: Add option to keep going despite errors
Kim Alvefur <zash@zash.se>
parents: 12165
diff changeset
215 end
39483b4099b4 migrator: Add option to keep going despite errors
Kim Alvefur <zash@zash.se>
parents: 12165
diff changeset
216 end
39483b4099b4 migrator: Add option to keep going despite errors
Kim Alvefur <zash@zash.se>
parents: 12165
diff changeset
217 end
39483b4099b4 migrator: Add option to keep going despite errors
Kim Alvefur <zash@zash.se>
parents: 12165
diff changeset
218
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
219 local migration_runner = async.runner(function (job)
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
220 for host, stores in pairs(job.input.hosts) do
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
221 prosody.hosts[host] = startup.make_host(host);
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
222 sm.initialize_host(host);
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
223 um.initialize_host(host);
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
224
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
225 local input_driver = get_driver(host, job.input);
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
226
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
227 local output_driver = get_driver(host, job.output);
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
228
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
229 for _, store in ipairs(stores) do
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
230 local p, typ = store:match("()%-(%w+)$");
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
231 if typ then store = store:sub(1, p-1); else typ = "keyval"; end
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
232 log("info", "Migrating host %s store %s (%s)", host, store, typ);
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
233
12168
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
234 local migrate = assert(migrate_once[typ], "Unknown store type: "..typ);
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
235
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
236 local prefix = store .. "_";
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
237 if typ == "pubsub" then typ = "keyval"; end
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
238 if store == "pubsub_nodes" then prefix = "pubsub_"; end
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
239
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
240 local origin = assert(input_driver:open(store, typ));
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
241 local destination = assert(output_driver:open(store, typ));
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
242
12168
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
243 migrate(origin, destination, nil, prefix, input_driver, output_driver); -- host data
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
244
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
245 for user in users(origin, host) do
12167
03f551510b1e migrator: Enhance logging
Kim Alvefur <zash@zash.se>
parents: 12166
diff changeset
246 log("info", "Migrating user %s@%s store %s (%s)", user, host, store, typ);
12168
33e856c65033 migrator: Support pubsub and pep as a special-case
Kim Alvefur <zash@zash.se>
parents: 12167
diff changeset
247 migrate(origin, destination, user, prefix, input_driver, output_driver);
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
248 end
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
249 end
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
250 end
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
251 end, watchers);
4166
3ac90743039b tools/migration/*.lua: Convert to unix line endings
Matthew Wild <mwild1@gmail.com>
parents: 4162
diff changeset
252
4240
b3d9063aad4d tools/migration/prosody-migrator.lua: Add messages to show when migration is in progress
Matthew Wild <mwild1@gmail.com>
parents: 4239
diff changeset
253 io.stderr:write("Migrating...\n");
10003
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
254
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
255 migration_runner:run({ input = config[from_store], output = config[to_store] });
4d702f0c6273 migrator: Rewrite to use storage modules
Kim Alvefur <zash@zash.se>
parents: 8062
diff changeset
256
4240
b3d9063aad4d tools/migration/prosody-migrator.lua: Add messages to show when migration is in progress
Matthew Wild <mwild1@gmail.com>
parents: 4239
diff changeset
257 io.stderr:write("Done!\n");