[Ocfs2-devel] [patch 21/25] ocfs2: o2hb: add NEGOTIATE_APPROVE message

[akpm]

From: Junxiao Bi <junxiao...@oracle.com>
Subject: ocfs2: o2hb: add NEGOTIATE_APPROVE message

This message is used to re-queue write timeout timer and negotiate timer
when all nodes suffer a write hung to storage, this makes node not fence
self if storage down.

Signed-off-by: Junxiao Bi <junxiao...@oracle.com>
Reviewed-by: Ryan Ding <ryan.d...@oracle.com>
Cc: Gang He <g...@suse.com>
Cc: rwxybh <rwx...@126.com>
Cc: Mark Fasheh <mfas...@suse.de>
Cc: Joel Becker <jl...@evilplan.org>
Cc: Joseph Qi <joseph...@huawei.com>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
---

 fs/ocfs2/cluster/heartbeat.c |   28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff -puN fs/ocfs2/cluster/heartbeat.c~ocfs2-o2hb-add-negotiate_approve-message 
fs/ocfs2/cluster/heartbeat.c
--- a/fs/ocfs2/cluster/heartbeat.c~ocfs2-o2hb-add-negotiate_approve-message
+++ a/fs/ocfs2/cluster/heartbeat.c
@@ -294,6 +294,7 @@ struct o2hb_bio_wait_ctxt {
 
 enum {
        O2HB_NEGO_TIMEOUT_MSG = 1,
+       O2HB_NEGO_APPROVE_MSG = 2,
 };
 
 struct o2hb_nego_msg {
@@ -391,7 +392,7 @@ static void o2hb_nego_timeout(struct wor
                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;
+       int master_node, i;
 
        o2hb_fill_node_map(live_node_bitmap, sizeof(live_node_bitmap));
        /* lowest node as master node to make negotiate decision. */
@@ -411,6 +412,17 @@ static void o2hb_nego_timeout(struct wor
                }
 
                /* approve negotiate timeout request. */
+               o2hb_arm_timeout(reg);
+
+               i = -1;
+               while ((i = find_next_bit(live_node_bitmap,
+                               O2NM_MAX_NODES, i + 1)) < O2NM_MAX_NODES) {
+                       if (i == master_node)
+                               continue;
+
+                       o2hb_send_nego_msg(reg->hr_key,
+                                       O2HB_NEGO_APPROVE_MSG, i);
+               }
        } else {
                /* negotiate timeout with master node. */
                o2hb_send_nego_msg(reg->hr_key, O2HB_NEGO_TIMEOUT_MSG,
@@ -433,6 +445,13 @@ static int o2hb_nego_timeout_handler(str
        return 0;
 }
 
+static int o2hb_nego_approve_handler(struct o2net_msg *msg, u32 len, void 
*data,
+                               void **ret_data)
+{
+       o2hb_arm_timeout((struct o2hb_region *)data);
+       return 0;
+}
+
 static inline void o2hb_bio_wait_init(struct o2hb_bio_wait_ctxt *wc)
 {
        atomic_set(&wc->wc_num_reqs, 1);
@@ -2101,6 +2120,13 @@ static struct config_item *o2hb_heartbea
        if (ret)
                goto free;
 
+       ret = o2net_register_handler(O2HB_NEGO_APPROVE_MSG, reg->hr_key,
+                       sizeof(struct o2hb_nego_msg),
+                       o2hb_nego_approve_handler,
+                       reg, NULL, &reg->hr_handler_list);
+       if (ret)
+               goto free_handler;
+
        ret = o2hb_debug_region_init(reg, o2hb_debug_dir);
        if (ret) {
                config_item_put(&reg->hr_item);
_

_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel