[gentoo-commits] gentoo-x86 commit in sys-fs/clvm/files: clvmd.rc cluster-locking-built-in.patch

[Christian Zoffoli (xmerlin)]

xmerlin     08/03/29 15:42:28

  Modified:             clvmd.rc
  Added:                cluster-locking-built-in.patch
  Log:
  Added locking patch and fixed patching.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.4                  sys-fs/clvm/files/clvmd.rc

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/clvmd.rc?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/clvmd.rc?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/clvmd.rc?r1=1.3&r2=1.4

Index: clvmd.rc
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/clvmd.rc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- clvmd.rc	17 May 2006 18:19:05 -0000	1.3
+++ clvmd.rc	29 Mar 2008 15:42:28 -0000	1.4
@@ -1,16 +1,20 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/clvmd.rc,v 1.3 2006/05/17 18:19:05 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/clvm/files/clvmd.rc,v 1.4 2008/03/29 15:42:28 xmerlin Exp $
+
+CLVM_BIN="/sbin/clvmd"
+VGCHANGE="/sbin/vgchange"
+VGSCAN="/sbin/vgscan"
+VGDISPLAY="/sbin/vgdisplay"
 
 depend() {
 	use dns logger
 	use net
-	need cluster-manager cluster-locking-manager fenced
+	need cman
+	before gfs
 }
 
-exefile=/sbin/clvmd
-
 load_modules() {
 	local module modules
 	modules=$1
@@ -63,84 +67,75 @@
 	fi
 }
 
-
-
 start() {
 
-	local module=$(awk '$1 == "dm_mod" { print $1 }' /proc/modules)
+	local module=$(awk '$1 == "dm_mod" { print $1 }' /proc/{modules,devices})
+
 	if [ -z "${module}" ]; then
-		load_modules dm-mod
+		load_modules "dm-mod"
 		sleep 1s
 	fi
 
 	ebegin "Starting clvmd"
-	start-stop-daemon --start --quiet --exec ${exefile}
+	start-stop-daemon --start --quiet --exec ${CLVM_BIN}
 	eend $?
 
 	ebegin "Scanning LVM volumes"
-	/sbin/vgscan &>/dev/null
+	${VGSCAN} &>/dev/null
 	eend $?
 	
-	if [ "$?" -eq 0 ] && [ -x /sbin/vgchange ] && [ -f /etc/lvmtab -o -d /etc/lvm ]
+	#if [ "$?" -eq 0 ] && [ -x /sbin/vgchange ] && [ -f /etc/lvmtab -o -d /etc/lvm ]
+	#then
+	#	ebegin "Setting up the Logical Volume Manager"
+	#	/sbin/vgchange -aly >/dev/null
+	#	eend $? "Failed to setup the LVM"
+	#fi
+
+	if [ -n "$LVM_VGS" ]
 	then
-		ebegin "Setting up the Logical Volume Manager"
-		/sbin/vgchange -aly >/dev/null
-		eend $? "Failed to setup the LVM"
+		for vg in $LVM_VGS
+		do
+			ebegin "  Activating VG: ${vg} "
+                        $VGCHANGE -ayl ${vg} >/dev/null
+                        eend $?
+		done
+	else
+		clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'`
+		for vg in $clustervgs; do
+			ebegin "  Activating Clustered VG: ${vg} "
+			$VGCHANGE -ayl ${vg} >/dev/null
+			eend $?
+		done
 	fi
-	
 }
 
 stop() {
-
 	# umount GFS filesystems
 	umount_gfs_filesystems
-	
-	einfo "Shutting down the Logical Volume Manager"
 
-	LOGICAL_VOLUMES=`lvdisplay |grep "LV Name"|awk '{print $3}'|sort|xargs echo`
-	VOLUME_GROUPS=`vgdisplay |grep "VG Name"|awk '{print $3}'|sort|xargs echo`
-	for x in ${LOGICAL_VOLUMES}
-	do
-		LV_IS_ACTIVE=`lvdisplay ${x}|grep "# open"|awk '{print $3}'`
-		if [ "${LV_IS_ACTIVE}" = 0 ]
-		then
-			ebegin "  Shutting Down logical volume: ${x} "
-			lvchange -an --ignorelockingfailure -P ${x} >/dev/null
-			eend $?
-		fi
-	done
+	sleep 2	
 
-	for x in ${VOLUME_GROUPS}
-	do
-		VG_HAS_ACTIVE_LV=`vgdisplay ${x}|grep "Open LV"|awk '{print $3}'|xargs echo`
-		if [ "${VG_HAS_ACTIVE_LV}" = 0 ]
-		then
-			ebegin "  Shutting Down volume group: ${x} "
-			vgchange -an --ignorelockingfailure -P ${x} >/dev/null
-			eend
-		fi
-	done
-
-	for x in ${LOGICAL_VOLUMES}
-	do
-		LV_IS_ACTIVE=`lvdisplay ${x}|grep "# open"|awk '{print $3}'`
-		if [ "${LV_IS_ACTIVE}" = 1 ]
-		then
-			
-			ROOT_DEVICE=`mount|grep " / "|awk '{print $1}'`
-			if [ ! ${ROOT_DEVICE} = ${x} ]
-			then
-				ewarn "  Unable to shutdown: ${x} "
-			fi
-		fi
-	done
-	einfo "Finished Shutting down the Logical Volume Manager"	
+	if [ -n "$LVM_VGS" ]
+	then
+		for vg in $LVM_VGS
+		do
+			ebegin "  Shutting Down VG: ${vg} "
+			$VGCHANGE -anl ${vg} >/dev/null
+			eend $?
+		done
+	else
+		# Deactivate only clustered volumes
+		clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'`
+		for vg in $clustervgs; do
+			ebegin "  Shutting Down Clustered VG: ${vg} "
+			$VGCHANGE -anl ${vg} >/dev/null
+			eend $?
+		done
+	fi
 
 	ebegin "Stopping clvmd"
-	start-stop-daemon --stop --quiet --exec ${exefile}
+	#start-stop-daemon --stop -s 9 --quiet --exec ${CLVM_BIN} --name clvmd
+	killall -TERM ${CLVM_BIN} >/dev/null
 	eend $?
-	
-	if [ "$?" -eq 0 ]; then
-		unload_modules dm-mod
-	fi
+
 }



