libmultipath: change how the checker async is set
authorBenjamin Marzinski <bmarzins@redhat.com>
Wed, 19 Feb 2020 06:48:32 +0000 (00:48 -0600)
committerChristophe Varoqui <christophe.varoqui@opensvc.com>
Mon, 2 Mar 2020 08:43:35 +0000 (09:43 +0100)
The way that the checkers async mode worked in multipathd didn't make
much sense. When multipathd starts up, all checker classes are in the
sync mode, and any pathinfo() calls on devices would run the checker in
sync mode. However, the First time a checker class was used in
checkerloop, it would set that checker class to async (assuming
force_sync wasn't set).  After that, no matter when a checker from that
class was called, it would always run in async mode.  Multipathd doesn't
need to run checkers in sync mode at all, so don't.

Reviewed-by: Martin Wilck <mwilck@suse.com>
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
libmpathpersist/mpath_persist.c
libmultipath/discovery.c
multipath/main.c

index 0c57dd9..3da7a6c 100644 (file)
@@ -47,7 +47,7 @@ mpath_lib_init (void)
                condlog(0, "Failed to initialize multipath config.");
                return NULL;
        }
-
+       conf->force_sync = 1;
        set_max_fds(conf->max_fds);
 
        return conf;
index 20de8be..47b12b6 100644 (file)
@@ -1699,12 +1699,10 @@ get_state (struct path * pp, struct config *conf, int daemon, int oldstate)
        if (pp->mpp && !c->mpcontext)
                checker_mp_init(c, &pp->mpp->mpcontext);
        checker_clear_message(c);
-       if (daemon) {
-               if (conf->force_sync == 0)
-                       checker_set_async(c);
-               else
-                       checker_set_sync(c);
-       }
+       if (conf->force_sync == 0)
+               checker_set_async(c);
+       else
+               checker_set_sync(c);
        if (!conf->checker_timeout &&
            sysfs_get_timeout(pp, &(c->timeout)) <= 0)
                c->timeout = DEF_TIMEOUT;
index c2ef8c7..347a440 100644 (file)
@@ -907,6 +907,7 @@ main (int argc, char *argv[])
                exit(RTVL_FAIL);
        multipath_conf = conf;
        conf->retrigger_tries = 0;
+       conf->force_sync = 1;
        while ((arg = getopt(argc, argv, ":adcChl::FfM:v:p:b:BrR:itTquUwW")) != EOF ) {
                switch(arg) {
                case 1: printf("optarg : %s\n",optarg);