LVM2/lib/mirror mirrored.c

LVM2/lib/mirror mirrored.c

[mornfall]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mornfall@sourceware.org	2010-08-04 15:55:03

Modified files:
	lib/mirror     : mirrored.c 

Log message:
	Reduce severity of the "mirror transient status" log message (this was never
	intended to be a log_error).

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/mirror/mirrored.c.diff?cvsroot=lvm2&r1=1.74&r2=1.75

--- LVM2/lib/mirror/mirrored.c	2010/07/21 15:21:24	1.74
+++ LVM2/lib/mirror/mirrored.c	2010/08/04 15:55:03	1.75
@@ -254,7 +254,7 @@
 	int failed = 0;
 	char *status;
 
-	log_error("Mirrored transient status: \"%s\"", params);
+	log_very_verbose("Mirrored transient status: \"%s\"", params);
 
 	/* number of devices */
 	if (!dm_split_words(params, 1, 0, &p))

LVM2/lib/mirror mirrored.c

[zkabelac]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2011-01-05 12:27:57

Modified files:
	lib/mirror     : mirrored.c 

Log message:
	Remove unused variable mirr_state and its assignment

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/mirror/mirrored.c.diff?cvsroot=lvm2&r1=1.82&r2=1.83

--- LVM2/lib/mirror/mirrored.c	2010/12/20 13:32:49	1.82
+++ LVM2/lib/mirror/mirrored.c	2011/01/05 12:27:56	1.83
@@ -184,7 +184,6 @@
 				    uint64_t *total_numerator,
 				    uint64_t *total_denominator)
 {
-	struct mirror_state *mirr_state;
 	uint64_t numerator, denominator;
 	unsigned mirror_count, m;
 	int used;
@@ -193,8 +192,6 @@
 	if (!*target_state)
 		*target_state = _mirrored_init_target(mem, cmd);
 
-	mirr_state = *target_state;
-
 	/* Status line: <#mirrors> (maj:min)+ <synced>/<total_regions> */
 	log_debug("Mirror status: %s", params);
 

LVM2/lib/mirror mirrored.c

[jbrassow]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	jbrassow@sourceware.org	2010-07-21 15:21:25

Modified files:
	lib/mirror     : mirrored.c 

Log message:
	Building without the '--enable-cmirrord' option means that
	CMIRRORD_PIDFILE is not defined.  This makes the build fail.
	Therefore, we need to conditionalize the check for cmirrord
	based on if CMIRRORD_PIDFILE is defined.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/mirror/mirrored.c.diff?cvsroot=lvm2&r1=1.73&r2=1.74

--- LVM2/lib/mirror/mirrored.c	2010/07/21 13:40:22	1.73
+++ LVM2/lib/mirror/mirrored.c	2010/07/21 15:21:24	1.74
@@ -528,10 +528,15 @@
                          * otherwise, the kernel module will fail to make
                          * contact.
                          */
+#ifdef CMIRRORD_PIDFILE
                         if (!dm_daemon_is_running(CMIRRORD_PIDFILE)) {
                                 log_verbose("Cluster mirror log daemon is not running");
                                 _mirror_attributes &= ~MIRROR_LOG_CLUSTERED;
                         }
+#else
+			log_verbose("Cluster mirror log daemon not included in build");
+			_mirror_attributes &= ~MIRROR_LOG_CLUSTERED;
+#endif
 		}
 		*attributes = _mirror_attributes;
 	}

LVM2/lib/mirror mirrored.c

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2008-04-10 18:53:36

Modified files:
	lib/mirror     : mirrored.c 

Log message:
	.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/mirror/mirrored.c.diff?cvsroot=lvm2&r1=1.54&r2=1.55

--- LVM2/lib/mirror/mirrored.c	2008/04/10 17:09:31	1.54
+++ LVM2/lib/mirror/mirrored.c	2008/04/10 18:53:36	1.55
@@ -373,7 +373,7 @@
 
 	/*
 	 * Check only for modules if atttributes requested and no previous check.
-	 * FIXME: need better check
+	 * FIXME: Fails incorrectly if cmirror was built into kernel.
 	 */
 	if (attributes) {
 		if (!_mirror_attributes && module_present("cmirror"))

LVM2/lib/mirror mirrored.c

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2007-01-17 15:00:57

Modified files:
	lib/mirror     : mirrored.c 

Log message:
	merge  _target_*register_events
	introduce _create_dm_event_handler()

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/mirror/mirrored.c.diff?cvsroot=lvm2&r1=1.42&r2=1.43

--- LVM2/lib/mirror/mirrored.c	2007/01/16 23:05:13	1.42
+++ LVM2/lib/mirror/mirrored.c	2007/01/17 15:00:57	1.43
@@ -368,7 +368,7 @@
 }
 
 #ifdef DMEVENTD
