[prev in list] [next in list] [prev in thread] [next in thread]
List: grid-engine-cvs
Subject: CVS update: /gridengine/, /gridengine/source/dist/, /gridengine/source/dist/util/install_modules/
From: roland () sunsource ! net
Date: 2005-06-22 13:55:40
Message-ID: 20050622135540.23008.qmail () sunsource ! net
[Download RAW message or body]
User: roland
Date: 05/06/22 06:55:40
Modified:
/gridengine/
Changelog
/gridengine/source/dist/
inst_sge
/gridengine/source/dist/util/install_modules/
inst_common.sh, inst_execd_uninst.sh
Log:
RD-2005-06-21-2: Bugfix: several install script fixes
Bugtraq: 5063313, 5090187, 5056331, 6289240
Issue: 1084, 1248, 1149, 1249
Review: MD
File Changes:
Directory: /gridengine/
=======================
File [changed]: Changelog
Url: http://gridengine.sunsource.net/source/browse/gridengine/Changelog?r1=1.2884&r2=1.2885
Delta lines: +5 -0
-------------------
--- Changelog 22 Jun 2005 13:33:03 -0000 1.2884
+++ Changelog 22 Jun 2005 13:55:35 -0000 1.2885
@@ -1,3 +1,8 @@
+RD-2005-06-21-2: Bugfix: several install script fixes
+ Bugtraq: 5063313, 5090187, 5056331, 6289240
+ Issue: 1084, 1248, 1149, 1249
+ Review: MD
+
CR-2005-06-22-0: Enhancem.: - added received message queue for connection
handles (performance enhancement)
- code cleanup
Directory: /gridengine/source/dist/
===================================
File [changed]: inst_sge
Url: http://gridengine.sunsource.net/source/browse/gridengine/source/dist/inst_sge?r1=1.107&r2=1.108
Delta lines: +1 -1
-------------------
--- inst_sge 20 Jun 2005 12:25:10 -0000 1.107
+++ inst_sge 22 Jun 2005 13:55:36 -0000 1.108
@@ -533,7 +533,7 @@
if [ $BERKELEY = "uninstall" ]; then
if [ "$AUTO" = "true" ]; then
- $INFOTEXT -log "Starting berekey rpc uninstallation!"
+ $INFOTEXT -log "Starting berkeley rpc uninstallation!"
fi
if [ "$DB_SPOOLING_SERVER" = "" -o "$HOST" = "$DB_SPOOLING_SERVER" -o "$NOREMOTE" \
= "true" ]; then euid=`$SGE_UTILBIN/uidgid -euid`
Directory: /gridengine/source/dist/util/install_modules/
========================================================
File [changed]: inst_common.sh
Url: http://gridengine.sunsource.net/source/browse/gridengine/source/dist/util/install_modules/inst_common.sh?r1=1.66&r2=1.67
Delta lines: +35 -11
---------------------
--- inst_common.sh 20 Jun 2005 12:25:12 -0000 1.66
+++ inst_common.sh 22 Jun 2005 13:55:37 -0000 1.67
@@ -153,13 +153,19 @@
#
Makedir()
{
- file=$1
- if [ ! -d $file ]; then
- $INFOTEXT "creating directory: %s" "$file"
- ExecuteAsAdmin $MKDIR -p $1
+ dir=$1
+
+ if [ ! -d $dir ]; then
+ $INFOTEXT "creating directory: %s" "$dir"
+ if [ "`$SGE_UTILBIN/filestat -owner $SGE_ROOT`" != "$ADMINUSER" ]; then
+ Execute $MKDIR -p $dir
+ Execute $CHOWN $ADMINUSER $dir
+ else
+ ExecuteAsAdmin $MKDIR -p $dir
+ fi
fi
- ExecuteAsAdmin $CHMOD $DIRPERM $file
+ ExecuteAsAdmin $CHMOD $DIRPERM $dir
}
#-------------------------------------------------------------------------
@@ -626,8 +632,12 @@
$INFOTEXT -n "\nPlease enter a valid user name >> "
INP=`Enter ""`
if [ "$AUTO" = "true" ]; then
+ if [ "$ADMIN_USER" = "" ]; then
+ INP=`Enter root`
+ else
INP=`Enter $ADMIN_USER`
fi
+ fi
if [ "$INP" != "" ]; then
$SGE_UTILBIN/checkuser -check "$INP"
@@ -926,6 +936,8 @@
if [ -f $TMP_SGE_STARTUP_FILE ]; then
Execute rm $TMP_SGE_STARTUP_FILE
+ Execute touch $TMP_SGE_STARTUP_FILE
+ Execute $CHMOD a+r $TMP_SGE_STARTUP_FILE
fi
if [ -f ${TMP_SGE_STARTUP_FILE}.0 ]; then
Execute rm ${TMP_SGE_STARTUP_FILE}.0
@@ -1016,16 +1028,19 @@
TMP_SGE_STARTUP_FILE=/tmp/sgemaster.$$
STARTUP_FILE_NAME=sgemaster
S95NAME=S95sgemaster
+ K03NAME=K03sgemaster
DAEMON_NAME="qmaster/scheduler"
elif [ $hosttype = "bdb" ]; then
TMP_SGE_STARTUP_FILE=/tmp/sgebdb.$$
STARTUP_FILE_NAME=sgebdb
S95NAME=S94sgebdb
+ K03NAME=K02sgebdb
DAEMON_NAME="berkeleydb"
else
TMP_SGE_STARTUP_FILE=/tmp/sgeexecd.$$
STARTUP_FILE_NAME=sgeexecd
S95NAME=S96sgeexecd
+ K03NAME=K04sgeexecd
DAEMON_NAME="execd"
fi
@@ -1070,11 +1085,13 @@
# If we have System V we need to put the startup script to $RC_PREFIX/init.d
# and make a link in $RC_PREFIX/rc2.d to $RC_PREFIX/init.d
elif [ "$RC_FILE" = "sysv_rc" ]; then
- $INFOTEXT "Installing startup script %s" "$RC_PREFIX/$RC_DIR/$S95NAME"
+ $INFOTEXT "Installing startup script %s and %s" "$RC_PREFIX/$RC_DIR/$S95NAME" \
"$RC_PREFIX/$RC_DIR/$K03NAME" Execute rm -f $RC_PREFIX/$RC_DIR/$S95NAME
+ Execute rm -f $RC_PREFIX/$RC_DIR/$K03NAME
Execute cp $SGE_STARTUP_FILE $RC_PREFIX/init.d/$STARTUP_FILE_NAME
Execute chmod a+x $RC_PREFIX/init.d/$STARTUP_FILE_NAME
Execute ln -s $RC_PREFIX/init.d/$STARTUP_FILE_NAME $RC_PREFIX/$RC_DIR/$S95NAME
+ Execute ln -s $RC_PREFIX/init.d/$STARTUP_FILE_NAME $RC_PREFIX/$RC_DIR/$K03NAME
# runlevel management in Linux is different -
# each runlevel contains full set of links
@@ -1087,9 +1104,11 @@
lx2?-*)
runlevel=`grep "^id:.:initdefault:" /etc/inittab | cut -f2 -d:`
if [ "$runlevel" = 2 -o "$runlevel" = 5 ]; then
- $INFOTEXT "Installing startup script also in %s" \
"$RC_PREFIX/rc${runlevel}.d/$S95NAME" + $INFOTEXT "Installing startup \
script also in %s and %s" "$RC_PREFIX/rc${runlevel}.d/$S95NAME" \
"$RC_PREFIX/rc${runlevel}.d/$K03NAME" Execute rm -f \
$RC_PREFIX/rc${runlevel}.d/$S95NAME + Execute rm -f \
$RC_PREFIX/rc${runlevel}.d/$K03NAME
Execute ln -s $RC_PREFIX/init.d/$STARTUP_FILE_NAME \
$RC_PREFIX/rc${runlevel}.d/$S95NAME + Execute ln -s \
$RC_PREFIX/init.d/$STARTUP_FILE_NAME $RC_PREFIX/rc${runlevel}.d/$K03NAME fi
;;
esac
@@ -1104,7 +1123,7 @@
echo cp $SGE_STARTUP_FILE $RC_PREFIX/$STARTUP_FILE_NAME
echo /usr/sbin/update-rc.d $STARTUP_FILE_NAME
Execute cp $SGE_STARTUP_FILE $RC_PREFIX/$STARTUP_FILE_NAME
- /usr/sbin/update-rc.d $STARTUP_FILE_NAME defaults 95
+ /usr/sbin/update-rc.d $STARTUP_FILE_NAME defaults 95 03
elif [ "$RC_FILE" = "freebsd" ]; then
echo cp $SGE_STARTUP_FILE $RC_PREFIX/sge${RC_SUFFIX}
Execute cp $SGE_STARTUP_FILE $RC_PREFIX/sge${RC_SUFFIX}
@@ -1744,16 +1763,19 @@
TMP_SGE_STARTUP_FILE=/tmp/sgemaster.$$
STARTUP_FILE_NAME=sgemaster
S95NAME=S95sgemaster
+ K03NAME=K03sgemaster
DAEMON_NAME="qmaster/scheduler"
elif [ $hosttype = "bdb" ]; then
TMP_SGE_STARTUP_FILE=/tmp/sgebdb.$$
STARTUP_FILE_NAME=sgebdb
S95NAME=S94sgebdb
+ K03NAME=K04sgebdb
DAEMON_NAME="berkeleydb"
else
TMP_SGE_STARTUP_FILE=/tmp/sgeexecd.$$
STARTUP_FILE_NAME=sgeexecd
S95NAME=S96sgeexecd
+ K03NAME=K02sgeexecd
DAEMON_NAME="execd"
fi
@@ -1785,8 +1807,9 @@
# If we have System V we need to put the startup script to $RC_PREFIX/init.d
# and make a link in $RC_PREFIX/rc2.d to $RC_PREFIX/init.d
if [ "$RC_FILE" = "sysv_rc" ]; then
- $INFOTEXT "Removing startup script %s" "$RC_PREFIX/$RC_DIR/$S95NAME"
+ $INFOTEXT "Removing startup script %s and %s" "$RC_PREFIX/$RC_DIR/$S95NAME" \
"$RC_PREFIX/$RC_DIR/$K03NAME" Execute rm -f $RC_PREFIX/$RC_DIR/$S95NAME
+ Execute rm -f $RC_PREFIX/$RC_DIR/$K03NAME
Execute rm -f $RC_PREFIX/init.d/$STARTUP_FILE_NAME
# runlevel management in Linux is different -
@@ -1800,8 +1823,9 @@
lx2?-*)
runlevel=`grep "^id:.:initdefault:" /etc/inittab | cut -f2 -d:`
if [ "$runlevel" = 2 -o "$runlevel" = 5 ]; then
- $INFOTEXT "Removing startup script %s" \
"$RC_PREFIX/rc${runlevel}.d/$S95NAME" + $INFOTEXT "Removing startup script \
%s and %s" "$RC_PREFIX/rc${runlevel}.d/$S95NAME" \
"$RC_PREFIX/rc${runlevel}.d/$K03NAME" Execute rm -f \
$RC_PREFIX/rc${runlevel}.d/$S95NAME + Execute rm -f \
$RC_PREFIX/rc${runlevel}.d/$K03NAME fi
;;
esac
File [changed]: inst_execd_uninst.sh
Url: http://gridengine.sunsource.net/source/browse/gridengine/source/dist/util/install_modules/inst_execd_uninst.sh?r1=1.15&r2=1.16
Delta lines: +14 -11
---------------------
--- inst_execd_uninst.sh 17 Jun 2005 08:59:00 -0000 1.15
+++ inst_execd_uninst.sh 22 Jun 2005 13:55:37 -0000 1.16
@@ -82,8 +82,8 @@
SuspendJobs $h
RescheduleJobs $h
RemoveQueues $h
- RemoveReferences $h
RemoveSpoolDir $h
+ RemoveReferences $h
RemoveExecd $h
RemoveRcScript $h execd $euid
@@ -152,7 +152,7 @@
done
- for q in `qstat -F -l h=$exechost | grep qname | cut -d"=" -f2`; do
+ for q in `qstat -ne -F -l h=$exechost | grep qname | cut -d"=" -f2`; do
$INFOTEXT "There are still running jobs on %s!" $q
$INFOTEXT -log "There are still running jobs on %s!" $q
@@ -162,7 +162,7 @@
done
- for q in `qstat -F -l h=$exechost | grep qname | cut -d"=" -f2`; do
+ for q in `qstat -ne -F -l h=$exechost | grep qname | cut -d"=" -f2`; do
$INFOTEXT "There are still running jobs on %s!" $q
$INFOTEXT -log "There are still running jobs on %s!" $q
@@ -250,7 +250,9 @@
$INFOTEXT "Checking local spooldir configuration!\n"
SPOOL_DIR=`qconf -sconf $exechost | grep execd_spool_dir | awk '{ print $2 }'`
- `qconf -dconf $exechost`
+ qconf -dconf $exechost
+
+ if [ "$SPOOL_DIR" != "" ]; then
$INFOTEXT -n "For removing the local spool directory, the uninstall script has \
to\n" \
"login to the uninstalled execution host. Please enter the shell \
name\n" \ @@ -261,4 +263,5 @@
$INFOTEXT "Removing local spool directory [%s]" "$SPOOL_DIR"
echo "rm -R $SPOOL_DIR/$HOST_DIR" | $SHELL_NAME $exechost /bin/sh
echo "rm -fR $SPOOL_DIR" | $SHELL_NAME $exechost /bin/sh
+ fi
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic