Skip to contentSkip to conversation

add device list registering interface

RFC PATCH New Takahiro Yasui 1 participant 1 message Sep 30, 2009

lore
Share & tools
lore
#0 lore raw

RFC PATCH 2/5 add device list registering interface

When a LV is registered to dmeventd to be monitored, a list of PVs associated with the VG which LV belongs to are passed to dmeventd. The device list is used to generate a filter option string of lvm commands when dmeventd handles an error.

---
 daemons/dmeventd/.exported_symbols                    |    1 
 daemons/dmeventd/dmeventd.c                           |   16 +++-
 daemons/dmeventd/libdevmapper-event.c                 |   42 +++++++---
 daemons/dmeventd/libdevmapper-event.h                 |    4 -
 daemons/dmeventd/plugins/mirror/dmeventd_mirror.c     |    5 -
 daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c |    3 
 lib/mirror/mirrored.c                                 |   72 +++++++++++++++++-
 7 files changed, 118 insertions(+), 25 deletions(-)
daemons/dmeventd/.exported_symbols +1 -0
Index: LVM2.02.54-20090928/daemons/dmeventd/.exported_symbols
===================================================================
@@ -17,3 +17,4 @@ dm_event_unregister_handler
 dm_event_get_registered_device
 dm_event_handler_set_timeout
 dm_event_handler_get_timeout
+dm_event_handler_set_private
daemons/dmeventd/dmeventd.c +12 -4
Index: LVM2.02.54-20090928/daemons/dmeventd/dmeventd.c
===================================================================
@@ -130,7 +130,7 @@ struct dso_data {
 	 * and activate a mapping).
 	 */
 	int (*register_device)(const char *device, const char *uuid, int major,
-			       int minor, void **user);
+			       int minor, void **user, void *user_data);
 
 	/*
 	 * Device unregistration.
@@ -148,6 +148,7 @@ static DM_LIST_INIT(_dso_registry);
 struct message_data {
 	char *id;
 	char *dso_name;		/* Name of DSO. */
+	char *dso_private;
 	char *device_uuid;	/* Mapped device path. */
 	union {
 		char *str;	/* Events string as fetched from message. */
@@ -331,6 +332,8 @@ static void _free_message(struct message
 	if (message_data->device_uuid)
 		dm_free(message_data->device_uuid);
 
+	if (message_data->dso_private)
+		dm_free(message_data->dso_private);
 }
 
 /* Parse a register message from the client. */
@@ -372,6 +375,9 @@ static int _parse_message(struct message
 		ret = 1;
 	}
 
+	if (strlen(p))
+		_fetch_string(&message_data->dso_private, &p, ' ');
+
 	dm_free(msg->data);
 	msg->data = NULL;
 	msg->size = 0;
@@ -649,13 +655,14 @@ static int _event_wait(struct thread_sta
 }
 
 /* Register a device with the DSO. */
-static int _do_register_device(struct thread_status *thread)
+static int _do_register_device(struct thread_status *thread, void *priv_data)
 {
 	return thread->dso_data->register_device(thread->device.name,
 						 thread->device.uuid,
 						 thread->device.major,
 						 thread->device.minor,
-						 &(thread->dso_private));
+						 &(thread->dso_private),
+						 priv_data);
 }
 
 /* Unregister a device with the DSO. */
@@ -969,7 +976,8 @@ static int _register_for_event(struct me
 	if (!(thread = _lookup_thread_status(message_data))) {
 		_unlock_mutex();
 
-		if (!(ret = _do_register_device(thread_new)))
+		if (!(ret = _do_register_device(thread_new,
+						message_data->dso_private)))
 			goto out;
 
 		thread = thread_new;
daemons/dmeventd/libdevmapper-event.c +29 -13

129 lines not on this page · raw message

daemons/dmeventd/libdevmapper-event.h +3 -1
Index: LVM2.02.54-20090928/daemons/dmeventd/libdevmapper-event.h
===================================================================
@@ -72,6 +72,7 @@ int dm_event_handler_set_uuid(struct dm_
 void dm_event_handler_set_major(struct dm_event_handler *dmevh, int major);
 void dm_event_handler_set_minor(struct dm_event_handler *dmevh, int minor);
 void dm_event_handler_set_timeout(struct dm_event_handler *dmevh, int timeout);
+int dm_event_handler_set_private(struct dm_event_handler *dmevh, const char *private);
 
 /*
  * Specify mask for events to monitor.
@@ -99,7 +100,8 @@ int dm_event_unregister_handler(const st
 /* Prototypes for DSO interface, see dmeventd.c, struct dso_data for
    detailed descriptions. */
 void process_event(struct dm_task *dmt, enum dm_event_mask evmask, void **user);
-int register_device(const char *device_name, const char *uuid, int major, int minor, void **user);
+int register_device(const char *device_name, const char *uuid, int major,
+		    int minor, void **user, void *user_data);
 int unregister_device(const char *device_name, const char *uuid, int major,
 		      int minor, void **user);
 
daemons/dmeventd/plugins/mirror/dmeventd_mirror.c +3 -2
Index: LVM2.02.54-20090928/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
===================================================================
@@ -237,7 +237,8 @@ int register_device(const char *device,
 		    const char *uuid __attribute((unused)),
 		    int major __attribute((unused)),
 		    int minor __attribute((unused)),
-		    void **unused __attribute((unused)))
+		    void **priv_ptr __attribute((unused)),
+		    void *priv_data __attribute((unused)))
 {
 	int r = 0;
 
@@ -277,7 +278,7 @@ int unregister_device(const char *device
 		      const char *uuid __attribute((unused)),
 		      int major __attribute((unused)),
 		      int minor __attribute((unused)),
-		      void **unused __attribute((unused)))
+		      void **priv_ptr __attribute((unused)))
 {
 	pthread_mutex_lock(&_register_mutex);
 
daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c +2 -1
Index: LVM2.02.54-20090928/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
===================================================================
@@ -150,7 +150,8 @@ int register_device(const char *device,
 		    const char *uuid __attribute((unused)),
 		    int major __attribute((unused)),
 		    int minor __attribute((unused)),
-		    void **private)
+		    void **private,
+		    void *unused __attribute((unused)))
 {
 	int r = 0;
 	int *percent_warning = (int*)private;
lib/mirror/mirrored.c +68 -4

113 lines not on this page · raw message

Signature · 2 lines
Takahiro Yasui
Hitachi Computer Products (America), Inc.