ocfs2: o2hb: add some user/debug log

Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com>
Reviewed-by: Ryan Ding <ryan.ding@oracle.com>
Reviewed-by: Mark Fasheh <mfasheh@suse.de>
Cc: Gang He <ghe@suse.com>
Cc: rwxybh <rwxybh@126.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Joseph Qi <joseph.qi@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index e929b15d6162041c9e45f7794d2ed5ef9390efa7..84ebeb5678c6a39eb78d6ae96aa58c4ec60b4ea9 100644 (file)
--- 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,
@@ -358,7 +360,7 @@ static void o2hb_arm_timeout(struct o2hb_region *reg)
        cancel_delayed_work(&reg->hr_nego_timeout_work);
        /* negotiate timeout must be less than write timeout. */
        schedule_delayed_work(&reg->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));
 }
 
@@ -389,7 +391,7 @@ again:
 static void o2hb_nego_timeout(struct work_struct *work)
 {
        unsigned long live_node_bitmap[BITS_TO_LONGS(O2NM_MAX_NODES)];
-       int master_node, i;
+       int master_node, i, ret;
        struct o2hb_region *reg;
 
        reg = container_of(work, struct o2hb_region, hr_nego_timeout_work.work);
@@ -398,7 +400,12 @@ static void o2hb_nego_timeout(struct work_struct *work)
        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(&reg->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
@@ -410,6 +417,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(&reg->hr_item), reg->hr_dev_name);
                /* approve negotiate timeout request. */
                o2hb_arm_timeout(reg);
 
@@ -419,13 +428,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(&reg->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);
        }
 }
 
@@ -436,6 +455,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(&reg->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
@@ -447,7 +468,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(data);
+       struct o2hb_region *reg = data;
+
+       printk(KERN_NOTICE "o2hb: negotiate timeout approved by master node on region %s (%s).\n",
+               config_item_name(&reg->hr_item), reg->hr_dev_name);
+       o2hb_arm_timeout(reg);
        return 0;
 }