Use new dmeventd_lvm2_command function in dmeventd plugins.

For snapshot, prepare whole command in front into private buffer.
Add also some missing '\n' for syslog messages.
For raid and mirror only convert creation of command line string.
This should avoid any unbound growth of mempool for dm_split_names.

diff --git a/WHATS_NEW b/WHATS_NEW
index 39bc8756756ab65479ce8a67a0c7d3ead325a399..eedeb79e52d7058c04f1f4a570d68c305a61f1f7 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.89 - 
 ==================================
+  Use dmeventd_lvm2_command in dmeventd plugins snapshot, raid, mirror.
   Add helper dmeventd_lvm2_command() into libdevmapper-event-lvm2 library.
   Updated documentation for dmeventd.
   Drop extra stat call before opening device.

diff --git a/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c b/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
index 3e97d87302f54df17a26cc3a917d4f34f019099a..ed062313f08e49b144b62e66197772af06d79ada 100644 (file)
--- a/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
+++ b/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2005-2011 Red Hat, Inc. All rights reserved.
  *
  * This file is part of LVM2.
  *
@@ -133,32 +133,15 @@ static int _remove_failed_devices(const char *device)
        int r;
 #define CMD_SIZE 256   /* FIXME Use system restriction */
        char cmd_str[CMD_SIZE];
-       char *vg = NULL, *lv = NULL, *layer = NULL;
 
-       if (strlen(device) > 200)  /* FIXME Use real restriction */
-               return -ENAMETOOLONG;   /* FIXME These return code distinctions are not used so remove them! */
-
-       if (!dm_split_lvm_name(dmeventd_lvm2_pool(), device, &vg, &lv, &layer)) {
-               syslog(LOG_ERR, "Unable to determine VG name from %s.",
-                      device);
-               return -ENOMEM; /* FIXME Replace with generic error return - reason for failure has already got logged */
-       }
-
-       /* strip off the mirror component designations */
-       layer = strstr(lv, "_mlog");
-       if (layer)
-               *layer = '\0';
-
-       /* FIXME Is any sanity-checking required on %s? */
-       if (CMD_SIZE <= snprintf(cmd_str, CMD_SIZE, "lvconvert --config devices{ignore_suspended_devices=1} --repair --use-policies %s/%s", vg, lv)) {
-               /* this error should be caught above, but doesn't hurt to check again */
-               syslog(LOG_ERR, "Unable to form LVM command: Device name too long.");
+       if (!dmeventd_lvm2_command(dmeventd_lvm2_pool(), cmd_str, sizeof(cmd_str),
+                                 "lvconvert --config devices{ignore_suspended_devices=1} "
+                                 "--repair --use-policies", device))
                return -ENAMETOOLONG; /* FIXME Replace with generic error return - reason for failure has already got logged */
-       }
 
        r = dmeventd_lvm2_run(cmd_str);
 
