urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-21 01:41:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5398 from urbit/jb/check-checkpoint-errors

Browse Source 
vere: abort on checkpoint sync errors
This commit is contained in:
Joe Bryan 2021-11-01 22:46:56 -07:00 committed by GitHub
commit 0a34fe7075
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/urbit/noun/events.c
View File

@ -311,7 +311,6 @@ _ce_patch_verify(u3_ce_patch* pat_u)
fprintf(stderr, "loom: patch version mismatch: have %u, need %u\r\n", fprintf(stderr, "loom: patch version mismatch: have %u, need %u\r\n",
pat_u->con_u->ver_y, pat_u->con_u->ver_y,
u3e_version); u3e_version);
c3_assert(0);
return c3n; return c3n;
} }
@ -322,12 +321,10 @@ _ce_patch_verify(u3_ce_patch* pat_u)
if ( -1 == lseek(pat_u->mem_i, (i_w << (u3a_page + 2)), SEEK_SET) ) { if ( -1 == lseek(pat_u->mem_i, (i_w << (u3a_page + 2)), SEEK_SET) ) {
fprintf(stderr, "loom: patch seek: %s\r\n", strerror(errno)); fprintf(stderr, "loom: patch seek: %s\r\n", strerror(errno));
c3_assert(0);
return c3n; return c3n;
} }
if ( -1 == read(pat_u->mem_i, mem_w, (1 << (u3a_page + 2))) ) { if ( -1 == read(pat_u->mem_i, mem_w, (1 << (u3a_page + 2))) ) {
fprintf(stderr, "loom: patch read: %s\r\n", strerror(errno)); fprintf(stderr, "loom: patch read: %s\r\n", strerror(errno));
c3_assert(0);
return c3n; return c3n;
} }
{ {
@ -336,7 +333,6 @@ _ce_patch_verify(u3_ce_patch* pat_u)
if ( mug_w != nug_w ) { if ( mug_w != nug_w ) {
fprintf(stderr, "loom: patch mug mismatch %d/%d; (%x, %x)\r\n", fprintf(stderr, "loom: patch mug mismatch %d/%d; (%x, %x)\r\n",
pag_w, i_w, mug_w, nug_w); pag_w, i_w, mug_w, nug_w);
c3_assert(0);
return c3n; return c3n;
} }
#if 0 #if 0
@ -605,8 +601,17 @@ _ce_patch_compose(void)
static void static void
_ce_patch_sync(u3_ce_patch* pat_u) _ce_patch_sync(u3_ce_patch* pat_u)
{ {
c3_sync(pat_u->ctl_i); if ( -1 == c3_sync(pat_u->ctl_i) ) {
c3_sync(pat_u->mem_i); fprintf(stderr, "loom: control file sync failed: %s\r\n",
strerror(errno));
c3_assert(!"loom: control sync");
}
if ( -1 == c3_sync(pat_u->mem_i) ) {
fprintf(stderr, "loom: patch file sync failed: %s\r\n",
strerror(errno));
c3_assert(!"loom: patch sync");
}
} }
/* _ce_image_sync(): make sure image is synced to disk. /* _ce_image_sync(): make sure image is synced to disk.
@ -614,7 +619,12 @@ _ce_patch_sync(u3_ce_patch* pat_u)
static void static void
_ce_image_sync(u3e_image* img_u) _ce_image_sync(u3e_image* img_u)
{ {
c3_sync(img_u->fid_i); if ( -1 == c3_sync(img_u->fid_i) ) {
fprintf(stderr, "loom: image (%s) sync failed: %s\r\n",
img_u->nam_c,
strerror(errno));
c3_assert(!"loom: image sync");
}
} }
/* _ce_image_resize(): resize image, truncating if it shrunk. /* _ce_image_resize(): resize image, truncating if it shrunk.
@ -794,7 +804,11 @@ u3e_save(void)
// u3a_print_memory(stderr, "sync: save", 4096 * pat_u->con_u->pgs_w); // u3a_print_memory(stderr, "sync: save", 4096 * pat_u->con_u->pgs_w);
_ce_patch_sync(pat_u); _ce_patch_sync(pat_u);
_ce_patch_verify(pat_u);
if ( c3n == _ce_patch_verify(pat_u) ) {
c3_assert(!"loom: save failed");
}
_ce_patch_apply(pat_u); _ce_patch_apply(pat_u);
#ifdef U3_SNAPSHOT_VALIDATION #ifdef U3_SNAPSHOT_VALIDATION