[corosync] [PATCH 1/3] Correct nodeid of orf_token when we retransmit it

Steven Dake sdake at redhat.com
Sat Nov 26 16:08:22 GMT 2011


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 at taobao.com>
> ---
>  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).

Regrds
-steve


More information about the discuss mailing list