sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

RS: reset heartbeat status after rollback

Browse source 
While in a multicomponent live update that includes RS, the new RS
instance may receive heartbeat replies which, after a rollback, the
old RS instance will then never see.  As a result, the rolled-back
RS instance may end up killing well-behaving services.

Change-Id: I0f0af283c33502d5d55b27e353b62aec2e301285
This commit is contained in:
David van Moolenbroek 2015-07-16 17:12:03 +02:00
parent f16b761d2a
commit 1aa4eb6a85
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
minix/servers/rs/update.c
View file

@ -296,6 +296,7 @@ int sys_upd_flags;
void rollback_service(struct rproc **new_rpp, struct rproc **old_rpp)
{
/* Rollback an updated service. */
struct rproc *rp;
int r = OK;
/* RS is special, we may only need to swap the slots to rollback. */
@ -311,6 +312,10 @@ void rollback_service(struct rproc **new_rpp, struct rproc **old_rpp)
if(rs_verbose)
printf("RS: %s performed rollback\n", srv_to_string(*new_rpp));
}
/* Since we may now have missed heartbeat replies, resend requests. */
for (rp = BEG_RPROC_ADDR; rp < END_RPROC_ADDR; rp++)
if (rp->r_flags & RS_ACTIVE)
rp->r_check_tm = 0;
}
else {
int swap_flag = ((*new_rpp)->r_flags & RS_INIT_PENDING ? RS_DONTSWAP : RS_SWAP);