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 05/22] ocfs2/cluster: Get all heartbeat regions
Date: Thu,  7 Oct 2010 17:15:19 -0700	[thread overview]
Message-ID: <1286496936-17072-6-git-send-email-sunil.mushran@oracle.com> (raw)
In-Reply-To: <1286496936-17072-1-git-send-email-sunil.mushran@oracle.com>

Export function in o2hb to get a list of heartbeat regions. It also adds an
upper limit to the length of the heartbeat region name.

o2hb_global_heartbeat_active() currently disables global heartbeat. It will
be enabled in a later patch after all the code is added.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
---
 fs/ocfs2/cluster/heartbeat.c |   34 ++++++++++++++++++++++++++++++++++
 fs/ocfs2/cluster/heartbeat.h |    4 ++++
 2 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 4d36459..3415e58 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -1623,6 +1623,9 @@ static struct config_item *o2hb_heartbeat_group_make_item(struct config_group *g
 	if (reg == NULL)
 		return ERR_PTR(-ENOMEM);
 
+	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);
@@ -2035,3 +2038,34 @@ void o2hb_stop_all_regions(void)
 	spin_unlock(&o2hb_live_lock);
 }
 EXPORT_SYMBOL_GPL(o2hb_stop_all_regions);
+
+int o2hb_get_all_regions(char *region_uuids, u8 max_regions)
+{
+	struct o2hb_region *reg;
+	int numregs = 0;
+	char *p;
+
+	spin_lock(&o2hb_live_lock);
+
+	p = region_uuids;
+	list_for_each_entry(reg, &o2hb_all_regions, hr_all_item) {
+		mlog(0, "Region: %s\n", config_item_name(&reg->hr_item));
+		if (numregs < max_regions) {
+			memcpy(p, config_item_name(&reg->hr_item),
+			       O2HB_MAX_REGION_NAME_LEN);
+			p += O2HB_MAX_REGION_NAME_LEN;
+		}
+		numregs++;
+	}
+
+	spin_unlock(&o2hb_live_lock);
+
+	return numregs;
+}
+EXPORT_SYMBOL_GPL(o2hb_get_all_regions);
+
+int o2hb_global_heartbeat_active(void)
+{
+	return 0;
+}
+EXPORT_SYMBOL(o2hb_global_heartbeat_active);
diff --git a/fs/ocfs2/cluster/heartbeat.h b/fs/ocfs2/cluster/heartbeat.h
index 2f16492..00ad8e8 100644
--- a/fs/ocfs2/cluster/heartbeat.h
+++ b/fs/ocfs2/cluster/heartbeat.h
@@ -31,6 +31,8 @@
 
 #define O2HB_REGION_TIMEOUT_MS		2000
 
+#define O2HB_MAX_REGION_NAME_LEN	32
+
 /* number of changes to be seen as live */
 #define O2HB_LIVE_THRESHOLD	   2
 /* number of equal samples to be seen as dead */
@@ -81,5 +83,7 @@ int o2hb_check_node_heartbeating(u8 node_num);
 int o2hb_check_node_heartbeating_from_callback(u8 node_num);
 int o2hb_check_local_node_heartbeating(void);
 void o2hb_stop_all_regions(void);
+int o2hb_get_all_regions(char *region_uuids, u8 numregions);
+int o2hb_global_heartbeat_active(void);
 
 #endif /* O2CLUSTER_HEARTBEAT_H */
-- 
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 ` Sunil Mushran [this message]
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 ` [Ocfs2-devel] [PATCH 14/22] ocfs2/cluster: Track number of global heartbeat regions Sunil Mushran
2010-10-08  0:15 ` [Ocfs2-devel] [PATCH 15/22] ocfs2/cluster: Track bitmap of live " 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-6-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).