urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-28 22:33:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Verify mugs on log replay to detect nondeterministic replay.

Browse Source 
Joe helped write the worker/main.c changes so that we consistently
return the mug of the current state on each %done message. Then
enabled a check in _pier_work_complete() which asserts that the
recomputed event produces the same state as the next event was
expecting to be applied to.
This commit is contained in:
Elliot Glaysher 2019-04-25 16:22:41 -07:00
parent a4ce72355d
commit 563214c2a2
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/urbit/vere/pier.c
View File

@ -652,6 +652,20 @@ _pier_work_complete(u3_writ* wit_u,
fprintf(stderr, "pier: (%" PRIu64 "): compute: complete\r\n", wit_u->evt_d);
#endif
if ( u3_psat_pace == pir_u->sat_e &&
wit_u->nex_u &&
mug_l != wit_u->nex_u->mug_l ) {
// While we are replaying the event log, we also perform checks that the
// resulting mug_l for this urbit's state is equivalent to the expected
// input state of the next event. If it isn't, we have either corruption or
// non-determinism during replay and either should cause a bail.
u3l_log("Invalid recomputed state. For event %" PRIu64 ", the computed mug "
"was %x but event %" PRIu64 " expected %x.\r\n",
wit_u->evt_d, mug_l, wit_u->nex_u->evt_d, wit_u->nex_u->mug_l);
u3_pier_bail();
}
god_u->dun_d += 1;
c3_assert(god_u->dun_d == wit_u->evt_d);

20
pkg/urbit/worker/main.c
View File

@ -363,7 +363,7 @@ _worker_send_complete(u3_noun vir)
{
_worker_send(u3nq(c3__done,
u3i_chubs(1, &u3V.evt_d),
u3r_mug(u3A->roc),
u3V.mug_l,
vir));
}
@ -401,6 +401,7 @@ _worker_sure(u3_noun ovo, u3_noun vir, u3_noun cor)
{
u3z(u3A->roc);
u3A->roc = cor;
u3V.mug_l = u3r_mug(u3A->roc);
u3_noun sac = u3_nul;
@ -461,7 +462,7 @@ _worker_work_live(c3_d evt_d, // event number
c3_assert(evt_d == u3V.evt_d + 1ULL);
if ( 0 != mug_l ) {
c3_assert(u3r_mug(u3A->roc) == mug_l);
c3_assert(u3V.mug_l == mug_l);
}
u3x_cell(job, &now, &ovo);
@ -567,6 +568,10 @@ _worker_work_boot(c3_d evt_d,
u3_noun job)
{
c3_assert(evt_d == u3V.evt_d + 1ULL);
if ( 0 != mug_l ) {
c3_assert(u3V.mug_l == mug_l);
}
u3V.evt_d = evt_d;
u3A->roe = u3nc(job, u3A->roe);
@ -589,17 +594,21 @@ _worker_work_boot(c3_d evt_d,
}
u3A->roc = u3k(u3t(pru));
u3V.mug_l = u3r_mug(u3A->roc);
u3l_log("worker: (%" PRIu64 ")| core: %x\r\n", evt_d, u3r_mug(u3A->roc));
u3l_log("work: (%" PRIu64 ")| core: %x\r\n", evt_d, u3V.mug_l);
// XX set u3A->evt_d ?
//
u3z(pru);
}
else {
u3V.mug_l = u3r_mug(job);
}
_worker_send(u3nq(c3__done,
u3i_chubs(1, &evt_d),
0,
u3V.mug_l,
u3_nul));
}
@ -787,9 +796,10 @@ u3_worker_boot(void)
u3_noun dat = u3_nul;
if ( u3_none != u3A->our ) {
u3V.mug_l = u3r_mug(u3A->roc);
nex_d = u3A->ent_d + 1ULL;
dat = u3nc(u3_nul, u3nt(u3i_chubs(1, &nex_d),
0, // XX u3r_mug(u3A->roc),
u3V.mug_l,
u3nc(u3k(u3A->our), u3k(u3A->fak))));
// disable hashboard for fake ships