Blame SOURCES/0139-RHBZ-1273173-queue-no-daemon-doc.patch

c896fb
---
c896fb
 multipath.conf.defaults    |   54 ++++++++++++++++++++++++++++++++++++++-------
c896fb
 multipath/multipath.conf.5 |    2 -
c896fb
 2 files changed, 47 insertions(+), 9 deletions(-)
c896fb
c896fb
Index: multipath-tools-130222/multipath/multipath.conf.5
c896fb
===================================================================
c896fb
--- multipath-tools-130222.orig/multipath/multipath.conf.5
c896fb
+++ multipath-tools-130222/multipath/multipath.conf.5
c896fb
@@ -377,7 +377,7 @@ multipathd running, access to the paths
c896fb
 cannot be told to stop queueing IO. Setting queue_without_daemon to
c896fb
 .I no
c896fb
 , avoids this problem. Default is
c896fb
-.I yes
c896fb
+.I no
c896fb
 .TP
c896fb
 .B bindings_file
c896fb
 The full pathname of the binding file to be used when the user_friendly_names option is set. Defaults to
c896fb
Index: multipath-tools-130222/multipath.conf.defaults
c896fb
===================================================================
c896fb
--- multipath-tools-130222.orig/multipath.conf.defaults
c896fb
+++ multipath-tools-130222/multipath.conf.defaults
c896fb
@@ -4,6 +4,9 @@
c896fb
 #defaults {
c896fb
 #	verbosity 2
c896fb
 #	polling_interval 5
c896fb
+#	max_polling_interval 20
c896fb
+#	reassign_maps "yes"
c896fb
+#	multipath_dir "/lib64/multipath"
c896fb
 #	path_selector "service-time 0"
c896fb
 #	path_grouping_policy "failover"
c896fb
 #	uid_attribute "ID_SERIAL"
c896fb
@@ -12,28 +15,36 @@
c896fb
 #	features "0"
c896fb
 #	path_checker "directio"
c896fb
 #	alias_prefix "mpath"
c896fb
+#	failback "manual"
c896fb
 #	rr_min_io 1000
c896fb
 #	rr_min_io_rq 1
c896fb
 #	max_fds 1048576
c896fb
 #	rr_weight "uniform"
c896fb
-#	queue_without_daemon "yes"
c896fb
-#	pg_timeout "none"
c896fb
+#	queue_without_daemon "no"
c896fb
 #	flush_on_last_del "no"
c896fb
 #	user_friendly_names "no"
c896fb
 #	fast_io_fail_tmo 5
c896fb
 #	bindings_file "/etc/multipath/bindings"
c896fb
 #	wwids_file /etc/multipath/wwids
c896fb
 #	log_checker_err always
c896fb
+#	find_multipaths no
c896fb
 #	retain_attached_hw_handler no
c896fb
 #	detect_prio no
c896fb
+#	hw_str_match no
c896fb
+#	force_sync no
c896fb
+#	deferred_remove no
c896fb
+#	ignore_new_boot_devs no
c896fb
 #	config_dir "/etc/multipath/conf.d"
c896fb
 #	delay_watch_checks no
c896fb
 #	delay_wait_checks no
c896fb
+#	retrigger_tries 3
c896fb
+#	retrigger_delay 10
c896fb
 #	missing_uev_wait_timeout 30
c896fb
+#	new_bindings_in_boot no
c896fb
 #}
c896fb
 #blacklist {
c896fb
 #	devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*"
c896fb
-#	devnode "^hd[a-z]"
c896fb
+#	devnode "^(td|hd|vd)[a-z]"
c896fb
 #	devnode "^dcssblk[0-9]*"
c896fb
 #	device {
c896fb
 #		vendor "DGC"
c896fb
@@ -68,7 +79,7 @@
c896fb
 #		product "Universal Xport"
c896fb
 #	}
c896fb
 #	device {
c896fb
-#		vendor "(LSI|ENGENIO)"
c896fb
+#		vendor "(NETAPP|LSI|ENGENIO)"
c896fb
 #		product "Universal Xport"
c896fb
 #	}
c896fb
 #}
c896fb
@@ -666,7 +677,7 @@
c896fb
 #		features "2 pg_init_retries 50"
c896fb
 #		hardware_handler "1 rdac"
c896fb
 #		prio "rdac"
c896fb
-#		failback "immediate"
c896fb
+#		failback immediate
c896fb
 #		rr_weight "uniform"
c896fb
 #		no_path_retry 15
c896fb
 #	}
c896fb
@@ -679,7 +690,7 @@
c896fb
 #		features "2 pg_init_retries 50"
c896fb
 #		hardware_handler "1 rdac"
c896fb
 #		prio "rdac"
c896fb
-#		failback "immediate"
c896fb
+#		failback immediate
c896fb
 #		rr_weight "uniform"
c896fb
 #		no_path_retry 15
c896fb
 #	}
c896fb
@@ -696,6 +707,7 @@
c896fb
 #		rr_min_io 128
c896fb
 #		flush_on_last_del "yes"
c896fb
 #		dev_loss_tmo "infinity"
c896fb
+#		user_friendly_names no
c896fb
 #		retain_attached_hw_handler yes
c896fb
 #		detect_prio yes
c896fb
 #	}
c896fb
@@ -876,7 +888,7 @@
c896fb
 #		rr_min_io_rq 1
c896fb
 #	}
c896fb
 #	device {
c896fb
-#		vendor "(LSI|ENGENIO)"
c896fb
+#		vendor "(NETAPP|LSI|ENGENIO)"
c896fb
 #		product "INF-01-00"
c896fb
 #		product_blacklist "Universal Xport"
c896fb
 #		path_grouping_policy "group_by_prio"
c896fb
@@ -886,7 +898,9 @@
c896fb
 #		prio "rdac"
c896fb
 #		failback immediate
c896fb
 #		rr_weight "uniform"
c896fb
-#		no_path_retry 15
c896fb
+#		no_path_retry 30
c896fb
+#		retain_attached_hw_handler yes
c896fb
+#		detect_prio yes
c896fb
 #	}
c896fb
 #	device {
c896fb
 #		vendor "STK"
c896fb
@@ -925,6 +939,30 @@
c896fb
 #		rr_weight "uniform"
c896fb
 #		no_path_retry "queue"
c896fb
 #	}
c896fb
+#	device {
c896fb
+#		vendor "DataCore"
c896fb
+#		product "Virtual Disk"
c896fb
+#		path_grouping_policy "group_by_prio"
c896fb
+#		path_checker "tur"
c896fb
+#		features "0"
c896fb
+#		hardware_handler "0"
c896fb
+#		prio "alua"
c896fb
+#		failback immediate
c896fb
+#		rr_weight "uniform"
c896fb
+#		no_path_retry "queue"
c896fb
+#	}
c896fb
+#	device {
c896fb
+#		vendor "XtremIO"
c896fb
+#		product "XtremApp"
c896fb
+#		path_grouping_policy "multibus"
c896fb
+#		path_selector "queue-length 0"
c896fb
+#		path_checker "directio"
c896fb
+#		features "0"
c896fb
+#		hardware_handler "0"
c896fb
+#		prio "const"
c896fb
+#		failback immediate
c896fb
+#		fast_io_fail_tmo 15
c896fb
+#	}
c896fb
 #}
c896fb
 #multipaths {
c896fb
 #}