[gridengine/f14/master] - Update instructions to referece ./my_configuration.conf (bug #557628) - Don't set IFS when reading
Orion Poplawski
orion at fedoraproject.org
Wed Aug 25 19:48:16 UTC 2010
commit 12417aacd53610831f9b28670733940370f7ff2f
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Wed Aug 25 12:10:07 2010 -0600
- Update instructions to referece ./my_configuration.conf (bug #557628)
- Don't set IFS when reading conf file, breaks lots of stuff
- Set SGE_JVM_LIB_PATH to none by default so we don't setup JMF
README | 2 +-
conf_defaults | 2 +-
gridengine-6.2u5-rctemplates.patch | 97 ++++++++++++++++++++++++-----------
gridengine.spec | 7 ++-
4 files changed, 74 insertions(+), 34 deletions(-)
---
diff --git a/README b/README
index 282a299..24d7edf 100644
--- a/README
+++ b/README
@@ -19,7 +19,7 @@ OR
edit my_configuration.conf to make any needed changes and run:
- ./install_qmaster -auto my_configuration.conf
+ ./install_qmaster -auto ./my_configuration.conf
3) Make sure the files act_qmaster, bootstrap, and settings.*sh from the
directory /usr/share/gridengine/default/common/ are shared to all clients.
diff --git a/conf_defaults b/conf_defaults
index 20ed98f..b0f48f7 100644
--- a/conf_defaults
+++ b/conf_defaults
@@ -2,7 +2,7 @@ SGE_ROOT="/usr/share/gridengine"
SGE_QMASTER_PORT=6444
SGE_EXECD_PORT=6445
SGE_CLUSTER_NAME="p6444"
-SGE_JVM_LIB_PATH=""
+SGE_JVM_LIB_PATH="none"
QMASTER_SPOOL_DIR="/var/spool/gridengine/default/qmaster"
EXECD_SPOOL_DIR="/var/spool/gridengine"
GID_RANGE="16000-16100"
diff --git a/gridengine-6.2u5-rctemplates.patch b/gridengine-6.2u5-rctemplates.patch
index 82d0f99..312433c 100644
--- a/gridengine-6.2u5-rctemplates.patch
+++ b/gridengine-6.2u5-rctemplates.patch
@@ -1,6 +1,7 @@
+diff -up gridengine/source/dist/inst_sge.rctemplates gridengine/source/dist/inst_sge
--- gridengine/source/dist/inst_sge.rctemplates 2009-12-07 10:11:51.000000000 -0700
-+++ gridengine/source/dist/inst_sge 2009-12-28 15:11:42.372471748 -0700
-@@ -695,8 +695,7 @@
++++ gridengine/source/dist/inst_sge 2010-08-25 11:56:12.828867053 -0600
+@@ -695,8 +696,7 @@ if [ "$UPDATE" = true ]; then
AddJMXFiles
fi
RestoreSequenceNumberFiles $QMDIR #Restore jobseqnum and arseqnum
@@ -10,7 +11,7 @@
CreateSettingsFile
InitCA
SetupRcScriptNames master #New qmaster RC script/SMF
-@@ -860,7 +859,6 @@
+@@ -860,7 +860,6 @@ if [ "$BERKELEY" = "install" ]; then
Makedir $COMMONDIR
ProcessSGEClusterName "bdb"
SetSpoolingOptions
@@ -18,7 +19,7 @@
PrepareRPCServerStart
GiveBerkelyHints
else
-@@ -912,11 +910,9 @@
+@@ -912,11 +911,9 @@ if [ "$QMASTER" = "install" -a "$UPDATE"
AddDefaultUsersets
AddCommonFiles
AddJMXFiles
@@ -31,7 +32,7 @@
StartQmaster
AddWindowsAdmin
AddHosts
-@@ -1084,7 +1080,6 @@
+@@ -1084,7 +1081,6 @@ if [ "$EXECD" = "install" -a "$UPDATE" !
GetLocalExecdSpoolDir
AddLocalConfiguration_With_Qconf
AddSubmitHostsExecd
@@ -39,7 +40,7 @@
SetupWinSvc execinst #service install during execd installation -> param: execinst
CopyIBMLoadSensor
StartExecd
-@@ -1120,7 +1115,6 @@
+@@ -1120,7 +1116,6 @@ if [ "$EXECD" = "install" -a "$UPDATE" !
CheckHostNameResolving install
GetLocalExecdSpoolDir
AddLocalConfiguration_With_Qconf
@@ -47,7 +48,7 @@
SetupWinSvc execinst #service install during execd installation -> param: execinst
CopyIBMLoadSensor
StartExecd
-@@ -1437,7 +1431,6 @@
+@@ -1437,7 +1432,6 @@ if [ $SHADOW = "install" ]; then
if [ $SHADOW_HOST = `$SGE_UTILBIN/gethostname -aname` ]; then
. $SGE_ROOT/$SGE_CELL/common/settings.sh
SGE_ARCH=`$SGE_ROOT/util/arch`
@@ -55,7 +56,7 @@
$INFOTEXT "Starting sge_shadowd on host %s\n" $SHADOW_HOST
$INFOTEXT -log "Starting sge_shadowd on host %s\n" $SHADOW_HOST
if [ "$SGE_ENABLE_SMF" = "true" ]; then
-@@ -1683,20 +1676,7 @@
+@@ -1683,20 +1677,7 @@ if [ $MAKE_RC = "true" ]; then
COMMONDIR=$SGE_CELL/common
@@ -77,9 +78,10 @@
fi
exit 0
+diff -up gridengine/source/dist/util/create_settings.sh.rctemplates gridengine/source/dist/util/create_settings.sh
--- gridengine/source/dist/util/create_settings.sh.rctemplates 2008-02-08 04:57:29.000000000 -0700
-+++ gridengine/source/dist/util/create_settings.sh 2009-12-28 15:11:42.373471069 -0700
-@@ -67,8 +67,6 @@
++++ gridengine/source/dist/util/create_settings.sh 2010-08-25 11:56:12.662804900 -0600
+@@ -67,8 +67,6 @@ SP_SH=$1/settings.sh
echo "setenv SGE_ROOT $SGE_ROOT" > $SP_CSH
echo "" >> $SP_CSH
echo "set ARCH = \`\$SGE_ROOT/util/arch\`" >> $SP_CSH
@@ -88,7 +90,7 @@
echo "" >> $SP_CSH
#if [ "$SGE_CELL" != "" -a "$SGE_CELL" != "default" ]; then
-@@ -93,31 +91,9 @@
+@@ -93,31 +91,9 @@ fi
echo "" >> $SP_CSH
@@ -121,7 +123,7 @@
#
# bourne shell settings file
-@@ -126,8 +102,6 @@
+@@ -126,8 +102,6 @@ echo "unset ARCH DEFAULTMANPATH MANTYPE"
echo "SGE_ROOT=$SGE_ROOT; export SGE_ROOT" > $SP_SH
echo "" >> $SP_SH
echo "ARCH=\`\$SGE_ROOT/util/arch\`" >> $SP_SH
@@ -130,7 +132,7 @@
echo "" >> $SP_SH
if [ "$SGE_CELL" != "" ]; then
-@@ -151,28 +125,7 @@
+@@ -151,28 +125,7 @@ fi
echo "" >> $SP_SH
@@ -160,9 +162,39 @@
-echo "unset ARCH DEFAULTMANPATH MANTYPE" >> $SP_SH
+echo "unset ARCH" >> $SP_SH
---- gridengine/source/dist/util/install_modules/inst_common.sh.rctemplates 2009-12-28 15:11:42.365471215 -0700
-+++ gridengine/source/dist/util/install_modules/inst_common.sh 2009-12-28 15:11:42.376471408 -0700
-@@ -2367,14 +2367,6 @@
+diff -up gridengine/source/dist/util/install_modules/inst_common.sh.rctemplates gridengine/source/dist/util/install_modules/inst_common.sh
+--- gridengine/source/dist/util/install_modules/inst_common.sh.rctemplates 2010-08-25 11:56:12.639807647 -0600
++++ gridengine/source/dist/util/install_modules/inst_common.sh 2010-08-25 11:56:42.315866389 -0600
+@@ -570,19 +570,16 @@ ErrUsage()
+ #
+ GetConfigFromFile()
+ {
+- SGE_ENABLE_SMF_LAST=$SGE_ENABLE_SMF
+- SGE_ENABLE_SMF=""
++ SGE_ENABLE_SMF_LAST=$SGE_ENABLE_SMF
++ SGE_ENABLE_SMF=""
++
++ if [ $FILE != "undef" ]; then
++ $INFOTEXT "Reading configuration from file %s" $FILE
++ . $FILE
++ else
++ $INFOTEXT "No config file. Please, start the installation with\n a valid configuration file"
++ fi
+
+- IFS="
+-"
+- if [ $FILE != "undef" ]; then
+- $INFOTEXT "Reading configuration from file %s" $FILE
+- . $FILE
+- else
+- $INFOTEXT "No config file. Please, start the installation with\n a valid configuration file"
+- fi
+- IFS="
+-"
+ #-nosmf takes precedence over the value in the autoinstall template
+ if [ "$SGE_ENABLE_SMF_LAST" = false ]; then
+ SGE_ENABLE_SMF=false
+@@ -2367,14 +2364,6 @@ CreateSGEStartUpScripts()
rm -f $TMP_SGE_STARTUP_FILE ${TMP_SGE_STARTUP_FILE}.0 ${TMP_SGE_STARTUP_FILE}.1
@@ -177,7 +209,7 @@
$INFOTEXT "Creating >%s< script" $STARTUP_FILE_NAME
fi
-@@ -2382,6 +2374,22 @@
+@@ -2382,6 +2371,22 @@ CreateSGEStartUpScripts()
#-------------------------------------------------------------------------
@@ -200,9 +232,10 @@
# AddSGEStartUpScript: Add startup script to rc files if root installs
#
AddSGEStartUpScript()
---- gridengine/source/dist/util/install_modules/inst_execd.sh.rctemplates 2009-12-28 15:11:42.311470580 -0700
-+++ gridengine/source/dist/util/install_modules/inst_execd.sh 2009-12-28 15:11:42.378471904 -0700
-@@ -457,7 +457,7 @@
+diff -up gridengine/source/dist/util/install_modules/inst_execd.sh.rctemplates gridengine/source/dist/util/install_modules/inst_execd.sh
+--- gridengine/source/dist/util/install_modules/inst_execd.sh.rctemplates 2010-08-25 11:56:12.546804323 -0600
++++ gridengine/source/dist/util/install_modules/inst_execd.sh 2010-08-25 11:56:12.677807416 -0600
+@@ -457,7 +457,7 @@ StartExecd()
exit 1
fi
else
@@ -211,9 +244,10 @@
fi
$INFOTEXT -wait -auto $AUTO -n "\nHit <RETURN> to continue >> "
$CLEAR
---- gridengine/source/dist/util/install_modules/inst_qmaster.sh.rctemplates 2009-12-28 15:11:42.345470618 -0700
-+++ gridengine/source/dist/util/install_modules/inst_qmaster.sh 2009-12-28 15:12:26.129409063 -0700
-@@ -208,8 +208,8 @@
+diff -up gridengine/source/dist/util/install_modules/inst_qmaster.sh.rctemplates gridengine/source/dist/util/install_modules/inst_qmaster.sh
+--- gridengine/source/dist/util/install_modules/inst_qmaster.sh.rctemplates 2010-08-25 11:56:12.587804590 -0600
++++ gridengine/source/dist/util/install_modules/inst_qmaster.sh 2010-08-25 11:56:12.683807289 -0600
+@@ -208,8 +208,8 @@ GetQmasterSpoolDir()
"the qmaster daemon on other hosts (see the corresponding section in the\n" \
"Grid Engine Installation and Administration Manual for details) the account\n" \
"on the shadow master hosts also needs read/write access to this directory.\n\n" \
@@ -224,7 +258,7 @@
done=true
#If directory is not empty need now require a new one
if [ -d "$QMDIR" ]; then
-@@ -733,6 +733,9 @@
+@@ -733,6 +733,9 @@ AddBootstrap()
ExecuteAsAdmin chmod 666 $COMMONDIR/bootstrap
PrintBootstrap >> $COMMONDIR/bootstrap
ExecuteAsAdmin chmod 444 $COMMONDIR/bootstrap
@@ -234,7 +268,7 @@
}
#-------------------------------------------------------------------------
-@@ -949,7 +952,7 @@
+@@ -949,7 +952,7 @@ GetConfiguration()
fi
if [ -z "$1" ]; then
@@ -243,7 +277,7 @@
else
default_value="$1"
fi
-@@ -1192,6 +1195,7 @@
+@@ -1192,6 +1195,7 @@ InitSysKs()
touch /tmp/pwfile.$$
chmod 600 /tmp/pwfile.$$
echo "$SGE_JMX_SSL_KEYSTORE_PW" > /tmp/pwfile.$$
@@ -251,7 +285,7 @@
OUTPUT=`$SGE_CA_CMD -sysks -ksout $SGE_JMX_SSL_KEYSTORE -kspwf /tmp/pwfile.$$ 2>&1`
if [ $? != 0 ]; then
$INFOTEXT "Error: Cannot create keystore $SGE_JMX_SSL_KEYSTORE\n$OUTPUT"
-@@ -1263,7 +1267,7 @@
+@@ -1263,7 +1267,7 @@ StartQmaster()
exit 1
fi
else
@@ -260,9 +294,10 @@
if [ $? -ne 0 ]; then
$INFOTEXT "sge_qmaster start problem"
$INFOTEXT -log "sge_qmaster start problem"
+diff -up gridengine/source/scripts/distinst.rctemplates gridengine/source/scripts/distinst
--- gridengine/source/scripts/distinst.rctemplates 2009-11-12 15:51:14.000000000 -0700
-+++ gridengine/source/scripts/distinst 2009-12-28 15:13:42.640411877 -0700
-@@ -832,15 +832,9 @@
++++ gridengine/source/scripts/distinst 2010-08-25 11:56:12.914806641 -0600
+@@ -832,15 +832,9 @@ if [ $instcommon = true ]; then
Execute cp libs/jgdi/util/logging.properties.template $DEST_SGE_ROOT/util
if [ $enforce_shlibpath = true ]; then
Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/create_settings.sh > $DEST_SGE_ROOT/util/create_settings.sh
@@ -278,7 +313,7 @@
Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/install_modules/inst_common.sh > $DEST_SGE_ROOT/util/install_modules/inst_common.sh
fi
-@@ -869,7 +863,6 @@
+@@ -869,7 +863,6 @@ if [ $instcommon = true ]; then
Execute chmod 755 $DEST_SGE_ROOT/util/install_modules \
$DEST_SGE_ROOT/util/upgrade_modules \
@@ -286,7 +321,7 @@
$DEST_SGE_ROOT/util/resources \
$DEST_SGE_ROOT/util/sgeCA \
$DEST_SGE_ROOT/util/resources/calendars \
-@@ -894,7 +887,6 @@
+@@ -894,7 +887,6 @@ if [ $instcommon = true ]; then
$DEST_SGE_ROOT/util/resources/starter_methods/*
Execute chmod 644 $DEST_SGE_ROOT/util/install_modules/* \
diff --git a/gridengine.spec b/gridengine.spec
index 065e0de..3ae42c5 100644
--- a/gridengine.spec
+++ b/gridengine.spec
@@ -6,7 +6,7 @@
Name: gridengine
Version: 6.2u5
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Grid Engine - Distributed Computing Management software
Group: Applications/System
@@ -561,6 +561,11 @@ fi
%changelog
+* Wed Aug 25 2010 - Orion Poplawski <orion at cora.nwra.com> - 6.2u5-5
+- Update instructions to referece ./my_configuration.conf (bug #557628)
+- Don't set IFS when reading conf file, breaks lots of stuff
+- Set SGE_JVM_LIB_PATH to none by default so we don't setup JMF
+
* Wed Aug 11 2010 - Orion Poplawski <orion at cora.nwra.com> - 6.2u5-4
- Use upstream my_configuration.conf as template for default one (bugs 557628,566294)
- Set SGE_CELL in sge.sh/sge.csh (bug 620907)
More information about the scm-commits
mailing list