[sheepdog] [PATCH v3] sheep/cluster: fix error in sheep log

Ruoyu liangry at ucweb.com
Thu Aug 7 10:27:20 CEST 2014


On 2014年08月07日 15:40, Bingpeng Zhu wrote:
> zk_timeout is measured in milliseconds, so
> it should be divided by 1000 to seconds.
>
> Signed-off-by: Bingpeng Zhu <bingpeng.zbp at alibaba-inc.com>
> ---
>   sheep/cluster/zookeeper.c |    3 ++-
>   1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/sheep/cluster/zookeeper.c b/sheep/cluster/zookeeper.c
> index 5c181e1..3248af2 100644
> --- a/sheep/cluster/zookeeper.c
> +++ b/sheep/cluster/zookeeper.c
> @@ -971,7 +971,8 @@ static int zk_join(const struct sd_node *myself,
>   	rc = zk_node_exists(path);
>   	if (rc == ZOK) {
>   		sd_err("Previous zookeeper session exist, shoot myself. Please "
> -		       "wait for %d seconds to join me again.", zk_timeout);
> +			"wait for %d seconds to join me again.",
> +			DIV_ROUND_UP(zk_timeout, 1000));
>   		exit(1);
>   	}
>   
Applied, thanks.
Sorry for forgetting signing my name and mail address in the patch.





More information about the sheepdog mailing list