From 1294a60444848f94c9889c8e015655eda30e3c1a Mon Sep 17 00:00:00 2001 From: Matthew LeVan Date: Wed, 7 Feb 2024 11:45:32 -0500 Subject: [PATCH] disk: migration comment update --- pkg/vere/disk.c | 22 ++++++---------------- pkg/vere/main.c | 2 +- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/pkg/vere/disk.c b/pkg/vere/disk.c index 21b0f1c61f..18fdf31fec 100644 --- a/pkg/vere/disk.c +++ b/pkg/vere/disk.c @@ -1409,22 +1409,12 @@ static c3_o _disk_migrate(u3_disk* log_u, c3_d eve_d) { /* migration steps: - * 0. detect whether we need to migrate or not - * a. if it's a fresh boot via u3_Host.ops_u.nuu -> skip migration - * b. if log/data.mdb is readable and is not v3 -> execute migration - * if not -> skip migration (returns yes) - * 1. set log/data.mdb to version 2 (migration in progress) - * 2. initialize epoch 0i0 - * a. creates epoch directory - * b. creates epoch version file - * c. creates binary version file - * d. creates hard links to data.mdb and lock.mdb in 0i0/ - * e. deletes backup snapshot - * 3. create hard links to data.mdb and lock.mdb in 0i0/ - * 4. use scratch space to initialize new log/data.db in log/tmp - * 5. save old metadata to new db in scratch space - * 6. clobber old log/data.mdb with new log/tmp/data.mdb - * 7. open epoch lmdb and set it in log_u + * 1. initialize epoch 0i0 (see u3_disk_epoc_zero) + * 2. create hard links to data.mdb and lock.mdb in 0i0/ + * 3. use scratch space to initialize new log/data.db in log/tmp + * 4. save old metadata to new db in scratch space + * 5. clobber old log/data.mdb with new log/tmp/data.mdb + * 6. open epoch lmdb and set it in log_u */ // NB: requires that log_u->mdb_u is initialized to log/data.mdb diff --git a/pkg/vere/main.c b/pkg/vere/main.c index 3a5c693c59..599c8fc246 100644 --- a/pkg/vere/main.c +++ b/pkg/vere/main.c @@ -2222,7 +2222,7 @@ _cw_play_impl(c3_d eve_d, c3_d sap_d, c3_o mel_o, c3_o sof_o, c3_o ful_o) // if ( u3_Host.eve_d < log_u->epo_d ) { fprintf(stderr, "mars: pier corrupt: " - "snapshot (%" PRIu64 ") out of epoc (%" PRIu64 "\r\n", + "snapshot (%" PRIu64 ") out of epoc (%" PRIu64 ")\r\n", u3_Host.eve_d, log_u->epo_d); exit(1); }