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.

diff --git a/WHATS_NEW b/WHATS_NEW
index f527b0e333f225a5e5999d7736f3832272a7e140..436ce1b418c08863d17ee34cb319a6437ba3c606 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -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.

diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c
index 3bac866dae949a09aa0a06e7582663d7f9b52451..2a9071726941dee6da700eca7622544ab8de9018 100644 (file)
--- a/daemons/clvmd/clvmd.c
+++ b/daemons/clvmd/clvmd.c
@@ -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 ntoh_clvm(struct clvm_header *hdr);
 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 @@ int main(int argc, char *argv[])
        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 @@ static if_type_t parse_cluster_interface(char *ifname)
 
        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
+}