multipathd: move recovery mode code to function
authorBenjamin Marzinski <bmarzins@redhat.com>
Thu, 7 Dec 2017 18:49:03 +0000 (12:49 -0600)
committerChristophe Varoqui <christophe.varoqui@opensvc.com>
Sat, 13 Jan 2018 09:15:29 +0000 (10:15 +0100)
Instead of having multiple functions all running slightly different
code to move a multipath device to recovery mode, there is now
an enter_recovery_mode() function that all of them call.

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

index 814a4b9..2f1f277 100644 (file)
@@ -307,7 +307,23 @@ update_multipath_strings(struct multipath *mpp, vector pathvec, int is_daemon)
        return 0;
 }
 
-void set_no_path_retry(struct config *conf, struct multipath *mpp)
+void enter_recovery_mode(struct multipath *mpp)
+{
+       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);
+}
+
+static void set_no_path_retry(struct multipath *mpp)
 {
        mpp->retry_tick = 0;
        mpp->nr_active = pathcount(mpp, PATH_UP) + pathcount(mpp, PATH_GHOST);
@@ -323,14 +339,8 @@ void set_no_path_retry(struct config *conf, struct multipath *mpp)
                break;
        default:
                dm_queue_if_no_path(mpp->alias, 1);
-               if (mpp->nr_active == 0) {
-                       struct config *conf = get_multipath_config();
-                       /* Enter retry mode */
-                       mpp->retry_tick = mpp->no_path_retry * conf->checkint;
-                       condlog(1, "%s: Entering recovery mode: max_retries=%d",
-                               mpp->alias, mpp->no_path_retry);
-                       put_multipath_config(conf);
-               }
+               if (mpp->nr_active == 0)
+                       enter_recovery_mode(mpp);
                break;
        }
 }
@@ -338,8 +348,6 @@ void set_no_path_retry(struct config *conf, struct multipath *mpp)
 int __setup_multipath(struct vectors *vecs, struct multipath *mpp,
                      int reset)
 {
-       struct config *conf;
-
        if (dm_get_info(mpp->alias, &mpp->dmi)) {
                /* Error accessing table */
                condlog(3, "%s: cannot access table", mpp->alias);
@@ -358,9 +366,7 @@ int __setup_multipath(struct vectors *vecs, struct multipath *mpp,
        }
 
        if (reset) {
-               conf = get_multipath_config();
-               set_no_path_retry(conf, mpp);
-               put_multipath_config(conf);
+               set_no_path_retry(mpp);
                if (VECTOR_SIZE(mpp->paths) != 0)
                        dm_cancel_deferred_remove(mpp);
        }
@@ -638,21 +644,9 @@ int update_multipath (struct vectors *vecs, char *mapname, int reset)
 void update_queue_mode_del_path(struct multipath *mpp)
 {
        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);
-               } else if (mpp->no_path_retry != NO_PATH_RETRY_QUEUE)
+               if (mpp->no_path_retry > 0)
+                       enter_recovery_mode(mpp);
+               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 04fa0dd..b81413b 100644 (file)
@@ -11,7 +11,7 @@ struct vectors {
        vector mpvec;
 };
 
-void set_no_path_retry(struct config *conf, struct multipath *mpp);
+void enter_recovery_mode(struct multipath *mpp);
 
 int adopt_paths (vector pathvec, struct multipath * mpp);
 void orphan_paths (vector pathvec, struct multipath * mpp);
index bf0d9f6..7f13bc9 100644 (file)
@@ -997,11 +997,8 @@ cli_restore_queueing(void *v, char **reply, int *len, void *data)
                dm_queue_if_no_path(mpp->alias, 1);
                if (mpp->nr_active > 0)
                        mpp->retry_tick = 0;
-               else {
-                       struct config *conf = get_multipath_config();
-                       mpp->retry_tick = mpp->no_path_retry * conf->checkint;
-                       put_multipath_config(conf);
-               }
+               else
+                       enter_recovery_mode(mpp);
        }
        return 0;
 }
@@ -1024,11 +1021,8 @@ cli_restore_all_queueing(void *v, char **reply, int *len, void *data)
                        dm_queue_if_no_path(mpp->alias, 1);
                        if (mpp->nr_active > 0)
                                mpp->retry_tick = 0;
-                       else {
-                               conf = get_multipath_config();
-                               mpp->retry_tick = mpp->no_path_retry * conf->checkint;
-                               put_multipath_config(conf);
-                       }
+                       else
+                               enter_recovery_mode(mpp);
                }
        }
        return 0;