From: Patrick Caulfield <pcaulfie@redhat.com>
Date: Mon, 7 Feb 2005 10:04:27 +0000 (+0000)
Subject: Make clvmd use the command library rather than popen() to
X-Git-Tag: v2_02_91~4959
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=2cf7b80d8fbb633d025b28b308b5064493405b9a;p=lvm2.git

Make clvmd use the command library rather than popen() to
preload the lock state.
---

diff --git a/Makefile.in b/Makefile.in
index af63fc5d9..e07d6074f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -37,7 +37,7 @@ endif
 
 include make.tmpl
 
-daemons: lib
+daemons: lib tools
 lib: include
 tools: lib
 po: tools daemons
diff --git a/WHATS_NEW b/WHATS_NEW
index 84e620ad0..8a16e0ed8 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -4,6 +4,7 @@ Version 2.01.04 -
   Remove unused -f from pvmove.
   Gulm clvmd doesn't report "connection refused" errors.
   clvmd does a basic config file sanity check at startup.
+  clvmd now uses liblvm2cmd to preload the lock state rather than popen
 
 Version 2.01.03 - 1st February 2005
 ===================================
diff --git a/configure b/configure
index 7a6cff5d6..c0a8906cc 100755
--- a/configure
+++ b/configure
@@ -7413,7 +7413,8 @@ fi;
 echo "$as_me:$LINENO: result: $CMDLIB" >&5
 echo "${ECHO_T}$CMDLIB" >&6
 
-if test x$CMDLIB = xyes; then
+if test x$CMDLIB = xyes -o x$CLVMD != none; then
+	CMDLIB="yes"
 	CFLAGS="$CFLAGS -DCMDLIB"
 fi
 
diff --git a/configure.in b/configure.in
index 02ae9b891..332dbd7bd 100644
--- a/configure.in
+++ b/configure.in
@@ -344,7 +344,8 @@ AC_ARG_ENABLE(cmdlib, [  --enable-cmdlib         Build shared command library],
 CMDLIB=$enableval, CMDLIB=no)
 AC_MSG_RESULT($CMDLIB)
 
-if test x$CMDLIB = xyes; then
+if test x$CMDLIB = xyes -o x$CLVMD != none; then
+	CMDLIB="yes"
 	CFLAGS="$CFLAGS -DCMDLIB"
 fi
 
diff --git a/daemons/clvmd/Makefile.in b/daemons/clvmd/Makefile.in
index 7ffd51569..81dd3fc4f 100644
--- a/daemons/clvmd/Makefile.in
+++ b/daemons/clvmd/Makefile.in
@@ -52,7 +52,7 @@ TARGETS = \
 include $(top_srcdir)/make.tmpl
 
 CFLAGS += -D_REENTRANT -fno-strict-aliasing
-LIBS += -ldevmapper -llvm -lpthread
+LIBS += -L../../tools -ldevmapper -llvm -Wl,-Bstatic -llvm2cmd -Wl,-Bdynamic -lpthread
 
 INSTALL_TARGETS = \
 	install_clvmd
diff --git a/daemons/clvmd/lvm-functions.c b/daemons/clvmd/lvm-functions.c
index a3635d306..59bdedd8e 100644
--- a/daemons/clvmd/lvm-functions.c
+++ b/daemons/clvmd/lvm-functions.c
@@ -43,6 +43,7 @@
 #include "activate.h"
 #include "hash.h"
 #include "locking.h"
+#include "../tools/lvm2cmd.h"
 
 static struct cmd_context *cmd = NULL;
 static struct hash_table *lv_hash = NULL;
@@ -388,29 +389,19 @@ int do_check_lvm1(char *vgname)
 	return status == 1 ? 0 : EBUSY;
 }
 
-/*
- * Ideally, clvmd should be started before any LVs are active
- * but this may not be the case...
- * I suppose this also comes in handy if clvmd crashes, not that it would!
- */
-static void *get_initial_state()
+static void cmdline_output(int level, const char *file, int line,
+			   const char *message)
 {
-	char lv[64], vg[64], flags[25];
-	char uuid[65];
-	char line[255];
-	FILE *lvs =
-	    popen
-	    ("/sbin/lvm lvs --nolocking --noheadings -o vg_uuid,lv_uuid,lv_attr",
-	     "r");
-
-	if (!lvs)
-		return NULL;
+	DEBUGLOG("lvm2output: %d: %s\n", level, message);
+	if (level == LVM2_LOG_PRINT)
+	{
+		char lv[64], vg[64], flags[25];
+		char uuid[65];
 
-	while (fgets(line, sizeof(line), lvs)) {
-	        if (sscanf(line, "%s %s %s\n", vg, lv, flags) == 3) {
+		if (sscanf(message, "%s %s %s\n", vg, lv, flags) == 3) {
 
 			/* States: s:suspended a:active S:dropped snapshot I:invalid snapshot */
-		        if (strlen(vg) == 38 &&                         /* is is a valid UUID ? */
+			if (strlen(vg) == 38 &&                         /* is is a valid UUID ? */
 			    (flags[4] == 'a' || flags[4] == 's')) {	/* is it active or suspended? */
 				/* Convert hyphen-separated UUIDs into one */
 				memcpy(&uuid[0], &vg[0], 6);
@@ -434,8 +425,32 @@ static void *get_initial_state()
 			}
 		}
 	}
-	fclose(lvs);
-	return NULL;
+}
+
+/*
+ * Ideally, clvmd should be started before any LVs are active
+ * but this may not be the case...
+ * I suppose this also comes in handy if clvmd crashes, not that it would!
+ */
+static void get_initial_state()
+{
+	void *lvm2_handle;
+
+	lvm2_handle = lvm2_init();
+	if (!lvm2_handle) {
+		syslog(LOG_ERR, "Cannot get lvm2 context to initialise lock state\n");
+		return;
+	}
+
+	lvm2_log_fn(cmdline_output);
+
+	/* This doesn't seem to do what I think it does */
+	lvm2_log_level(lvm2_handle, LVM2_LOG_PRINT);
+
+	DEBUGLOG("Getting currently active LVs for lock state\n");
+	lvm2_run(lvm2_handle, "lvs --nolocking --noheadings -o vg_uuid,lv_uuid,lv_attr");
+
+	lvm2_exit(lvm2_handle);
 }
 
 /* This checks some basic cluster-LVM configuration stuff */