On Sun, Nov 27, 2011 at 12:08 AM, Steven Dake <sdake@xxxxxxxxxx> wrote: > On 11/26/2011 02:42 AM, Yunkai Zhang wrote: >> Although incorrect nodeid will not affect program's logic, but it will >> make us confused when we add some logs to record the transmission path of >> token in debug mode. >> >> Signed-off-by: Yunkai Zhang <qiushu.zyk@xxxxxxxxxx> >> --- >> exec/totemsrp.c | 5 +++++ >> 1 files changed, 5 insertions(+), 0 deletions(-) >> >> diff --git a/exec/totemsrp.c b/exec/totemsrp.c >> index 0662812..60e5663 100644 >> --- a/exec/totemsrp.c >> +++ b/exec/totemsrp.c >> @@ -2647,6 +2647,11 @@ static int orf_token_rtr ( >> >> static void token_retransmit (struct totemsrp_instance *instance) >> { >> + struct orf_token *orf_token; >> + >> + orf_token = (struct orf_token *)&instance->orf_token_retransmit; >> + orf_token->header.nodeid = instance->my_id.addr[0].nodeid; >> + >> totemrrp_token_send (instance->totemrrp_context, >> instance->orf_token_retransmit, >> instance->orf_token_retransmit_size); > > Not sure this will work - some times reset_token_transmit_timeout occurs > inside the commit token retransmitting. > > Setting this variable in token_send should be ok (line 2725). Well, we can set this variable in token_send(just swap two lines), but I found that commit_token also has the same problem. I will give patch v2 to solve it. > Regrds > -steve > _______________________________________________ > discuss mailing list > discuss@xxxxxxxxxxxx > http://lists.corosync.org/mailman/listinfo/discuss > -- Yunkai Zhang Work at Taobao _______________________________________________ discuss mailing list discuss@xxxxxxxxxxxx http://lists.corosync.org/mailman/listinfo/discuss