ocfs2-devel.oss.oracle.com archive mirror
 help / color / mirror / Atom feed
From: Sunil Mushran <sunil.mushran@oracle.com>
To: ocfs2-devel@oss.oracle.com
Subject: [Ocfs2-devel] [PATCH 14/22] ocfs2/cluster: Track number of global heartbeat regions
Date: Thu,  7 Oct 2010 17:15:28 -0700	[thread overview]
Message-ID: <1286496936-17072-15-git-send-email-sunil.mushran@oracle.com> (raw)
In-Reply-To: <1286496936-17072-1-git-send-email-sunil.mushran@oracle.com>

In global heartbeat mode, we have a upper limit for the number of active regions.
This patch adds the facility to track the number of active global heartbeat
regions and fails to start heartbeat if the number exceeds the maximum.

Signed-of-by: Sunil Mushran <sunil.mushran@oracle.com>
---
 fs/ocfs2/cluster/heartbeat.c |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 188f502..d66b17c 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -62,6 +62,12 @@ static unsigned long o2hb_live_node_bitmap[BITS_TO_LONGS(O2NM_MAX_NODES)];
 static LIST_HEAD(o2hb_node_events);
 static DECLARE_WAIT_QUEUE_HEAD(o2hb_steady_queue);
 
+/*
+ * In global heartbeat, we maintain a series of region bitmaps.
+ * 	- o2hb_region_bitmap allows us to limit the region number to max region.
+ */
+static unsigned long o2hb_region_bitmap[BITS_TO_LONGS(O2NM_MAX_REGIONS)];
+
 #define O2HB_DB_TYPE_LIVENODES		0
 struct o2hb_debug_buf {
 	int db_type;
@@ -176,6 +182,7 @@ struct o2hb_region {
 
 	/* live node map of this region */
 	unsigned long		hr_live_node_bitmap[BITS_TO_LONGS(O2NM_MAX_NODES)];
+	unsigned int		hr_region_num;
 
 	/* let the person setting up hb wait for it to return until it
 	 * has reached a 'steady' state.  This will be fixed when we have
@@ -1127,6 +1134,7 @@ int o2hb_init(void)
 	INIT_LIST_HEAD(&o2hb_node_events);
 
 	memset(o2hb_live_node_bitmap, 0, sizeof(o2hb_live_node_bitmap));
+	memset(o2hb_region_bitmap, 0, sizeof(o2hb_region_bitmap));
 
 	return o2hb_debug_init();
 }
@@ -1716,12 +1724,22 @@ static struct config_item *o2hb_heartbeat_group_make_item(struct config_group *g
 	if (strlen(name) > O2HB_MAX_REGION_NAME_LEN)
 		return ERR_PTR(-ENAMETOOLONG);
 
-	config_item_init_type_name(&reg->hr_item, name, &o2hb_region_type);
-
 	spin_lock(&o2hb_live_lock);
+	reg->hr_region_num = 0;
+	if (o2hb_global_heartbeat_active()) {
+		reg->hr_region_num = find_first_zero_bit(o2hb_region_bitmap,
+							 O2NM_MAX_REGIONS);
+		if (reg->hr_region_num >= O2NM_MAX_REGIONS) {
+			spin_unlock(&o2hb_live_lock);
+			return ERR_PTR(-EFBIG);
+		}
+		set_bit(reg->hr_region_num, o2hb_region_bitmap);
+	}
 	list_add_tail(&reg->hr_all_item, &o2hb_all_regions);
 	spin_unlock(&o2hb_live_lock);
 
+	config_item_init_type_name(&reg->hr_item, name, &o2hb_region_type);
+
 	return &reg->hr_item;
 }
 
@@ -1733,6 +1751,8 @@ static void o2hb_heartbeat_group_drop_item(struct config_group *group,
 
 	/* stop the thread when the user removes the region dir */
 	spin_lock(&o2hb_live_lock);
+	if (o2hb_global_heartbeat_active())
+		clear_bit(reg->hr_region_num, o2hb_region_bitmap);
 	hb_task = reg->hr_task;
 	reg->hr_task = NULL;
 	spin_unlock(&o2hb_live_lock);
-- 
1.7.0.4

  parent reply	other threads:[~2010-10-08  0:15 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-08  0:15 [Ocfs2-devel] O2CB global heartbeat - hopefully final drop! Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 01/22] ocfs2/cluster: Add heartbeat mode configfs parameter Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 02/22] ocfs2: Add an incompat feature flag OCFS2_FEATURE_INCOMPAT_CLUSTERINFO Sunil Mushran
2010-10-08 23:11   ` Mark Fasheh
2010-10-08 23:26     ` Sunil Mushran
2010-10-09  0:15       ` Joel Becker
2010-10-09 11:41         ` Sunil Mushran
2010-10-09 17:35           ` Sunil Mushran
2010-10-11 21:46             ` Joel Becker
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 03/22] ocfs2: Add support for heartbeat=global mount option Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 04/22] ocfs2/dlm: Expose dlm_protocol in dlm_state Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 05/22] ocfs2/cluster: Get all heartbeat regions Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 06/22] ocfs2/dlm: Add message DLM_QUERY_REGION Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 07/22] ocfs2: Print message if user mounts without starting global heartbeat Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 08/22] ocfs2/dlm: Add message DLM_QUERY_NODEINFO Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 09/22] ocfs2/cluster: Print messages when adding/removing heartbeat regions Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 10/22] ocfs2/cluster: Print messages when adding/removing nodes Sunil Mushran
2010-10-08  0:33   ` Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 11/22] ocfs2/cluster: Check slots for unconfigured live nodes Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 12/22] ocfs2/cluster: Reorganize o2hb debugfs init Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 13/22] ocfs2/cluster: Maintain live node bitmap per heartbeat region Sunil Mushran
2010-10-08  0:15 ` Sunil Mushran [this message]
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 15/22] ocfs2/cluster: Track bitmap of live heartbeat regions Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 16/22] ocfs2/cluster: Maintain bitmap of quorum regions Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 17/22] ocfs2/cluster: Maintain bitmap of failed regions Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 18/22] ocfs2/cluster: Create debugfs files for live, quorum and failed region bitmaps Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 19/22] ocfs2/cluster: Create debugfs dir/files for each region Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 20/22] ocfs2/cluster: Add mlogs for heartbeat up/down events Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 21/22] ocfs2/cluster: Show per region heartbeat elapsed time Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 22/22] ocfs2/dlm: Bump up dlm protocol to version 1.1 Sunil Mushran

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=1286496936-17072-15-git-send-email-sunil.mushran@oracle.com \
    --to=sunil.mushran@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).