-       syslog(LOG_INFO, "Repair of mirrored LV %s/%s %s.", vg, lv,
+       syslog(LOG_INFO, "Repair of mirrored device %s %s.", device,
               (r == ECMD_PROCESSED) ? "finished successfully" : "failed");
 
        return (r == ECMD_PROCESSED) ? 0 : -1;
@@ -227,9 +210,12 @@ int register_device(const char *device,
                    int minor __attribute__((unused)),
                    void **unused __attribute__((unused)))
 {
-       int r = dmeventd_lvm2_init();
+       if (!dmeventd_lvm2_init())
+               return 0;
+
        syslog(LOG_INFO, "Monitoring mirror device %s for events.", device);
-       return r;
+
+       return 1;
 }
 
 int unregister_device(const char *device,
@@ -241,5 +227,6 @@ int unregister_device(const char *device,
        syslog(LOG_INFO, "No longer monitoring mirror device %s for events.",
               device);
        dmeventd_lvm2_exit();
+
        return 1;
 }

diff --git a/daemons/dmeventd/plugins/raid/dmeventd_raid.c b/daemons/dmeventd/plugins/raid/dmeventd_raid.c
index dd5e7eb0309887f4b68d6aa22b9ae6c5cef98b9b..a3ecdc1cb68730d46d9b7f81216d2182d8771089 100644 (file)
--- a/daemons/dmeventd/plugins/raid/dmeventd_raid.c
+++ b/daemons/dmeventd/plugins/raid/dmeventd_raid.c
@@ -33,28 +33,16 @@ static int run_repair(const char *device)
        int r;
 #define CMD_SIZE 256   /* FIXME Use system restriction */
        char cmd_str[CMD_SIZE];
-       char *vg = NULL, *lv = NULL, *layer = NULL;
 
-       if (strlen(device) > 200)  /* FIXME Use real restriction */
+       if (!dmeventd_lvm2_command(dmeventd_lvm2_pool(), cmd_str, sizeof(cmd_str),
+                                 "lvconvert --config devices{ignore_suspended_devices=1} "
+                                 "--repair --use-policies", device))
                return -1;
 
-       if (!dm_split_lvm_name(dmeventd_lvm2_pool(), device, &vg, &lv, &layer)) {
-               syslog(LOG_ERR, "Unable to determine VG name from %s.",
-                      device);
-               return -1;
-       }
-
-       /* FIXME Is any sanity-checking required on %s? */
-       if (CMD_SIZE <= snprintf(cmd_str, CMD_SIZE, "lvconvert --config devices{ignore_suspended_devices=1} --repair --use-policies %s/%s", vg, lv)) {
-               /* this error should be caught above, but doesn't hurt to check again */
-               syslog(LOG_ERR, "Unable to form LVM command: Device name too long.");
-               return -1;
-       }
-
        r = dmeventd_lvm2_run(cmd_str);
 
        if (r != ECMD_PROCESSED)
-               syslog(LOG_INFO, "Repair of RAID LV %s/%s failed.", vg, lv);
+               syslog(LOG_INFO, "Repair of RAID device %s failed.", device);
 
        return (r == ECMD_PROCESSED) ? 0 : -1;
 }
@@ -162,9 +150,12 @@ int register_device(const char *device,
                    int minor __attribute__((unused)),
                    void **unused __attribute__((unused)))
 {
-       int r = dmeventd_lvm2_init();
+       if (!dmeventd_lvm2_init())
+               return 0;
+
        syslog(LOG_INFO, "Monitoring RAID device %s for events.", device);
-       return r;
+
+       return 1;
 }
 
 int unregister_device(const char *device,
@@ -176,5 +167,6 @@ int unregister_device(const char *device,
        syslog(LOG_INFO, "No longer monitoring RAID device %s for events.",
               device);
        dmeventd_lvm2_exit();
+
        return 1;
 }

diff --git a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
index b21f6a1a06cf1831c8d3736fac7df260a8b781df..18fa39047ad232a9e1b17a4ad1ca6a0c725e4ca4 100644 (file)
--- a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
+++ b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2010 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2007-2011 Red Hat, Inc. All rights reserved.
  *
  * This file is part of LVM2.
  *
@@ -43,6 +43,7 @@ struct snap_status {
 struct dso_state {
        int percent_check;
        int known_size;
+       char cmd_str[1024];
 };
 
 /* FIXME possibly reconcile this with target_percent when we gain
@@ -120,22 +121,9 @@ static int _run(const char *cmd, ...)
         return 1; /* all good */
 }
 
-static int _extend(const char *device)
+static int _extend(const char *cmd)
 {
-       char *vg = NULL, *lv = NULL, *layer = NULL;
-       char cmd_str[1024];
-
-       if (!dm_split_lvm_name(dmeventd_lvm2_pool(), device, &vg, &lv, &layer)) {
-               syslog(LOG_ERR, "Unable to determine VG name from %s.", device);
-               return 0;
-       }
-       if (dm_snprintf(cmd_str, sizeof(cmd_str),
-                       "lvextend --use-policies %s/%s", vg, lv) < 0) {
-               syslog(LOG_ERR, "Unable to form LVM command: Device name too long.");
-               return 0;
-       }
-
-       return dmeventd_lvm2_run(cmd_str) == ECMD_PROCESSED;
+       return dmeventd_lvm2_run(cmd) == ECMD_PROCESSED;
 }
 
 static void _umount(const char *device, int major, int minor)
@@ -165,9 +153,9 @@ static void _umount(const char *device, int major, int minor)
                if (S_ISBLK(st.st_mode) &&
                    major(st.st_rdev) == major &&
                    minor(st.st_rdev) == minor) {
-                       syslog(LOG_ERR, "Unmounting invalid snapshot %s from %s.", device, words[1]);
+                       syslog(LOG_ERR, "Unmounting invalid snapshot %s from %s.\n", device, words[1]);
                         if (!_run(UMOUNT_COMMAND, "-fl", words[1], NULL))
-                                syslog(LOG_ERR, "Failed to umount snapshot %s from %s: %s.",
+                                syslog(LOG_ERR, "Failed to umount snapshot %s from %s: %s.\n",
                                        device, words[1], strerror(errno));
                }
        }
@@ -235,8 +223,8 @@ void process_event(struct dm_task *dmt,
                if (percent >= WARNING_THRESH) /* Print a warning to syslog. */
                        syslog(LOG_WARNING, "Snapshot %s is now %i%% full.\n", device, percent);
                /* Try to extend the snapshot, in accord with user-set policies */
-               if (!_extend(device))
-                       syslog(LOG_ERR, "Failed to extend snapshot %s.", device);
+               if (!_extend(state->cmd_str))
+                       syslog(LOG_ERR, "Failed to extend snapshot %s.\n", device);
        }
 
 out:
@@ -249,17 +237,33 @@ int register_device(const char *device,
                    int minor __attribute__((unused)),
                    void **private)
 {
-       struct dso_state **state = (struct dso_state **) private;
-       int r = dmeventd_lvm2_init();
+       struct dso_state *state;
+
+       if (!dmeventd_lvm2_init())
+               goto out;
 
-       if (!(*state = dm_malloc(sizeof (struct dso_state))))
-               return 0;
+       if (!(state = dm_zalloc(sizeof(*state))))
+               goto bad;
 
-       (*state)->percent_check = CHECK_MINIMUM;
-       (*state)->known_size = 0;
+       if (!dmeventd_lvm2_command(dmeventd_lvm2_pool(),
+                                   state->cmd_str, sizeof(state->cmd_str),
+                                  "lvextend --use-policies", device))
+               goto bad;
+
+       state->percent_check = CHECK_MINIMUM;
+       state->known_size = 0;
+       *private = state;
 
        syslog(LOG_INFO, "Monitoring snapshot %s\n", device);
-       return r;
+
+       return 1;
+bad:
+       dm_free(state);
+       dmeventd_lvm2_exit();
+out:
+       syslog(LOG_ERR, "Failed to monitor snapshot %s.\n", device);
+
+       return 0;
 }
 
 int unregister_device(const char *device,
@@ -269,10 +273,10 @@ int unregister_device(const char *device,
                      void **private)
 {
        struct dso_state *state = *private;
-       syslog(LOG_INFO, "No longer monitoring snapshot %s\n",
-              device);
 
+       syslog(LOG_INFO, "No longer monitoring snapshot %s\n", device);
        dm_free(state);
        dmeventd_lvm2_exit();
+
        return 1;
 }