public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: ccaulfield@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW daemons/clvmd/clvmd.c Date: Tue, 01 Sep 2009 09:48:00 -0000 [thread overview] Message-ID: <20090901094802.8532.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: ccaulfield@sourceware.org 2009-09-01 09:48:01 Modified files: . : WHATS_NEW daemons/clvmd : clvmd.c Log message: Add some code to clvmd to look in the corosync confdb to see what cluster interface it should be using, it can still be overriden with -I. If corosync isn't running or there is no information then the usual checking will happen. This code only builds if corosync is available. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1246&r2=1.1247 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd.c.diff?cvsroot=lvm2&r1=1.60&r2=1.61 --- LVM2/WHATS_NEW 2009/08/28 20:51:40 1.1246 +++ LVM2/WHATS_NEW 2009/09/01 09:48:01 1.1247 @@ -1,5 +1,6 @@ Version 2.02.52 - ================================= + Make clvmd check corosync to see what cluster interface it should use. Rewrite clvmd configuration code to cope with all combinations of libs. Fix global locking in PV reporting commands (2.02.49). Fix pvcreate string termination in duplicate uuid warning message. --- LVM2/daemons/clvmd/clvmd.c 2009/08/13 10:39:41 1.60 +++ LVM2/daemons/clvmd/clvmd.c 2009/09/01 09:48:01 1.61 @@ -44,7 +44,9 @@ #include <syslog.h> #include <errno.h> #include <limits.h> -#include <libdlm.h> +#ifdef HAVE_COROSYNC_CONFDB_H +#include <corosync/confdb.h> +#endif #include "clvmd-comms.h" #include "lvm-functions.h" @@ -149,6 +151,7 @@ static void add_reply_to_list(struct local_client *client, int status, const char *csid, const char *buf, int len); static if_type_t parse_cluster_interface(char *ifname); +static if_type_t get_cluster_type(void); static void usage(char *prog, FILE *file) { @@ -392,6 +395,9 @@ init_lvhash(); /* Start the cluster interface */ + if (cluster_iface == IF_AUTO) + cluster_iface = get_cluster_type(); + #ifdef USE_CMAN if ((cluster_iface == IF_AUTO || cluster_iface == IF_CMAN) && (clops = init_cman_cluster())) { max_csid_len = CMAN_MAX_CSID_LEN; @@ -2060,3 +2066,59 @@ return iface; } + +/* + * Try and find a cluster system in corosync's objdb, if it is running. This is + * only called if the command-line option is not present, and if it fails + * we still try the interfaces in order. + */ +static if_type_t get_cluster_type() +{ +#ifdef HAVE_COROSYNC_CONFDB_H + confdb_handle_t handle; + if_type_t type = IF_AUTO; + int result; + char buf[255]; + size_t namelen = sizeof(buf); + hdb_handle_t cluster_handle; + hdb_handle_t clvmd_handle; + confdb_callbacks_t callbacks = { + .confdb_key_change_notify_fn = NULL, + .confdb_object_create_change_notify_fn = NULL, + .confdb_object_delete_change_notify_fn = NULL + }; + + result = confdb_initialize (&handle, &callbacks); + if (result != CS_OK) + return type; + + result = confdb_object_find_start(handle, OBJECT_PARENT_HANDLE); + if (result != CS_OK) + goto out; + + result = confdb_object_find(handle, OBJECT_PARENT_HANDLE, (void *)"cluster", strlen("cluster"), &cluster_handle); + if (result != CS_OK) + goto out; + + result = confdb_object_find_start(handle, cluster_handle); + if (result != CS_OK) + goto out; + + result = confdb_object_find(handle, cluster_handle, (void *)"clvmd", strlen("clvmd"), &clvmd_handle); + if (result != CS_OK) + goto out; + + result = confdb_key_get(handle, clvmd_handle, (void *)"interface", strlen("interface"), buf, &namelen); + if (result != CS_OK) + goto out; + + buf[namelen] = '\0'; + type = parse_cluster_interface(buf); + DEBUGLOG("got interface type '%s' from confdb\n", buf); +out: + confdb_finalize(handle); + return type; +#else + return IF_AUTO; +#endif +}
next reply other threads:[~2009-09-01 9:48 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2009-09-01 9:48 ccaulfield [this message] -- strict thread matches above, loose matches on Subject: below -- 2012-02-28 11:06 zkabelac 2012-02-28 9:58 zkabelac 2012-02-28 9:53 zkabelac 2012-02-27 11:26 zkabelac 2012-02-27 9:58 zkabelac 2011-10-11 9:54 zkabelac 2011-10-11 9:26 zkabelac 2011-09-16 14:40 mbroz 2011-08-11 12:57 mbroz 2011-06-28 13:42 zkabelac 2011-03-30 12:36 zkabelac 2011-03-08 22:48 zkabelac 2011-03-08 13:27 mbroz 2010-12-13 10:49 prajnoha 2010-12-01 12:41 zkabelac 2010-12-01 10:46 zkabelac 2010-04-06 15:29 ccaulfield 2010-02-02 8:54 ccaulfield 2009-10-12 8:33 ccaulfield 2009-08-13 10:39 ccaulfield 2009-03-24 11:49 ccaulfield 2008-11-21 13:48 ccaulfield 2008-06-13 7:44 ccaulfield 2008-05-09 9:59 ccaulfield 2008-03-28 12:58 ccaulfield 2008-03-17 9:37 ccaulfield 2008-02-15 14:12 meyering 2007-11-15 10:16 pcaulfield 2007-03-29 13:59 pcaulfield 2006-12-11 13:48 pcaulfield 2006-11-30 9:44 pcaulfield 2005-04-01 13:01 pcaulfield 2005-02-08 9:05 pcaulfield 2005-01-24 15:31 pcaulfield 2005-01-05 14:41 pcaulfield 2004-10-06 12:36 pcaulfield 2004-10-06 10:12 pcaulfield
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=20090901094802.8532.qmail@sourceware.org \ --to=ccaulfield@sourceware.org \ --cc=lvm-devel@redhat.com \ --cc=lvm2-cvs@sourceware.org \ /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: linkBe 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 read-only IMAP folder(s) and NNTP newsgroup(s).