[libmultipath] more path: and multipath: output prefixing

diff --git a/libmultipath/configure.c b/libmultipath/configure.c
index 121c4ee..342ef79 100644 (file)
--- a/libmultipath/configure.c
+++ b/libmultipath/configure.c
@@ -138,82 +138,94 @@ select_action (struct multipath * mpp, vector curmp)
                cmpp = find_mp_by_wwid(curmp, mpp->wwid);
 
                if (cmpp && !conf->dry_run) {
-                       condlog(2, "%s: rename: %s to %s", mpp->wwid,
+                       condlog(2, "%s: rename %s to %s", mpp->wwid,
                                cmpp->alias, mpp->alias);
                        strncpy(mpp->alias_old, cmpp->alias, WWID_SIZE);
                        mpp->action = ACT_RENAME;
                        return;
                }
                else {
-                       condlog(3, "set ACT_CREATE: map does not exist");
+                       condlog(3, "%s: set ACT_CREATE (map does not exist)",
+                               mpp->alias);
                        mpp->action = ACT_CREATE;
                }
                mpp->action = ACT_CREATE;
-               condlog(3, "set ACT_CREATE: map does not exist");
+               condlog(3, "%s: set ACT_CREATE (map does not exist)",
+                       mpp->alias);
                return;
        }
 
        if (!find_mp_by_wwid(curmp, mpp->wwid)) {
-               condlog(2, "remove: %s (wwid changed)", cmpp->alias);
+               condlog(2, "%s: remove (wwid changed)", cmpp->alias);
                dm_flush_map(mpp->alias, DEFAULT_TARGET);
                strncat(cmpp->wwid, mpp->wwid, WWID_SIZE);
                drop_multipath(curmp, cmpp->wwid, KEEP_PATHS);
                mpp->action = ACT_CREATE;
-               condlog(3, "set ACT_CREATE: map wwid change");
+               condlog(3, "%s: set ACT_CREATE (map wwid change)",
+                       mpp->alias);
                return;
        }
                
        if (pathcount(mpp, PATH_UP) == 0) {
                mpp->action = ACT_NOTHING;
-               condlog(3, "set ACT_NOTHING: no usable path");
+               condlog(3, "%s: set ACT_NOTHING (no usable path)",
+                       mpp->alias);
                return;
        }
        if (cmpp->size != mpp->size) {
                mpp->action = ACT_RELOAD;
-               condlog(3, "set ACT_RELOAD: size change");
+               condlog(3, "%s: set ACT_RELOAD (size change)",
+                       mpp->alias);
                return;
        }
        if (!mpp->no_path_retry && /* let features be handled by the daemon */
            strncmp(cmpp->features, mpp->features, strlen(mpp->features))) {
                mpp->action =  ACT_RELOAD;
-               condlog(3, "set ACT_RELOAD: features change");
+               condlog(3, "%s: set ACT_RELOAD (features change)",
+                       mpp->alias);
                return;
        }
        if (strncmp(cmpp->hwhandler, mpp->hwhandler,
                    strlen(mpp->hwhandler))) {
                mpp->action = ACT_RELOAD;
-               condlog(3, "set ACT_RELOAD: hwhandler change");
+               condlog(3, "%s: set ACT_RELOAD (hwhandler change)",
+                       mpp->alias);
                return;
        }
        if (strncmp(cmpp->selector, mpp->selector,
                    strlen(mpp->selector))) {
                mpp->action = ACT_RELOAD;
-               condlog(3, "set ACT_RELOAD: selector change");
+               condlog(3, "%s: set ACT_RELOAD (selector change)",
+                       mpp->alias);
                return;
        }
        if (cmpp->minio != mpp->minio) {
                mpp->action = ACT_RELOAD;
-               condlog(3, "set ACT_RELOAD: minio change (%u->%u)",
-                       cmpp->minio, mpp->minio);
+               condlog(3, "%s: set ACT_RELOAD (minio change, %u->%u)",
+                       mpp->alias, cmpp->minio, mpp->minio);
                return;
        }
        if (VECTOR_SIZE(cmpp->pg) != VECTOR_SIZE(mpp->pg)) {
                mpp->action = ACT_RELOAD;
-               condlog(3, "set ACT_RELOAD: number of path group change");
+               condlog(3, "%s: set ACT_RELOAD (path group number change)",
+                       mpp->alias);
                return;
        }
        if (pgcmp(mpp, cmpp)) {
                mpp->action = ACT_RELOAD;
-               condlog(3, "set ACT_RELOAD: path group topology change");
+               condlog(3, "%s: set ACT_RELOAD (path group topology change)",
+                       mpp->alias);
                return;
        }
        if (cmpp->nextpg != mpp->bestpg) {
                mpp->action = ACT_SWITCHPG;
-               condlog(3, "set ACT_SWITCHPG: next path group change");
+               condlog(3, "%s: set ACT_SWITCHPG (next path group change)",
+                       mpp->alias);
                return;
        }
        mpp->action = ACT_NOTHING;
-       condlog(3, "set ACT_NOTHING: map unchanged");
+       condlog(3, "%s: set ACT_NOTHING (map unchanged)",
+               mpp->alias);
        return;
 }
 
@@ -239,7 +251,7 @@ reinstate_paths (struct multipath * mpp)
 
                        if (pp->dmstate == PSTATE_FAILED) {
                                if (dm_reinstate_path(mpp->alias, pp->dev_t))
-                                       condlog(0, "error reinstating %s",
+                                       condlog(0, "%s: error reinstating",
                                                pp->dev);
                        }
                }
@@ -308,7 +320,8 @@ domap (struct multipath * mpp)
 
        case ACT_CREATE:
                if (lock_multipath(mpp, 1)) {
-                       condlog(3, "%s: in use", mpp->alias);
+                       condlog(3, "%s: failed to create map (in use)",
+                               mpp->alias);
                        return -1;
                }
                dm_shut_log();
@@ -434,7 +447,7 @@ coalesce_paths (struct vectors * vecs, vector newmp, char * refwwid)
                        mpp->action = ACT_REJECT;
 
                if (!mpp->paths) {
-                       condlog(0, "%s coalesce_paths: no paths", mpp->alias);
+                       condlog(0, "%s: skip coalesce (no paths)", mpp->alias);
                        remove_map(mpp, vecs, NULL, 0);
                        continue;
                }
@@ -523,10 +536,10 @@ coalesce_paths (struct vectors * vecs, vector newmp, char * refwwid)
                        remove_map(mpp, vecs, NULL, 0);
 
                        if (dm_flush_map(mpp->alias, DEFAULT_TARGET))
-                               condlog(2, "remove: %s (dead) failed!",
+                               condlog(2, "%s: remove failed (dead)",
                                        mpp->alias);
                        else
-                               condlog(2, "remove: %s (dead)", mpp->alias);
+                               condlog(2, "%s: remove (dead)", mpp->alias);
                }
        }
        return 0;

diff --git a/libmultipath/uevent.c b/libmultipath/uevent.c
index 5569e84..6482698 100644 (file)
--- a/libmultipath/uevent.c
+++ b/libmultipath/uevent.c
@@ -138,7 +138,7 @@ int uevent_listen(int (*uev_trigger)(struct uevent *, void * trigger_data),
 
        sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
        if (sock == -1) {
-               condlog(0, "error getting socket, exit\n");
+               condlog(0, "error getting socket, exit");
                return 1;
        }
 
@@ -152,21 +152,21 @@ int uevent_listen(int (*uev_trigger)(struct uevent *, void * trigger_data),
                            sizeof(rcvbufsz));
 
        if (retval < 0) {
-               condlog(0, "error setting receive buffer size for socket, exit\n");
+               condlog(0, "error setting receive buffer size for socket, exit");
                exit(1);
        }
        retval = getsockopt(sock, SOL_SOCKET, SO_RCVBUF, &rcvsz, prcvszsz);
 
        if (retval < 0) {
-               condlog(0, "error setting receive buffer size for socket, exit\n");
+               condlog(0, "error setting receive buffer size for socket, exit");
                exit(1);
        }
-       condlog(3, "receive buffer size for socket is %u.\n", rcvsz);
+       condlog(3, "receive buffer size for socket is %u.", rcvsz);
 
        retval = bind(sock, (struct sockaddr *) &snl,
                      sizeof(struct sockaddr_nl));
        if (retval < 0) {
-               condlog(0, "bind failed, exit\n");
+               condlog(0, "bind failed, exit");
                goto exit;
        }
 
@@ -181,7 +181,7 @@ int uevent_listen(int (*uev_trigger)(struct uevent *, void * trigger_data),
 
                buflen = recv(sock, &buff, sizeof(buff), 0);
                if (buflen <  0) {
-                       condlog(0, "error receiving message\n");
+                       condlog(0, "error receiving message");
                        continue;
                }
 
@@ -228,11 +228,11 @@ int uevent_listen(int (*uev_trigger)(struct uevent *, void * trigger_data),
                }
                uev->envp[i] = NULL;
 
-               condlog(3, "uevent '%s' from '%s'\n", uev->action, uev->devpath);
+               condlog(3, "uevent '%s' from '%s'", uev->action, uev->devpath);
 
                /* print payload environment */
                for (i = 0; uev->envp[i] != NULL; i++)
-                       condlog(3, "%s\n", uev->envp[i]);
+                       condlog(3, "%s", uev->envp[i]);
 
                /*
                 * Queue uevent and poke service pthread.

diff --git a/multipathd/main.c b/multipathd/main.c
index bac1ace..db29d53 100644 (file)
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -226,9 +226,6 @@ coalesce_maps(struct vectors *vecs, vector nmpv)
        vector ompv = vecs->mpvec;
        int i, j;
 
-       condlog(3, "coalesce_maps vs = %u", VECTOR_SIZE(ompv));
-       condlog(3, "coalesce_maps vs = %u", VECTOR_SIZE(nmpv));
-
        vector_foreach_slot (ompv, ompp, i) {
                if (!find_mp_by_wwid(nmpv, ompp->wwid)) {
                        /*