commit multipath-tools

3 May 2006

Hello community,

here is the log from the commit of package multipath-tools
checked in at Wed May 3 13:04:14 CEST 2006.

--------

--- multipath-tools/multipath-tools.changes	2006-04-10 09:49:07.000000000 +0200
+++ STABLE/multipath-tools/multipath-tools.changes	2006-05-02 14:39:51.000000000 +0200
@@ -1,0 +2,10 @@
+Tue May  2 12:48:56 CEST 2006 - hare@suse.de
+
+- Merge in fixes from upstream
+  - Merged local patches
+  - Added hds_modular prioritizer
+- Remove merged patches
+- Allow for setting of maximum number of open files (#149979)
+- Implement 'stop' for init scripts
+
+-------------------------------------------------------------------

Old:
----
  multipath-tools-Makefile-cleanup.patch
  multipath-tools-compile-fixes.patch
  multipath-tools-shark-update

New:
----
  multipath-tools-remove-obsolete-option-from-manpage

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ multipath-tools.spec ++++++
--- /var/tmp/diff_new_pack.uHmXTH/_old	2006-05-03 13:02:44.000000000 +0200
+++ /var/tmp/diff_new_pack.uHmXTH/_new	2006-05-03 13:02:44.000000000 +0200
@@ -20,7 +20,7 @@
 %endif
 Autoreqprov:    on
 Version:        0.4.6
-Release:        18
+Release:        23
 Summary:        Tools to Manage Multipathed Devices with the device-mapper
 Source:         multipath-tools-%{version}.tar.bz2
 Source1:        multipathd
@@ -29,15 +29,13 @@
 Source5:        mpath_id
 Source6:        kpartx_del
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Patch0:         multipath-tools-git-update.patch
-Patch1:         multipath-tools-shark-update
-Patch2:         multipath-tools-Makefile-cleanup.patch
-Patch3:         multipath-tools-compile-fixes.patch
-Patch4:         multipath-tools-ibm-3526-update
-Patch5:         multipath-tools-pp_tpc-disable-debug-output.patch
-Patch10:        multipath-tools-online-device.patch
-Patch11:        multipath-tools-no-gz-for-manpage
+Patch0:         %{name}-git-update.patch
+Patch4:         %{name}-ibm-3526-update
+Patch5:         %{name}-pp_tpc-disable-debug-output.patch
+Patch10:        %{name}-online-device.patch
+Patch11:        %{name}-no-gz-for-manpage
 Patch12:        %{name}-split-off-DS6000
+Patch13:        %{name}-remove-obsolete-option-from-manpage
 
 %description
 This package provides the tools to manage multipathed devices by
@@ -64,13 +62,11 @@
 %prep
 %setup -n multipath-tools-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 make OPTFLAGS="$RPM_OPT_FLAGS" BUILD=glibc
@@ -116,6 +112,7 @@
 /sbin/mpath_prio_alua
 /sbin/mpath_prio_emc
 /sbin/mpath_prio_tpc
+/sbin/mpath_prio_hds_modular
 %attr (0700, root, root) /var/cache/multipath
 %{_mandir}/man8/devmap_name.8*
 %{_mandir}/man8/multipath.8*
@@ -124,6 +121,13 @@
 %{_mandir}/man8/mpath_prio_alua.8*
 
 %changelog -n multipath-tools
+* Tue May 02 2006 - hare@suse.de
+- Merge in fixes from upstream
+- Merged local patches
+- Added hds_modular prioritizer
+- Remove merged patches
+- Allow for setting of maximum number of open files (#149979)
+- Implement 'stop' for init scripts
 * Mon Apr 10 2006 - hare@suse.de
 - Lowering priority for pp_tpc
 - Split off DS6000 to fixup priority handler (#161347)


++++++ boot.multipath ++++++
--- multipath-tools/boot.multipath	2006-03-29 09:22:20.000000000 +0200
+++ STABLE/multipath-tools/boot.multipath	2006-05-02 14:38:34.000000000 +0200
@@ -17,6 +17,9 @@
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PROGRAM=/sbin/multipath
 
+# Set the maximum number of open files
+MAX_OPEN_FDS=4096
+
 test -x $PROGRAM || exit 5
 
 # Shell functions sourced from /etc/rc.status:
@@ -50,22 +53,19 @@
 case "$1" in
     start)
 	echo -n "Creating multipath targets"
-	# Check whether we should rescan for devices
-	if grep -q multipath /proc/cmdline && test -d /sys/class/scsi_host; then
-	    pushd /sys/class/scsi_host 2> /dev/null
-	    for host in *; do
-		if [ -d $host ]; then
-		    echo "- - -" > $host/scan
-		fi
-	    done
-	fi
+
 	# Load prerequisite module
 	modprobe dm-multipath
 	
 	# Clear /dev/disk/by-name/ prior to start-up; multipath will
 	# recreate them.
 	rm -f /dev/disk/by-name/* 2>&1 >/dev/null
-	
+
+	# Set the maximum number of open files
+	if [ -n "$MAX_OPEN_FDS" ] ; then
+	    ulimit -n $MAX_OPEN_FDS
+	fi
+
 	# Start the program directly as checkproc doesn't work here
 	$PROGRAM -v 0
 
@@ -77,6 +77,15 @@
 	sleep 1
 	;;
     stop)
+	# Remove all partition mappings
+	if dmsetup ls | grep -q -- -part; then
+	    /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -d -p -part"
+	fi
+
+	# And remove the multipath mappings themselves
+	for map in $(/sbin/dmsetup ls --target multipath | cut -f 1); do
+	    /sbin/dmsetup remove $map
+	done
 	;;
     *)
 	echo "Usage: $0 {start|stop}"



++++++ multipath-tools-git-update.patch ++++++
++++    3102 lines (skipped)
++++ between multipath-tools/multipath-tools-git-update.patch
++++ and STABLE/multipath-tools/multipath-tools-git-update.patch

++++++ multipath-tools-ibm-3526-update ++++++
--- multipath-tools/multipath-tools-ibm-3526-update	2006-03-22 13:55:48.000000000 +0100
+++ STABLE/multipath-tools/multipath-tools-ibm-3526-update	2006-05-02 12:47:01.000000000 +0200
@@ -1,12 +1,24 @@
+Subject: [PATCH] hwtable: add IBM 3526
+
+Adding support for IBM Netfinity FC RAID controller.
+
+Signed-off-by: Hannes Reinecke <hare@suse.de>
+
+---
+
+ libmultipath/hwtable.c |   16 ++++++++++++++++
+ 1 files changed, 16 insertions(+), 0 deletions(-)
+
+807fdf4dc06ee4be11620b11ce0be3630a598d57
 diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
-index 008e518..3966fea 100644
+index b991689..50cd4c7 100644
 --- a/libmultipath/hwtable.c
 +++ b/libmultipath/hwtable.c
 @@ -236,6 +236,22 @@ static struct hwentry default_hw[] = {
  		.checker_name  = TUR,
  	},
  	{
-+		/* IBM EXT300 ? */
++		/* IBM Netfinity Fibre Channel RAID Controller Unit */
 +		.vendor        = "IBM",
 +		.product       = "3526",
 +		.getuid        = DEFAULT_GETUID,
@@ -25,3 +37,5 @@
  		/* IBM DS4200 / FAStT200 */
  		.vendor        = "IBM",
  		.product       = "3542",
+-- 
+1.1.3

++++++ multipath-tools-no-gz-for-manpage ++++++
--- multipath-tools/multipath-tools-no-gz-for-manpage	2006-03-13 13:00:13.000000000 +0100
+++ STABLE/multipath-tools/multipath-tools-no-gz-for-manpage	2006-05-02 11:47:12.000000000 +0200
@@ -1,20 +1,3 @@
-Subject: [PATCH] Do not install manpages as .gz
-
-SuSE autobuild does not allow to install compressed manpages.
-We should rather install manpages uncompress and let rpm handle this.
-
-Signed-off-by: Hannes Reinecke <hare@suse.de>
-
----
-
- devmap_name/Makefile           |    6 ++----
- kpartx/Makefile                |    6 ++----
- multipath/Makefile             |    6 ++----
- multipathd/Makefile            |    5 ++---
- path_priority/pp_alua/Makefile |    9 +++------
- 5 files changed, 11 insertions(+), 21 deletions(-)
-
-c0ffc402463433d485691abf356225e9ad0ec361
 diff --git a/devmap_name/Makefile b/devmap_name/Makefile
 index 380c85b..5551c9b 100644
 --- a/devmap_name/Makefile
@@ -155,5 +138,3 @@
  main.o:	main.c rtpg.h spc3.h
  
  rtpg.o:	rtpg.c rtpg.h spc3.h
--- 
-1.1.3

++++++ multipath-tools-split-off-DS6000 ++++++
--- multipath-tools/multipath-tools-split-off-DS6000	2006-04-10 09:47:35.000000000 +0200
+++ STABLE/multipath-tools/multipath-tools-split-off-DS6000	2006-05-02 11:46:14.000000000 +0200
@@ -1,15 +1,34 @@
 diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
-index 008e518..39274bd 100644
+index c9cf33c..b991689 100644
 --- a/libmultipath/hwtable.c
 +++ b/libmultipath/hwtable.c
-@@ -268,9 +268,25 @@ static struct hwentry default_hw[] = {
+@@ -254,7 +254,7 @@ static struct hwentry default_hw[] = {
+ 	{
+ 		/* IBM ESS F20 aka Shark */
+ 		.vendor        = "IBM",
+-		.product       = "2105{800,F20}",
++		.product       = "2105(800|F20)",
+ 		.getuid        = DEFAULT_GETUID,
+ 		.getprio       = NULL,
+ 		.features      = "1 queue_if_no_path",
+@@ -268,9 +268,9 @@ static struct hwentry default_hw[] = {
  		.checker_name  = TUR,
  	},
  	{
 -		/* IBM DS6000 / SAN Volume Controller */
-+		/* IBM SAN Volume Controller */
++		/* IBM DS6000 */
  		.vendor        = "IBM",
 -		.product       = "{1750500,2145}",
++		.product       = "1750500",
+ 		.getuid        = DEFAULT_GETUID,
+ 		.getprio       = "/sbin/mpath_prio_alua /dev/%n",
+ 		.features      = "1 queue_if_no_path",
+@@ -300,6 +300,22 @@ static struct hwentry default_hw[] = {
+ 		.checker_name  = TUR,
+ 	},
+ 	{
++		/* IBM SAN Volume Controller */
++		.vendor        = "IBM",
 +		.product       = "2145",
 +		.getuid        = DEFAULT_GETUID,
 +		.getprio       = "/sbin/mpath_prio_alua /dev/%n",
@@ -24,9 +43,6 @@
 +		.checker_name  = TUR,
 +	},
 +	{
-+		/* IBM DS6000  */
-+		.vendor        = "IBM",
-+		.product       = "1750500",
- 		.getuid        = DEFAULT_GETUID,
- 		.getprio       = "/sbin/mpath_prio_alua /dev/%n",
- 		.features      = "1 queue_if_no_path",
+ 		/* IBM S/390 ECKD DASD */
+ 		.vendor        = "IBM",
+ 		.product       = "S/390 DASD ECKD",

++++++ multipathd ++++++
--- multipath-tools/multipathd	2005-05-12 12:14:57.000000000 +0200
+++ STABLE/multipath-tools/multipathd	2006-05-02 14:27:14.000000000 +0200
@@ -22,6 +22,9 @@
 DAEMON=/sbin/multipathd
 PIDFILE=/var/run/multipathd.pid
 
+# Set the maximum number of open files
+MAX_OPEN_FDS=4096
+
 test -x $DAEMON || exit 5
 
 # Shell functions sourced from /etc/rc.status:
@@ -58,6 +61,11 @@
 
 	modprobe dm-multipath
 
+	# Set the maximum number of open files
+	if [ -n "$MAX_OPEN_FDS" ] ; then
+	    ulimit -n $MAX_OPEN_FDS
+	fi
+
 	if [ -f $PIDFILE ]; then
 		PID="$(cat $PIDFILE)"
 		PROCNAME="$(ps -o cmd --no-headers $PID)"


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)