LVM2 ./WHATS_NEW lib/metadata/mirror.c lib/mir ...

LVM2 ./WHATS_NEW lib/metadata/mirror.c lib/mir ...

[jbrassow]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	jbrassow@sourceware.org	2010-07-21 13:40:22

Modified files:
	.              : WHATS_NEW 
	lib/metadata   : mirror.c 
	lib/mirror     : mirrored.c 
	libdm          : libdevmapper.h libdm-file.c 

Log message:
	It's not enough to check for the kernel module in the case of cluster
	mirrors, we must also check that the log daemon (cmirrord) is running.
	The log module can be auto-loaded, but the daemon cannot be
	"auto-started".  Failing to check for the daemon produces cryptic
	messages that customers have a hard time deciphering.  (The system
	messages do report that the log daemon is not running, but people
	don't seem to find this message easily.)
	
	Here are examples of what is printed when the module is available,
	but the log daemon has not been started.
	
	[root@bp-01 LVM2]# lvcreate -m1 -l1 -n lv vg
	Shared cluster mirrors are not available.
	
	[root@bp-01 LVM2]# lvcreate -m1 -l1 -n lv vg -v
	Setting logging type to disk
	Finding volume group "vg"
	Archiving volume group "vg" metadata (seqno 3).
	Creating logical volume lv
	Executing: /sbin/modprobe dm-log-userspace
	Cluster mirror log daemon is not running
	Shared cluster mirrors are not available.
	Creating volume group backup "/etc/lvm/backup/vg" (seqno 4).

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1668&r2=1.1669
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/mirror.c.diff?cvsroot=lvm2&r1=1.127&r2=1.128
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/mirror/mirrored.c.diff?cvsroot=lvm2&r1=1.72&r2=1.73
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdevmapper.h.diff?cvsroot=lvm2&r1=1.123&r2=1.124
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-file.c.diff?cvsroot=lvm2&r1=1.11&r2=1.12

--- LVM2/WHATS_NEW	2010/07/13 22:24:39	1.1668
+++ LVM2/WHATS_NEW	2010/07/21 13:40:21	1.1669
@@ -1,5 +1,6 @@
 Version 2.02.71 -
 ===============================
+  Check if cluster log daemon is running before allowing cmirror create.
   Check if LV with specified name already exists when splitting a mirror.
   Fix suspend/resume logic for LVs resulting from splitting a mirror.
   Switch cmirrord and clvmd to use dm_create_lockfile.
--- LVM2/lib/metadata/mirror.c	2010/07/13 22:24:39	1.127
+++ LVM2/lib/metadata/mirror.c	2010/07/21 13:40:22	1.128
@@ -81,6 +81,36 @@
 }
 
 /*
+ * cluster_mirror_is_available
+ *
+ * Check if the proper kernel module and log daemon are running.
+ * Caller should check for 'vg_is_clustered(lv->vg)' before making
+ * this call.
+ *
+ * Returns: 1 if available, 0 otherwise
+ */
+static int cluster_mirror_is_available(struct logical_volume *lv)
+{
+       unsigned attr = 0;
+       struct cmd_context *cmd = lv->vg->cmd;
+       const struct segment_type *segtype;
+
+       if (!(segtype = get_segtype_from_string(cmd, "mirror")))
+               return_0;
+
+       if (!segtype->ops->target_present)
+               return_0;
+
+       if (!segtype->ops->target_present(lv->vg->cmd, NULL, &attr))
+               return_0;
+
+       if (!(attr & MIRROR_LOG_CLUSTERED))
+               return 0;
+
+       return 1;
+}
+
+/*
  * Returns the number of mirrors of the LV
  */
 uint32_t lv_mirror_count(const struct logical_volume *lv)
@@ -1940,6 +1970,12 @@
 		return 0;
 	}
 
+	if (vg_is_clustered(lv->vg) &&  !(lv->status & ACTIVATE_EXCL) &&
+	    !cluster_mirror_is_available(lv)) {
+		log_error("Shared cluster mirrors are not available.");
+		return 0;
+	}
+
 	/* For corelog mirror, activation code depends on
 	 * the global mirror_in_sync status. As we are adding
 	 * a new mirror, it should be set as 'out-of-sync'
--- LVM2/lib/mirror/mirrored.c	2010/07/09 15:34:45	1.72
+++ LVM2/lib/mirror/mirrored.c	2010/07/21 13:40:22	1.73
@@ -519,6 +519,19 @@
 					_mirror_attributes |= MIRROR_LOG_CLUSTERED;
 			} else if (module_present(cmd, "log-userspace"))
 				_mirror_attributes |= MIRROR_LOG_CLUSTERED;
+
+                        if (!(_mirror_attributes & MIRROR_LOG_CLUSTERED))
+                                log_verbose("Cluster mirror log module is not available");
+
+                        /*
+                         * The cluster mirror log daemon must be running,
+                         * otherwise, the kernel module will fail to make
+                         * contact.
+                         */
+                        if (!dm_daemon_is_running(CMIRRORD_PIDFILE)) {
+                                log_verbose("Cluster mirror log daemon is not running");
+                                _mirror_attributes &= ~MIRROR_LOG_CLUSTERED;
+                        }
 		}
 		*attributes = _mirror_attributes;
 	}
--- LVM2/libdm/libdevmapper.h	2010/07/21 12:09:12	1.123
+++ LVM2/libdm/libdevmapper.h	2010/07/21 13:40:22	1.124
@@ -988,6 +988,13 @@
  */
 int dm_create_lockfile(const char* lockfile);
 
+/*
+ * Query whether a daemon is running based on its lockfile
+ *
+ * Returns: 1 if running, 0 if not
+ */
+int dm_daemon_is_running(const char* lockfile);
+
 /*********************
  * regular expressions
  *********************/
--- LVM2/libdm/libdm-file.c	2010/07/13 13:51:03	1.11
+++ LVM2/libdm/libdm-file.c	2010/07/21 13:40:22	1.12
@@ -166,3 +166,29 @@
 
 	return 0;
 }
+
+int dm_daemon_is_running(const char* lockfile)
+{
+       int fd;
+       struct flock lock;
+
+       if((fd = open(lockfile, O_RDONLY)) < 0)
+               return 0;
+
+       lock.l_type = F_WRLCK;
+       lock.l_start = 0;
+       lock.l_whence = SEEK_SET;
+       lock.l_len = 0;
+       if (fcntl(fd, F_GETLK, &lock) < 0) {
+               log_error("Cannot check lock status of lockfile [%s], error was [%s]",
+                         lockfile, strerror(errno));
+               if (close(fd))
+                       stack;
+               return 0;
+       }
+
+       if (close(fd))
+               stack;
+
+       return (lock.l_type == F_UNLCK) ? 0 : 1;
+}