[Ocfs2-devel] [PATCH v2] ocfs2: o2net: fix connect expired

[Srinivas Eeda]

looks good. Thanks for your explanation and fix

Reviewed-by: Srinivas Eeda <srinivas.eeda at oracle.com>

On 10/30/2014 11:08 PM, Junxiao Bi wrote:
> Set nn_persistent_error to -ENOTCONN will stop reconnect since the
> "stop" condition in o2net_start_connect() will be true.
>
> stop = (nn->nn_sc ||
> 		(nn->nn_persistent_error &&
> 		(nn->nn_persistent_error != -ENOTCONN || timeout == 0)));
>
> This will make connection never be established if the first connection request
> is lost.
>
> Set nn_persistent_error to 0 when connect expired to fix this. With this
> changes, dlm will not be waken up when connect expired, this is OK since
> dlm depends on network, dlm can do nothing in this case if waken up. Let
> it wait there for network recover and connect built again to continue.
>
> Signed-off-by: Junxiao Bi <junxiao.bi at oracle.com>
> ---
>   fs/ocfs2/cluster/tcp.c |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
> index 97de0fb..4d6b645 100644
> --- a/fs/ocfs2/cluster/tcp.c
> +++ b/fs/ocfs2/cluster/tcp.c
> @@ -1736,7 +1736,7 @@ static void o2net_connect_expired(struct work_struct *work)
>   		     o2net_idle_timeout() / 1000,
>   		     o2net_idle_timeout() % 1000);
>   
> -		o2net_set_nn_state(nn, NULL, 0, -ENOTCONN);
> +		o2net_set_nn_state(nn, NULL, 0, 0);
>   	}
>   	spin_unlock(&nn->nn_lock);
>   }