From: Junxiao Bi <junxiao.bi@oracle.com>
To: ocfs2-devel@oss.oracle.com
Subject: [Ocfs2-devel] [PATCH 6/6] ocfs2: o2hb: fix hb hung time
Date: Wed, 20 Jan 2016 11:13:39 +0800 [thread overview]
Message-ID: <1453259619-5347-7-git-send-email-junxiao.bi@oracle.com> (raw)
In-Reply-To: <1453259619-5347-1-git-send-email-junxiao.bi@oracle.com>
hr_last_timeout_start should be set as the last time where hb is still OK.
When hb write timeout, hung time will be (jiffies - hr_last_timeout_start).
Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com>
Reviewed-by: Ryan Ding <ryan.ding@oracle.com>
---
fs/ocfs2/cluster/heartbeat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index cb931381f474..a3ce5a734b7b 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -357,7 +357,6 @@ static void o2hb_arm_timeout(struct o2hb_region *reg)
spin_unlock(&o2hb_live_lock);
}
cancel_delayed_work(®->hr_write_timeout_work);
- reg->hr_last_timeout_start = jiffies;
schedule_delayed_work(®->hr_write_timeout_work,
msecs_to_jiffies(O2HB_MAX_WRITE_TIMEOUT_MS));
@@ -1176,6 +1175,7 @@ static int o2hb_do_disk_heartbeat(struct o2hb_region *reg)
if (own_slot_ok) {
o2hb_set_quorum_device(reg);
o2hb_arm_timeout(reg);
+ reg->hr_last_timeout_start = jiffies;
}
bail:
--
1.7.9.5
next prev parent reply other threads:[~2016-01-20 3:13 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-20 3:13 [Ocfs2-devel] ocfs2: o2hb: not fence self if storage down Junxiao Bi
2016-01-20 3:13 ` [Ocfs2-devel] [PATCH 1/6] ocfs2: o2hb: add negotiate timer Junxiao Bi
2016-01-21 23:42 ` Andrew Morton
2016-01-22 3:23 ` Junxiao Bi
2016-01-22 0:56 ` Joseph Qi
2016-01-22 3:19 ` Junxiao Bi
2016-01-20 3:13 ` [Ocfs2-devel] [PATCH 2/6] ocfs2: o2hb: add NEGO_TIMEOUT message Junxiao Bi
2016-01-21 23:47 ` Andrew Morton
2016-01-22 5:12 ` Junxiao Bi
2016-01-22 5:45 ` Andrew Morton
2016-01-22 5:46 ` Junxiao Bi
2016-01-25 3:18 ` Eric Ren
2016-01-25 4:28 ` Junxiao Bi
2016-01-25 5:59 ` Eric Ren
2016-01-20 3:13 ` [Ocfs2-devel] [PATCH 3/6] ocfs2: o2hb: add NEGOTIATE_APPROVE message Junxiao Bi
2016-01-20 3:13 ` [Ocfs2-devel] [PATCH 4/6] ocfs2: o2hb: add some user/debug log Junxiao Bi
2016-01-25 3:28 ` Eric Ren
2016-01-25 4:29 ` Junxiao Bi
2016-01-25 6:00 ` Eric Ren
2016-01-20 3:13 ` [Ocfs2-devel] [PATCH 5/6] ocfs2: o2hb: don't negotiate if last hb fail Junxiao Bi
2016-01-20 3:13 ` Junxiao Bi [this message]
2016-01-20 6:00 ` [Ocfs2-devel] ocfs2: o2hb: not fence self if storage down Gang He
2016-01-20 8:09 ` Junxiao Bi
2016-01-20 9:18 ` Joseph Qi
2016-01-20 13:27 ` Junxiao Bi
2016-01-21 0:46 ` Joseph Qi
2016-01-21 1:48 ` Junxiao Bi
2016-01-22 4:25 ` Joseph Qi
2016-01-22 5:08 ` Junxiao Bi
2016-01-21 8:34 ` rwxybh
2016-01-21 8:41 ` Junxiao Bi
-- strict thread matches above, loose matches on Subject: below --
2016-05-23 21:50 [Ocfs2-devel] [patch 6/6] ocfs2: o2hb: fix hb hung time akpm at linux-foundation.org
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453259619-5347-7-git-send-email-junxiao.bi@oracle.com \
--to=junxiao.bi@oracle.com \
--cc=ocfs2-devel@oss.oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).