multipath: standardize on path_selector
Benjamin Marzinski
maintainerPATCH 1/1 multipath: standardize on path_selector
Since the devices and multipaths sections of multipath.conf use "path_selector", set the defaults section to use it was well, instead of "selector".
Signed-off-by Benjamin Marzinski <[email protected]>
--- libmultipath/dict.c | 2 +- multipath.conf.annotated | 4 ++-- multipath.conf.defaults | 2 +- multipath.conf.synthetic | 2 +- multipath/multipath.conf.5 | 18 +++++++++++++++--- 5 files changed, 20 insertions(+), 8 deletions(-)
libmultipath/dict.c +1 -1
@@ -2220,7 +2220,7 @@ init_keywords(void)install_keyword ("polling_interval" , &polling_interval_handler, &snprint_def_polling_interval);install_keyword ("udev_dir" , &udev_dir_handler, &snprint_def_udev_dir);install_keyword ("multipath_dir" , &multipath_dir_handler, &snprint_def_multipath_dir); -install_keyword ("selector" , &def_selector_handler, &snprint_def_selector); +install_keyword ("path_selector" , &def_selector_handler, &snprint_def_selector);install_keyword ("path_grouping_policy" , &def_pgpolicy_handler, &snprint_def_path_grouping_policy);install_keyword ("getuid_callout" , &def_getuid_callout_handler, &snprint_def_getuid_callout);install_keyword ("prio" , &def_prio_handler, &snprint_def_prio);
multipath.conf.annotated +2 -2
@@ -27,14 +27,14 @@ # polling_interval 10 # # # -# # name : selector +# # name : path_selector # # scope : multipath & multipathd # # desc : the default path selector algorithm to use # # these algorithms are offered by the kernel multipath target # # values : "round-robin 0" # # default : "round-robin 0" # # -# selector "round-robin 0" +# path_selector "round-robin 0" # # # # # name : path_grouping_policy
multipath.conf.defaults +1 -1
@@ -4,7 +4,7 @@ #defaults { # udev_dir /dev # polling_interval 5 -# selector "round-robin 0" +# path_selector "round-robin 0" # path_grouping_policy failover # getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # prio const
multipath.conf.synthetic +1 -1
@@ -5,7 +5,7 @@ #defaults { # udev_dir /dev # polling_interval 10 -# selector "round-robin 0" +# path_selector "round-robin 0" # path_grouping_policy multibus # getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" # prio const
multipath/multipath.conf.5 +15 -3
@@ -101,10 +101,22 @@ default verbosity. Higher values increas levels are between 0 and 6; default is .I 2 .TP -.B selector +.B path_selector The default path selector algorithm to use; they are offered by the -kernel multipath target. The only currently implemented is -.I "round-robin 0" +kernel multipath target. There are three selector algorithms. +.RS +.TP 12 +.B "round-robin 0" +Loop through every path in the path group, sending the same amount of IO to +each. +.TP +.B "queue-length 0" +Send the next bunch of IO down the path with the least amount of outstanding IO. +.TP +.B "service-time 0" +Choose the path for the next bunch of IO based on the amount of outstanding IO +to the path and its relative throughput. +.RE .TP .B path_grouping_policy The default path grouping policy to apply to unspecified