1.1                  sys-fs/clvm/files/cluster-locking-built-in.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/cluster-locking-built-in.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/clvm/files/cluster-locking-built-in.patch?rev=1.1&content-type=text/plain

Index: cluster-locking-built-in.patch
===================================================================
--- LVM2.2.02.12-old/scripts/lvmconf.sh	2006-09-20 18:36:47.000000000 +0100
+++ LVM2.2.02.12/scripts/lvmconf.sh	2006-10-20 19:20:26.000000000 +0100
@@ -36,7 +36,7 @@ function parse_args
     while [ -n "$1" ]; do
         case $1 in
             --enable-cluster)
-                LOCKING_TYPE=2
+                LOCKING_TYPE=3
                 shift
                 ;;
             --disable-cluster)
@@ -94,15 +94,13 @@ function validate_args
 
     if [ -n "$LOCKINGLIBDIR" ]; then
 
-        [ -z "$LOCKINGLIB" ] && LOCKINGLIB="liblvm2clusterlock.so"
-            
         if [ "${LOCKINGLIBDIR:0:1}" != "/" ]
             then
             echo "Prefix must be an absolute path name (starting with a /)"
             exit 12
         fi
     
-        if [ ! -f "$LOCKINGLIBDIR/$LOCKINGLIB" ]
+        if [ -n "$LOCKINGLIB" ] && [ ! -f "$LOCKINGLIBDIR/$LOCKINGLIB" ]
             then
             echo "$LOCKINGLIBDIR/$LOCKINGLIB does not exist, did you do a \"make install\" ?"
             exit 11
@@ -170,13 +168,29 @@ then
     if [ -z "$LOCKING_TYPE" ]; then
 	LOCKING_TYPE=1
     fi
-    if [ "$LOCKING_TYPE" = "2" ]; then
+    if [ "$LOCKING_TYPE" = "3" ] || [ "$LOCKING_TYPE" = "2" ]; then
         cat $CONFIGFILE - <<EOF > $TMPFILE
 global {
     # Enable locking for cluster LVM
     locking_type = $LOCKING_TYPE
     library_dir = "$LOCKINGLIBDIR"
+EOF
+        if [ $? != 0 ]
+        then
+    	    echo "failed to create temporary config file, $CONFIGFILE not updated"
+	    exit 14
+        fi
+	if [ -n "$LOCKINGLIB" ]; then
+	    cat - <<EOF >> $TMPFILE
     locking_library = "$LOCKINGLIB"
+EOF
+            if [ $? != 0 ]
+            then
+	        echo "failed to create temporary config file, $CONFIGFILE not updated"
+	        exit 16
+            fi
+	fi
+	cat - <<EOF >> $TMPFILE
 }
 EOF
     fi # if we aren't setting cluster locking, we don't need to create a global section
@@ -184,7 +198,7 @@ EOF
     if [ $? != 0 ]
     then
 	echo "failed to create temporary config file, $CONFIGFILE not updated"
-	exit 14
+	exit 17
     fi
 else
     #
@@ -208,8 +222,10 @@ else
         else
             SEDCMD="${SEDCMD}\n/global[[:blank:]]*{/a\ \ \ \ library_dir = \"$LOCKINGLIBDIR\""
         fi
+    fi
 
-        if [ "$have_library" = "0" ] 
+    if [ -n "$LOCKINGLIB" ]; then
+        if [ "$have_library" = "0" ]
             then
             SEDCMD="${SEDCMD}\ns/^[[:blank:]]*locking_library[[:blank:]]*=.*/\ \ \ \ locking_library = \"$LOCKINGLIB\"/g"
         else
@@ -217,19 +233,6 @@ else
         fi
     fi
 
-    if [ "$LOCKING_TYPE" = "1" ]; then
-        # if we're not using cluster locking, remove the library dir and locking library name
-        if [ "$have_dir" = "0" ] 
-            then
-            SEDCMD="${SEDCMD}\n/^[[:blank:]]*library_dir[[:blank:]]*=.*/d"
-        fi
-
-        if [ "$have_library" = "0" ] 
-            then
-            SEDCMD="${SEDCMD}\n/^[[:blank:]]*locking_library[[:blank:]]*=.*/d"
-        fi
-    fi
-
     echo -e $SEDCMD > $SCRIPTFILE
     sed  <$CONFIGFILE >$TMPFILE -f $SCRIPTFILE
     if [ $? != 0 ]



-- 
gentoo-commits@l.g.o mailing list