Commita7142ed

committed

Fix 'is applied' check when asking about current node.

1 parent7c7795c commita7142edCopy full SHA for a7142ed

File tree

+12

-3

lines changed

+12

-3

lines changed

Lines changed: 12 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -318,6 +318,7 @@ static int raft_apply(raft_t raft) {`
`318`	`318`	`raft_log_t*l=&raft->log;`
`319`	`319`	`while (l->applied<l->acked) {`
`320`	`320`	`raft_entry_t*e=&RAFT_LOG(raft,l->applied);`
	`321`	`+assert(e->update.len==e->bytes);`
`321`	`322`	`raft->config.applier(raft->config.userdata,e->update, false);`
`322`	`323`	`raft->log.applied++;`
`323`	`324`	`applied_now++;`
`@@ -661,6 +662,7 @@ int raft_emit(raft_t r, raft_update_t update) {`
`661`	`662`	`assert(e->update.len==0);`
`662`	`663`	`assert(e->update.data==NULL);`
`663`	`664`	`e->update.len=update.len;`
	`665`	`+e->bytes=update.len;`
`664`	`666`	`e->update.data=malloc(update.len);`
`665`	`667`	`memcpy(e->update.data,update.data,update.len);`
`666`	`668`	`r->log.size++;`
`@@ -671,9 +673,16 @@ int raft_emit(raft_t r, raft_update_t update) {`
`671`	`673`	`}`
`672`	`674`
`673`	`675`	`boolraft_applied(raft_tr,intid,intindex) {`
`674`		`-raft_peer_t*p=r->peers+id;`
`675`		`-if (!p->up)return false;`
`676`		`-returnp->applied >=index;`
	`676`	`+if (r->me==id)`
	`677`	`+{`
	`678`	`+returnr->log.applied >=index;`
	`679`	`+}`
	`680`	`+else`
	`681`	`+{`
	`682`	`+raft_peer_t*p=r->peers+id;`
	`683`	`+if (!p->up)return false;`
	`684`	`+returnp->applied >=index;`
	`685`	`+}`
`677`	`686`	`}`
`678`	`687`
`679`	`688`	`staticboolraft_restore(raft_tr,intprevindex,raft_entry_t*e) {`

Comments

(0)