commit 77f3488
default
·
2022-11-23 13:54:22 +0000 UTC
parent 494b1d4
More logging in db_upgrade().
1 files changed,
+8,
-4
M
data.c
M
data.c
+8,
-4
1@@ -1320,12 +1320,17 @@ int db_upgrade(d_char **error)
2 int changed = 0;
3 double f = 0.0;
4
5- do {
6+ for (;;) {
7 char *layout = xs_dict_get(srv_config, "layout");
8 double nf;
9
10 f = nf = xs_number_get(layout);
11
12+ if (!(f < db_layout))
13+ break;
14+
15+ srv_log(xs_fmt("db_upgrade %1.1lf < %1.1lf", f, db_layout));
16+
17 if (f < 2.0) {
18 *error = xs_fmt("ERROR: unsupported old disk layout %1.1lf\n", f);
19 ret = 0;
20@@ -1344,13 +1349,12 @@ int db_upgrade(d_char **error)
21 xs *nv = xs_number_new(f);
22 srv_config = xs_dict_set(srv_config, "layout", nv);
23
24- srv_log(xs_fmt("upgraded db layout to version %1.1lf", f));
25+ srv_log(xs_fmt("db_upgrade converted to version %1.1lf", f));
26 changed++;
27 }
28 else
29 break;
30-
31- } while (f < db_layout);
32+ }
33
34 if (f > db_layout) {
35 *error = xs_fmt("ERROR: unknown future version %lf\n", f);