-static int _setup_registration(struct cmd_context *cmd, char **dso)
+static int _get_mirror_dso_path(struct cmd_context *cmd, char **dso)
 {
 	char *path;
 	const char *libpath;
@@ -388,6 +388,29 @@
 	return 1;
 }
 
+static struct dm_event_handler *_create_dm_event_handler(const char *dmname,
+							 const char *dso,
+							 enum dm_event_mask mask)
+{
+	struct dm_event_handler *dmevh;
+
+	if (!(dmevh = dm_event_handler_create()))
+		return_0;
+
+       if (dm_event_handler_set_dso(dmevh, dso))
+		goto fail;
+
+	if (dm_event_handler_set_dev_name(dmevh, dmname))
+		goto fail;
+
+	dm_event_handler_set_event_mask(dmevh, mask);
+	return dmevh;
+
+fail:
+	dm_event_handler_destroy(dmevh);
+	return NULL;
+}
+
 static int _target_registered(struct lv_segment *seg, int *pending)
 {
 	char *dso, *name;
@@ -400,21 +423,15 @@
 	vg = lv->vg;
 
 	*pending = 0;
-	if (!_setup_registration(vg->cmd, &dso)) {
-		stack;
-		return 0;
-	}
+	if (!_get_mirror_dso_path(vg->cmd, &dso))
+		return_0;
 
 	if (!(name = build_dm_name(vg->cmd->mem, vg->name, lv->name, NULL)))
 		return_0;
 
-	if (!(dmevh = dm_event_handler_create()))
+	if (!(dmevh = _create_dm_event_handler(name, dso, DM_EVENT_ALL_ERRORS)))
 		return_0;
 
-	dm_event_handler_set_dso(dmevh, dso);
-	dm_event_handler_set_dev_name(dmevh, name);
-	dm_event_handler_set_event_mask(dmevh, DM_EVENT_ALL_ERRORS);
-
 	if (dm_event_get_registered_device(dmevh, 0)) {
 		dm_event_handler_destroy(dmevh);
 		return 0;
@@ -432,79 +449,50 @@
 }
 
 /* FIXME This gets run while suspended and performs banned operations. */
-/* FIXME Merge these two functions */
-static int _target_register_events(struct cmd_context *cmd,
+static int _target_set_events(struct cmd_context *cmd,
 				   struct lv_segment *seg,
-				   int evmask)
+				   int evmask, int set)
 {
 	char *dso, *name;
 	struct logical_volume *lv;
 	struct volume_group *vg;
 	struct dm_event_handler *dmevh;
+	int r;
 
 	lv = seg->lv;
 	vg = lv->vg;
 
-	if (!_setup_registration(cmd, &dso)) {
-		stack;
-		return 0;
-	}
+	if (!_get_mirror_dso_path(cmd, &dso))
+		return_0;
 
 	if (!(name = build_dm_name(cmd->mem, vg->name, lv->name, NULL)))
 		return_0;
 
-	if (!(dmevh = dm_event_handler_create()))
+	if (!(dmevh = _create_dm_event_handler(name, dso, DM_EVENT_ALL_ERRORS)))
 		return_0;
 
-	dm_event_handler_set_dso(dmevh, dso);
-	dm_event_handler_set_dev_name(dmevh, name);
-	dm_event_handler_set_event_mask(dmevh, DM_EVENT_ALL_ERRORS);
-	if (!dm_event_register_handler(dmevh)) {
-		dm_event_handler_destroy(dmevh);
-		return_0;
-	}
+	r = set ? dm_event_register_handler(dmevh) : dm_event_unregister_handler(dmevh);
 	dm_event_handler_destroy(dmevh);
+	if (!r)
+		return_0;
 
-	log_info("Registered %s for events", name);
+	log_info("%s %s for events", set ? "Registered" : "Unregistered", name);
 
 	return 1;
 }
 
-static int _target_unregister_events(struct cmd_context *cmd,
+static int _target_register_events(struct cmd_context *cmd,
 				     struct lv_segment *seg,
-				     int evmask)
+				     int events)
 {
-	char *dso;
-	char *name;
-	struct logical_volume *lv;
-	struct volume_group *vg;
-	struct dm_event_handler *dmevh;
-
-	lv = seg->lv;
-	vg = lv->vg;
-
-	/* FIXME Remove this and use handle to avoid config file race */
-	if (!_setup_registration(cmd, &dso))
-		return_0;
-
-	if (!(name = build_dm_name(cmd->mem, vg->name, lv->name, NULL)))
-		return_0;
-
-	if (!(dmevh = dm_event_handler_create()))
-		return_0;
-
-	dm_event_handler_set_dso(dmevh, dso);
-	dm_event_handler_set_dev_name(dmevh, name);
-	dm_event_handler_set_event_mask(dmevh, DM_EVENT_ALL_ERRORS);
-	if (!dm_event_unregister_handler(dmevh)) {
-		dm_event_handler_destroy(dmevh);
-		return_0;
-	}
-	dm_event_handler_destroy(dmevh);
-
-	log_info("Unregistered %s for events", name);
+	return _target_set_events(cmd, seg, events, 1);
+}
 
-	return 1;
+static int _target_unregister_events(struct cmd_context *cmd,
+				     struct lv_segment *seg,
+				     int events)
+{
+	return _target_set_events(cmd, seg, events, 0);
 }
 
 #endif /* DMEVENTD */

LVM2/lib/mirror mirrored.c

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2007-01-16 23:05:15

Modified files:
	lib/mirror     : mirrored.c 

Log message:
	use updated dm_event_get_registered_device interface

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/mirror/mirrored.c.diff?cvsroot=lvm2&r1=1.41&r2=1.42

--- LVM2/lib/mirror/mirrored.c	2007/01/16 18:06:11	1.41
+++ LVM2/lib/mirror/mirrored.c	2007/01/16 23:05:13	1.42
@@ -394,6 +394,7 @@
 	struct logical_volume *lv;
 	struct volume_group *vg;
 	enum dm_event_mask evmask = 0;
+	struct dm_event_handler *dmevh;
 
 	lv = seg->lv;
 	vg = lv->vg;
@@ -407,14 +408,26 @@
 	if (!(name = build_dm_name(vg->cmd->mem, vg->name, lv->name, NULL)))
 		return_0;
 
-	if (!dm_event_get_registered_device(&dso, &name, &evmask, 0))
+	if (!(dmevh = dm_event_handler_create()))
+		return_0;
+
+	dm_event_handler_set_dso(dmevh, dso);
+	dm_event_handler_set_dev_name(dmevh, name);
+	dm_event_handler_set_event_mask(dmevh, DM_EVENT_ALL_ERRORS);
+
+	if (dm_event_get_registered_device(dmevh, 0)) {
+		dm_event_handler_destroy(dmevh);
 		return 0;
+	}
 
+	evmask = dm_event_handler_get_event_mask(dmevh);
 	if (evmask & DM_EVENT_REGISTRATION_PENDING) {
 		*pending = 1;
 		evmask &= ~DM_EVENT_REGISTRATION_PENDING;
 	}
 
+	dm_event_handler_destroy(dmevh);
+
 	return evmask;
 }
 

LVM2/lib/mirror mirrored.c

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2005-12-21 19:45:16

Modified files:
	lib/mirror     : mirrored.c 

Log message:
	fix libdevmapper-event include

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/mirror/mirrored.c.diff?cvsroot=lvm2&r1=1.24&r2=1.25

LVM2/lib/mirror mirrored.c

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2005-12-19 22:36:04

Modified files:
	lib/mirror     : mirrored.c 

Log message:
	fixme

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/mirror/mirrored.c.diff?cvsroot=lvm2&r1=1.23&r2=1.24

LVM2/lib/mirror mirrored.c

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2005-12-13 15:57:32

Modified files:
	lib/mirror     : mirrored.c 

Log message:
	ability to pass log flags to libdevmapper

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/mirror/mirrored.c.diff?cvsroot=lvm2&r1=1.21&r2=1.22

LVM2/lib/mirror mirrored.c

[agk]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2005-12-13 13:32:19

Modified files:
	lib/mirror     : mirrored.c 

Log message:
	comment

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/mirror/mirrored.c.diff?cvsroot=lvm2&r1=1.20&r2=1.21