Hi Junxiao,
On Wed, Jan 20, 2016 at 11:13:37AM +0800, Junxiao Bi wrote:
> Signed-off-by: Junxiao Bi <junxiao...@oracle.com>
> Reviewed-by: Ryan Ding <ryan.d...@oracle.com>
> ---
> fs/ocfs2/cluster/heartbeat.c | 39 ++++++++++++++++++++++++++++++++-------
> 1 file changed, 32 insertions(+), 7 deletions(-)
>
> diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
> index d5ef8dce08da..6c57fd21e597 100644
> --- a/fs/ocfs2/cluster/heartbeat.c
> +++ b/fs/ocfs2/cluster/heartbeat.c
> @@ -292,6 +292,8 @@ struct o2hb_bio_wait_ctxt {
> int wc_error;
> };
>
> +#define O2HB_NEGO_TIMEOUT_MS (O2HB_MAX_WRITE_TIMEOUT_MS/2)
> +
> enum {
> O2HB_NEGO_TIMEOUT_MSG = 1,
> O2HB_NEGO_APPROVE_MSG = 2,
> @@ -359,7 +361,7 @@ static void o2hb_arm_timeout(struct o2hb_region *reg)
> cancel_delayed_work(®->hr_nego_timeout_work);
> /* negotiate timeout must be less than write timeout. */
> schedule_delayed_work(®->hr_nego_timeout_work,
> - msecs_to_jiffies(O2HB_MAX_WRITE_TIMEOUT_MS)/2);
> + msecs_to_jiffies(O2HB_NEGO_TIMEOUT_MS));
> memset(reg->hr_nego_node_bitmap, 0, sizeof(reg->hr_nego_node_bitmap));
> }
>
> @@ -393,14 +395,19 @@ static void o2hb_nego_timeout(struct work_struct *work)
> container_of(work, struct o2hb_region,
> hr_nego_timeout_work.work);
> unsigned long live_node_bitmap[BITS_TO_LONGS(O2NM_MAX_NODES)];
> - int master_node, i;
> + int master_node, i, ret;
>
> o2hb_fill_node_map(live_node_bitmap, sizeof(live_node_bitmap));
> /* lowest node as master node to make negotiate decision. */
> master_node = find_next_bit(live_node_bitmap, O2NM_MAX_NODES, 0);
>
> if (master_node == o2nm_this_node()) {
> - set_bit(master_node, reg->hr_nego_node_bitmap);
> + if (!test_bit(master_node, reg->hr_nego_node_bitmap)) {
> + printk(KERN_NOTICE "o2hb: node %d hb write hung for %ds
> on region %s (%s).\n",
> + o2nm_this_node(), O2HB_NEGO_TIMEOUT_MS/1000,
> + config_item_name(®->hr_item),
> reg->hr_dev_name);
> + set_bit(master_node, reg->hr_nego_node_bitmap);
> + }
> if (memcmp(reg->hr_nego_node_bitmap, live_node_bitmap,
> sizeof(reg->hr_nego_node_bitmap))) {
> /* check negotiate bitmap every second to do timeout
> @@ -412,6 +419,8 @@ static void o2hb_nego_timeout(struct work_struct *work)
> return;
> }
>
> + printk(KERN_NOTICE "o2hb: all nodes hb write hung, maybe region
> %s (%s) is down.\n",
> + config_item_name(®->hr_item), reg->hr_dev_name);
> /* approve negotiate timeout request. */
> o2hb_arm_timeout(reg);
>
> @@ -421,13 +430,23 @@ static void o2hb_nego_timeout(struct work_struct *work)
> if (i == master_node)
> continue;
>
> - o2hb_send_nego_msg(reg->hr_key,
> + mlog(ML_HEARTBEAT, "send NEGO_APPROVE msg to node
> %d\n", i);
> + ret = o2hb_send_nego_msg(reg->hr_key,
> O2HB_NEGO_APPROVE_MSG, i);
> + if (ret)
> + mlog(ML_ERROR, "send NEGO_APPROVE msg to node
> %d fail %d\n",
> + i, ret);
> }
> } else {
> /* negotiate timeout with master node. */
> - o2hb_send_nego_msg(reg->hr_key, O2HB_NEGO_TIMEOUT_MSG,
> - master_node);
> + printk(KERN_NOTICE "o2hb: node %d hb write hung for %ds on
> region %s (%s), negotiate timeout with node %d.\n",
> + o2nm_this_node(), O2HB_NEGO_TIMEOUT_MS/1000,
> config_item_name(®->hr_item),
> + reg->hr_dev_name, master_node);
> + ret = o2hb_send_nego_msg(reg->hr_key, O2HB_NEGO_TIMEOUT_MSG,
> + master_node);
> + if (ret)
> + mlog(ML_ERROR, "send NEGO_TIMEOUT msg to node %d fail
> %d\n",
> + master_node, ret);
> }
> }
>
> @@ -438,6 +457,8 @@ static int o2hb_nego_timeout_handler(struct o2net_msg
> *msg, u32 len, void *data,
> struct o2hb_nego_msg *nego_msg;
>
> nego_msg = (struct o2hb_nego_msg *)msg->buf;
> + printk(KERN_NOTICE "o2hb: receive negotiate timeout message from node
> %d on region %s (%s).\n",
> + nego_msg->node_num, config_item_name(®->hr_item),
> reg->hr_dev_name);
> if (nego_msg->node_num < O2NM_MAX_NODES)
> set_bit(nego_msg->node_num, reg->hr_nego_node_bitmap);
> else
> @@ -449,7 +470,11 @@ static int o2hb_nego_timeout_handler(struct o2net_msg
> *msg, u32 len, void *data,
> static int o2hb_nego_approve_handler(struct o2net_msg *msg, u32 len, void
> *data,
> void **ret_data)
> {
> - o2hb_arm_timeout((struct o2hb_region *)data);
> + struct o2hb_region *reg = (struct o2hb_region *)data;
> +
> + printk(KERN_NOTICE "o2hb: negotiate timeout approved by master node on
> region %s (%s).\n",
> + config_item_name(®->hr_item), reg->hr_dev_name);
> + o2hb_arm_timeout(reg);
Why mix the use of printk and mlog? Any rules to follow?
Thanks,
Eric
> return 0;
> }
>
> --
> 1.7.9.5
>
>
> _______________________________________________
> Ocfs2-devel mailing list
> Ocfs2-devel@oss.oracle.com
> https://oss.oracle.com/mailman/listinfo/ocfs2-devel
>
_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel
