multipathd: add "map failures" format wildcard
authorBenjamin Marzinski <bmarzins@redhat.com>
Sat, 29 Oct 2016 02:55:20 +0000 (21:55 -0500)
committerChristophe Varoqui <christophe.varoqui@opensvc.com>
Thu, 3 Nov 2016 13:25:08 +0000 (14:25 +0100)
This patch adds a new wildcard, 'x', for the "show maps format" command.
This wildcard show the number of map failures that have occurred. A map
failure is any time that the multipath device enters a state where it
has no paths and is not set to queue_if_no_paths. It can be used to see
if a multipath device was ever in a state were it could fail IO errors
up.

Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
libmultipath/print.c
libmultipath/structs.h
libmultipath/structs_vec.c
multipathd/cli_handlers.c
multipathd/main.c

index 9aa41ad..f626dc5 100644 (file)
@@ -244,6 +244,12 @@ snprint_q_timeouts (char * buff, size_t len, struct multipath * mpp)
        return snprint_uint(buff, len, mpp->stat_queueing_timeouts);
 }
 
+static int
+snprint_map_failures (char * buff, size_t len, struct multipath * mpp)
+{
+       return snprint_uint(buff, len, mpp->stat_map_failures);
+}
+
 static int
 snprint_multipath_uuid (char * buff, size_t len, struct multipath * mpp)
 {
@@ -619,6 +625,7 @@ struct multipath_data mpd[] = {
        {'t', "dm-st",         0, snprint_dm_map_state},
        {'S', "size",          0, snprint_multipath_size},
        {'f', "features",      0, snprint_features},
+       {'x', "failures",      0, snprint_map_failures},
        {'h', "hwhandler",     0, snprint_hwhandler},
        {'A', "action",        0, snprint_action},
        {'0', "path_faults",   0, snprint_path_faults},
index 2078413..3a716d8 100644 (file)
@@ -277,6 +277,7 @@ struct multipath {
        unsigned int stat_map_loads;
        unsigned int stat_total_queueing_time;
        unsigned int stat_queueing_timeouts;
+       unsigned int stat_map_failures;
 
        /* checkers shared data */
        void * mpcontext;
index a0c8869..e898528 100644 (file)
@@ -610,19 +610,23 @@ int update_multipath (struct vectors *vecs, char *mapname, int reset)
  */
 void update_queue_mode_del_path(struct multipath *mpp)
 {
-       if (--mpp->nr_active == 0 && mpp->no_path_retry > 0) {
-               struct config *conf = get_multipath_config();
+       if (--mpp->nr_active == 0) {
+               if (mpp->no_path_retry > 0) {
+                       struct config *conf = get_multipath_config();
 
-               /*
-                * Enter retry mode.
-                * meaning of +1: retry_tick may be decremented in
-                *                checkerloop before starting retry.
-                */
-               mpp->stat_queueing_timeouts++;
-               mpp->retry_tick = mpp->no_path_retry * conf->checkint + 1;
-               condlog(1, "%s: Entering recovery mode: max_retries=%d",
-                       mpp->alias, mpp->no_path_retry);
-               put_multipath_config(conf);
+                       /*
+                        * Enter retry mode.
+                        * meaning of +1: retry_tick may be decremented in
+                        *                checkerloop before starting retry.
+                        */
+                       mpp->stat_queueing_timeouts++;
+                       mpp->retry_tick = mpp->no_path_retry *
+                                         conf->checkint + 1;
+                       condlog(1, "%s: Entering recovery mode: max_retries=%d",
+                               mpp->alias, mpp->no_path_retry);
+                       put_multipath_config(conf);
+               } else if (mpp->no_path_retry != NO_PATH_RETRY_QUEUE)
+                       mpp->stat_map_failures++;
        }
        condlog(2, "%s: remaining active paths: %d", mpp->alias, mpp->nr_active);
 }
index 181b2b8..b0eeca6 100644 (file)
@@ -498,9 +498,14 @@ show_maps (char ** r, int *len, struct vectors * vecs, char * style,
                        c += snprint_multipath_header(c, reply + maxlen - c,
                                                      style);
 
-               vector_foreach_slot(vecs->mpvec, mpp, i)
+               vector_foreach_slot(vecs->mpvec, mpp, i) {
+                       if (update_multipath(vecs, mpp->alias, 0)) {
+                               i--;
+                               continue;
+                       }
                        c += snprint_multipath(c, reply + maxlen - c,
                                               style, mpp, pretty);
+               }
 
                again = ((c - reply) == (maxlen - 1));
 
@@ -997,6 +1002,8 @@ cli_disable_queueing(void *v, char **reply, int *len, void *data)
                return 1;
        }
 
+       if (mpp->nr_active == 0)
+               mpp->stat_map_failures++;
        mpp->retry_tick = -1;
        dm_queue_if_no_path(mpp->alias, 0);
        return 0;
@@ -1011,6 +1018,8 @@ cli_disable_all_queueing(void *v, char **reply, int *len, void *data)
 
        condlog(2, "disable queueing (operator)");
        vector_foreach_slot(vecs->mpvec, mpp, i) {
+               if (mpp->nr_active == 0)
+                       mpp->stat_map_failures++;
                mpp->retry_tick = -1;
                dm_queue_if_no_path(mpp->alias, 0);
        }
index 03c2dd9..dbcaa03 100644 (file)
@@ -889,6 +889,7 @@ ev_remove_path (struct path *pp, struct vectors * vecs)
                                mpp->retry_tick = 0;
                                mpp->no_path_retry = NO_PATH_RETRY_FAIL;
                                mpp->flush_on_last_del = FLUSH_IN_PROGRESS;
+                               mpp->stat_map_failures++;
                                dm_queue_if_no_path(mpp->alias, 0);
                        }
                        if (!flush_map(mpp, vecs, 1)) {
@@ -1397,6 +1398,7 @@ retry_count_tick(vector mpvec)
                        mpp->stat_total_queueing_time++;
                        condlog(4, "%s: Retrying.. No active path", mpp->alias);
                        if(--mpp->retry_tick == 0) {
+                               mpp->stat_map_failures++;
                                dm_queue_if_no_path(mpp->alias, 0);
                                condlog(2, "%s: Disable queueing", mpp->alias);
                        }