Hello Adam, On 11/02/2011 01:08 AM, Adam D. Barratt wrote: > The hp_sw change looks fine. In terms of the documentation changes, is > there an ETA for getting them uploaded to unstable? Also: > Soon. Upstream is not very frequent in new releases. For wheezy, I need to check with them on which snapshot to rebase. The upstream repo already has the man page fixes. > ++of this path. Higher number have a higher priority. > > s/number/&s/ > > ++regex can be of SCSI H:B:T:L format Ex: 1:0:.:. , *:0:0:. > ++.I devname > ++regex can be of device name format Ex: sda , sd.e > > s/can be of/can be in/g Done. Please review the attached debdiff patch and let me know when to proceed. Ritesh -- Ritesh Raj Sarraf | http://people.debian.org/~rrs Debian - The Universal Operating System
diff -Nru multipath-tools-0.4.8+git0.761c66f/debian/changelog multipath-tools-0.4.8+git0.761c66f/debian/changelog --- multipath-tools-0.4.8+git0.761c66f/debian/changelog 2011-11-03 13:03:54.000000000 +0530 +++ multipath-tools-0.4.8+git0.761c66f/debian/changelog 2011-11-03 12:57:19.000000000 +0530 @@ -1,3 +1,11 @@ +multipath-tools (0.4.8+git0.761c66f-10) stable-proposed-updates; urgency=low + + * [b5f7694] Change HP hardware hanlder to hp_sw. + Thanks to Phil (Closes: 587315) + * [4aae2ad] Update man pages (Closes: 644913) + + -- Ritesh Raj Sarraf <rrs@debian.org> Sun, 30 Oct 2011 23:54:39 +0530 + multipath-tools (0.4.8+git0.761c66f-9) unstable; urgency=low * [0435cc1] Make sure the patchcheckers end up in /lib (Closes: #581377) diff -Nru multipath-tools-0.4.8+git0.761c66f/debian/patches/0012-hp-hardware-handler.patch multipath-tools-0.4.8+git0.761c66f/debian/patches/0012-hp-hardware-handler.patch --- multipath-tools-0.4.8+git0.761c66f/debian/patches/0012-hp-hardware-handler.patch 1970-01-01 05:30:00.000000000 +0530 +++ multipath-tools-0.4.8+git0.761c66f/debian/patches/0012-hp-hardware-handler.patch 2011-11-03 12:57:19.000000000 +0530 @@ -0,0 +1,23 @@ +changes default hardware handler to hp_sw from hp-sw. This change has already been done upstream in 2009 +Index: multipath-tools/libmultipath/hwtable.c +=================================================================== +--- multipath-tools.orig/libmultipath/hwtable.c 2011-10-30 12:37:27.902672064 +0530 ++++ multipath-tools/libmultipath/hwtable.c 2011-10-30 12:40:22.942007814 +0530 +@@ -85,7 +85,7 @@ + .product = "HSG80", + .getuid = DEFAULT_GETUID, + .features = "1 queue_if_no_path", +- .hwhandler = "1 hp-sw", ++ .hwhandler = "1 hp_sw", + .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = FAILBACK_UNDEF, +@@ -116,7 +116,7 @@ + .product = "(MSA|HSV)1.0.*", + .getuid = DEFAULT_GETUID, + .features = "1 queue_if_no_path", +- .hwhandler = "1 hp-sw", ++ .hwhandler = "1 hp_sw", + .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = FAILBACK_UNDEF, diff -Nru multipath-tools-0.4.8+git0.761c66f/debian/patches/0013-manpage-updates.patch multipath-tools-0.4.8+git0.761c66f/debian/patches/0013-manpage-updates.patch --- multipath-tools-0.4.8+git0.761c66f/debian/patches/0013-manpage-updates.patch 1970-01-01 05:30:00.000000000 +0530 +++ multipath-tools-0.4.8+git0.761c66f/debian/patches/0013-manpage-updates.patch 2011-11-03 13:00:56.000000000 +0530 @@ -0,0 +1,142 @@ +update outdated man pages +Index: multipath-tools/multipath/multipath.conf.5 +=================================================================== +--- multipath-tools.orig/multipath/multipath.conf.5 2011-11-03 12:58:32.211821050 +0530 ++++ multipath-tools/multipath/multipath.conf.5 2011-11-03 13:00:34.005523713 +0530 +@@ -120,34 +120,52 @@ + The default program and args to callout to obtain a path priority + value. The specified program will be executed and should return a + numeric value specifying the relative priority of this path. Higher +-number have a higher priority. A '%n' in the command line will be expanded ++numbers have a higher priority. A '%n' in the command line will be expanded + to the device name, a '%b' will be expanded to the device number in + .I major:minor + format. ++.B prio ++The name of the path priority routine. The specified routine ++should return a numeric value specifying the relative priority ++of this path. Higher number have a higher priority. + .I "none" +-is a valid value. Currently the following path priority programs are ++is a valid value. Currently the following path priority routines are + implemented: + .RS + .TP 12 +-.B mpath_prio_emc /dev/%n +-Generate the path priority for EMC arrays ++.B const ++Return a constant priority of \fI1\fR. + .TP +-.B mpath_prio_alua /dev/%n ++.B emc ++Generate the path priority for EMC arrays. ++.TP ++.B alua + Generate the path priority based on the SCSI-3 ALUA settings. + .TP +-.B mpath_prio_netapp /dev/%n ++.B ontap + Generate the path priority for NetApp arrays. + .TP +-.B mpath_prio_rdac /dev/%n ++.B rdac + Generate the path priority for LSI/Engenio RDAC controller. + .TP +-.B mpath_prio_hp_sw /dev/%n ++.B hp_sw + Generate the path priority for Compaq/HP controller in + active/standby mode. + .TP +-.B mpath_prio_hds_modular %b ++.B hds + Generate the path priority for Hitachi HDS Modular storage arrays. + .TP ++.B random ++Generate a random priority between 1 and 10. ++.TP 12 ++.B weightedpath <hbtl|devname> <regex1> <prio1> <regex2> <prio2> ... ++.I hbtl ++regex can be in SCSI H:B:T:L format Ex: 1:0:.:. , *:0:0:. ++.I devname ++regex can be in device name format Ex: sda , sd.e ++Generate the path priority based on the regular expression and the ++priority provided as argument. ++.TP + Default value is \fBnone\fR. + .RE + .TP +@@ -165,7 +183,8 @@ + .RS + .TP 12 + .B readsector0 +-Read the first sector of the device ++(Deprecated) Read the first sector of the device. This checker is being ++deprecated, please use \fIdirectio\fR instead + .TP + .B tur + Issue a +@@ -185,7 +204,7 @@ + .B directio + Read the first sector with direct I/O. + .TP +-Default value is \fIreadsector0\fR. ++Default value is \fIdirectio\fR. + .RE + .TP + .B failback +@@ -318,6 +337,8 @@ + .TP + .B path_selector + .TP ++.B prio ++.TP + .B failback + .TP + .B no_path_retry +@@ -353,6 +374,16 @@ + .TP 12 + .B 1 emc + Hardware handler for EMC storage arrays. ++.TP ++.B 1 rdac ++Hardware handler for LSI/Engenio RDAC storage controller. ++.TP ++.B 1 hp_sw ++Hardware handler for Compaq/HP storage arrays in active/standby ++mode. ++.TP ++.B 1 alua ++Hardware handler for SCSI-3 ALUA compatible arrays. + .RE + .LP + The following attributes are optional; if not set the default values +@@ -371,6 +402,8 @@ + .TP + .B path_checker + .TP ++.B prio ++.TP + .B features + .TP + .B prio_callout +@@ -394,6 +427,20 @@ + It is advisable to use the + .B no_path_retry + option instead. ++.P ++The use of ++.B queue_if_no_path ++or ++.B no_path_retry ++might lead to a deadlock if the ++.B dev_loss_tmo ++setting results in a device being removed while I/O is still queued. ++The multipath daemon will update the ++.B dev_loss_tmo ++setting accordingly to avoid this deadlock. Hence if both values are ++specified the order of precedence is ++.I no_path_retry, queue_if_no_path, dev_loss_tmo ++ + .SH "SEE ALSO" + .BR udev (8), + .BR dmsetup (8) diff -Nru multipath-tools-0.4.8+git0.761c66f/debian/patches/series multipath-tools-0.4.8+git0.761c66f/debian/patches/series --- multipath-tools-0.4.8+git0.761c66f/debian/patches/series 2011-11-03 13:03:54.000000000 +0530 +++ multipath-tools-0.4.8+git0.761c66f/debian/patches/series 2011-11-03 12:57:19.000000000 +0530 @@ -9,3 +9,5 @@ 0009-explicitly-include-posix_types.h.patch 0010-Dots-are-special-in-groff.patch 0011-multipath-fix-offset-for-containted-slices.patch +0012-hp-hardware-handler.patch +0013-manpage-updates.patch
Attachment:
signature.asc
Description: OpenPGP digital signature