aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunxiao Bi <junxiao.bi@oracle.com>2014-08-29 18:19:00 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-29 19:28:16 -0400
commitc43c363def04cdaed0d9e26dae846081f55714e7 (patch)
tree81b981068d68bb415cfaa0f8fb9293b2e41fc6ea
parent2b462638e41ea62230297c21c4da9955937b7a3c (diff)
ocfs2: o2net: don't shutdown connection when idle timeout
This patch series is to fix a possible message lost bug in ocfs2 when network go bad. This bug will cause ocfs2 hung forever even network become good again. The messages may lost in this case. After the tcp connection is established between two nodes, an idle timer will be set to check its state periodically, if no messages are received during this time, idle timer will timeout, it will shutdown the connection and try to reconnect, so pending messages in tcp queues will be lost. This messages may be from dlm. Dlm may get hung in this case. This may cause the whole ocfs2 cluster hung. This is very possible to happen when network state goes bad. Do the reconnect is useless, it will fail if network state is still bad. Just waiting there for network recovering may be a good idea, it will not lost messages and some node will be fenced until cluster goes into split-brain state, for this case, Tcp user timeout is used to override the tcp retransmit timeout. It will timeout after 25 days, user should have notice this through the provided log and fix the network, if they don't, ocfs2 will fall back to original reconnect way. This patch (of 3): Some messages in the tcp queue maybe lost if we shutdown the connection and reconnect when idle timeout. If packets lost and reconnect success, then the ocfs2 cluster maybe hung. To fix this, we can leave the connection there and do the fence decision when idle timeout, if network recover before fence dicision is made, the connection survive without lost any messages. This bug can be saw when network state go bad. It may cause ocfs2 hung forever if some packets lost. With this fix, ocfs2 will recover from hung if network becomes good again. Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com> Reviewed-by: Srinivas Eeda <srinivas.eeda@oracle.com> Reviewed-by: Mark Fasheh <mfasheh@suse.de> 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>
-rw-r--r--fs/ocfs2/cluster/tcp.c25
1 files changed, 19 insertions, 6 deletions
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index 681691bc233a..2334bfc966c1 100644
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -1536,16 +1536,20 @@ static void o2net_idle_timer(unsigned long data)
1536#endif 1536#endif
1537 1537
1538 printk(KERN_NOTICE "o2net: Connection to " SC_NODEF_FMT " has been " 1538 printk(KERN_NOTICE "o2net: Connection to " SC_NODEF_FMT " has been "
1539 "idle for %lu.%lu secs, shutting it down.\n", SC_NODEF_ARGS(sc), 1539 "idle for %lu.%lu secs.\n",
1540 msecs / 1000, msecs % 1000); 1540 SC_NODEF_ARGS(sc), msecs / 1000, msecs % 1000);
1541 1541
1542 /* 1542 /* idle timerout happen, don't shutdown the connection, but
1543 * Initialize the nn_timeout so that the next connection attempt 1543 * make fence decision. Maybe the connection can recover before
1544 * will continue in o2net_start_connect. 1544 * the decision is made.
1545 */ 1545 */
1546 atomic_set(&nn->nn_timeout, 1); 1546 atomic_set(&nn->nn_timeout, 1);
1547 o2quo_conn_err(o2net_num_from_nn(nn));
1548 queue_delayed_work(o2net_wq, &nn->nn_still_up,
1549 msecs_to_jiffies(O2NET_QUORUM_DELAY_MS));
1550
1551 o2net_sc_reset_idle_timer(sc);
1547 1552
1548 o2net_sc_queue_work(sc, &sc->sc_shutdown_work);
1549} 1553}
1550 1554
1551static void o2net_sc_reset_idle_timer(struct o2net_sock_container *sc) 1555static void o2net_sc_reset_idle_timer(struct o2net_sock_container *sc)
@@ -1560,6 +1564,15 @@ static void o2net_sc_reset_idle_timer(struct o2net_sock_container *sc)
1560 1564
1561static void o2net_sc_postpone_idle(struct o2net_sock_container *sc) 1565static void o2net_sc_postpone_idle(struct o2net_sock_container *sc)
1562{ 1566{
1567 struct o2net_node *nn = o2net_nn_from_num(sc->sc_node->nd_num);
1568
1569 /* clear fence decision since the connection recover from timeout*/
1570 if (atomic_read(&nn->nn_timeout)) {
1571 o2quo_conn_up(o2net_num_from_nn(nn));
1572 cancel_delayed_work(&nn->nn_still_up);
1573 atomic_set(&nn->nn_timeout, 0);
1574 }
1575
1563 /* Only push out an existing timer */ 1576 /* Only push out an existing timer */
1564 if (timer_pending(&sc->sc_idle_timeout)) 1577 if (timer_pending(&sc->sc_idle_timeout))
1565 o2net_sc_reset_idle_timer(sc); 1578 o2net_sc_reset_idle_timer(sc);