rpms/gridengine/devel gridengine.spec,1.4,1.5 sgemaster,1.1,1.2

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/gridengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20243

Modified Files:
	gridengine.spec sgemaster 
Log Message:
* Fri Sep 26 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2-2
- No more sge_schedd in 6.2, remove from startup script



Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gridengine.spec	11 Aug 2008 16:41:50 -0000	1.4
+++ gridengine.spec	26 Sep 2008 19:40:32 -0000	1.5
@@ -6,7 +6,7 @@
 
 Name:    gridengine
 Version: 6.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Grid Engine - Distributed Computing Management software
 
 Group:   Applications/System
@@ -495,6 +495,9 @@
 
 
 %changelog
+* Fri Sep 26 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2-2
+- No more sge_schedd in 6.2, remove from startup script
+
 * Mon Aug 11 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2-1
 - Update to 6.2 final
 


Index: sgemaster
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/sgemaster,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sgemaster	8 Feb 2008 21:57:24 -0000	1.1
+++ sgemaster	26 Sep 2008 19:40:32 -0000	1.2
@@ -6,7 +6,7 @@
 # description: The gridengine master daemon and scheduler
 
 ### BEGIN INIT INFO
-# Provides: sge_qmaster sge_schedd
+# Provides: sge_qmaster
 # Required-Start: $network $local_fs $remote_fs
 # Required-Stop: $network $local_fs $remote_fs
 # Should-Start: 
@@ -22,13 +22,10 @@
 
 master_exec="/usr/bin/sge_qmaster"
 master_prog="sge_qmaster"
-schedd_exec="/usr/bin/sge_schedd"
-schedd_prog="sge_schedd"
 SGE_ROOT=/usr/share/gridengine; export SGE_ROOT
 SGE_CELL=default; export SGE_CELL
 qmaster_spool_dir=`awk '$1 == "qmaster_spool_dir" { print $2 }' $SGE_ROOT/$SGE_CELL/common/bootstrap`
 master_pidfile=$qmaster_spool_dir/qmaster.pid
-schedd_pidfile=$qmaster_spool_dir/schedd/schedd.pid
 
 #---------------------------------------------------------------------------
 # CheckIfQmasterHost
@@ -153,11 +150,11 @@
 {
    echo "Grid Engine start/stop script. Valid parameters are:"
    echo ""
-   echo "   \"start\"        start qmaster and schedd daemon if applicable"
-   echo "   \"stop\"         shutdown qmaster and schedd daemon if applicable"
-   echo "   \"-qmaster\"     only start/stop qmaster and scheduler (if applicable)"
+   echo "   \"start\"        start qmaster daemon"
+   echo "   \"stop\"         shutdown qmaster daemon"
+   echo "   \"-qmaster\"     only start/stop qmaster (if applicable)"
    echo "   \"-shadowd\"     only start/stop shadowd (if applicable)"   
-   echo "   \"-migrate\"     shutdown qmaster/scheduler if it's running on another"
+   echo "   \"-migrate\"     shutdown qmaster if it's running on another"
    echo "                    host and restart it on this host"
    echo "                    Migration only works if this host is an admin host"
    echo ""
@@ -217,7 +214,6 @@
     fi
 
     [ -x $master_exec ] || exit 5
-    [ -x $schedd_exec ] || exit 5
 
     if [ $qmaster = true -a $qmaster_host = false -a  \
          \( $primary_qmaster_host = true -o $migrate_qmaster = true \) ]; then
@@ -278,10 +274,6 @@
         daemon --check $master_prog --pidfile=$master_pidfile $master_exec
         retval=$?
         CheckRunningQmaster
-        echo
-        echo -n $"Starting $schedd_prog: "
-        daemon --check $schedd_prog --pidfile=$schedd_pidfile $schedd_exec
-        retval=`expr $retval + $?`
     elif [ $qmaster = true -a $qmaster_host = false ]; then
         echo
         echo "sge_qmaster didn't start!"
@@ -318,12 +310,6 @@
 
     if [ $qmaster = true ]; then
         if [ `CheckIfQmasterHost $HOST` = true ]; then
-            # Send SIGTERM to scheduler
-            echo -n $"Stopping $schedd_prog: "
-            killproc -p $schedd_pidfile $schedd_prog
-            retval=$?
-            echo
-
             # Send SIGTERM to qmaster
             echo -n $"Stopping $master_prog: "
             killproc -p $master_pidfile $master_prog
@@ -352,7 +338,6 @@
 rh_status() {
     # run checks to determine if the service is running or use generic status
     status $master_prog
-    status $schedd_prog
 }
 
 rh_status_q() {