--- /root/opt-sge-inst_execd.sh 2013-05-17 15:01:04.000000000 +1200 +++ sge/util/install_modules/inst_execd.sh 2013-07-26 13:59:00.940550448 +1200 @@ -117,7 +117,9 @@ fi SGE_CELL_VAL=$SGE_CELL + $INFOTEXT "\nKMB: CheckQmasterInstallation1: Using cell: >%s<\n" $SGE_CELL_VAL SetCellDependentVariables + $INFOTEXT "\nKMB: CheckQmasterInstallation2: Using cell: >%s<\n" $SGE_CELL_VAL if [ ! -f $COMMONDIR/act_qmaster -o ! -f $COMMONDIR/bootstrap ]; then $INFOTEXT "\nObviously there was no qmaster installation yet!\nCall >install_qmaster<\n" \ @@ -125,7 +127,7 @@ $INFOTEXT -log "\nObviously there was no qmaster installation yet!\nCall >install_qmaster<\n" \ "on the machine which should run the Grid Engine qmaster\n" - MoveLog +# MoveLog exit 1 else $INFOTEXT "\nUsing cell: >%s<\n" $SGE_CELL_VAL @@ -1055,5 +1057,207 @@ $CLEAR } +# KMB Added + +MakeDirsExecd() +{ + $INFOTEXT -u "\nMaking directories" + $ECHO + $INFOTEXT -log "Making directories" + $INFOTEXT -log "Making directory SGE_CELL_VAL: %s" $SGE_CELL_VAL + Makedir $SGE_CELL_VAL + $INFOTEXT -log "Making directory COMMONDIR: %s" $COMMONDIR + Makedir $COMMONDIR +# Makedir $QMDIR +# Makedir $QMDIR/job_scripts + + $INFOTEXT -wait -auto $AUTO -n "Hit to continue >> " + $CLEAR +} + + +AddBootstrapExecd() +{ + TOUCH=touch + $INFOTEXT "Dumping bootstrapping information" + $INFOTEXT -log "Dumping bootstrapping information" +# ExecuteAsAdmin rm -f $COMMONDIR/bootstrap + ExecuteAsAdmin $TOUCH $COMMONDIR/bootstrap + ExecuteAsAdmin chmod 666 $COMMONDIR/bootstrap + PrintBootstrapExecd >> $COMMONDIR/bootstrap + ExecuteAsAdmin chmod 444 $COMMONDIR/bootstrap +} + +PrintBootstrapExecd() +{ + $ECHO "# Version: $SGE_VERSION" + $ECHO "#" + if [ $ADMINUSER != default ]; then + $ECHO "admin_user $ADMINUSER" + else + $ECHO "admin_user none" + fi + $ECHO "default_domain $CFG_DEFAULT_DOMAIN" + $ECHO "ignore_fqdn $IGNORE_FQDN_DEFAULT" + $ECHO "spooling_method $SPOOLING_METHOD" + $ECHO "spooling_lib $SPOOLING_LIB" + $ECHO "spooling_params $SPOOLING_ARGS" + $ECHO "binary_path $SGE_ROOT_VAL/bin" + $ECHO "qmaster_spool_dir $QMDIR" + $ECHO "security_mode $PRODUCT_MODE" + $ECHO "listener_threads 2" + $ECHO "worker_threads 2" + $ECHO "scheduler_threads 1" + if [ "$SGE_ENABLE_JMX" = "true" ]; then + $ECHO "jvm_threads 1" + else + $ECHO "jvm_threads 0" + fi +} + +AddActQmasterExecd() +{ + $INFOTEXT "Creating >act_qmaster< file" + + TruncCreateAndMakeWriteable $COMMONDIR/act_qmaster + $ECHO $QMASTER_HOSTNAME >> $COMMONDIR/act_qmaster + SetPerm $COMMONDIR/act_qmaster +} + +AddCommonFilesExecd() +{ + for f in sge_aliases qtask sge_request; do + if [ $f = sge_aliases ]; then + $INFOTEXT "Adding >%s< path aliases file" $f + $INFOTEXT -log "Adding >%s< path aliases file" $f + elif [ $f = qtask ]; then + $INFOTEXT "Adding >%s< qtcsh sample default request file" $f + $INFOTEXT -log "Adding >%s< qtcsh sample default request file" $f + else + $INFOTEXT "Adding >%s< default submit options file" $f + $INFOTEXT -log "Adding >%s< default submit options file" $f + fi + ExecuteAsAdmin cp util/$f $COMMONDIR + ExecuteAsAdmin chmod $FILEPERM $COMMONDIR/$f + done + +} + +CreateSettingsFileExecd() +{ + $INFOTEXT "Creating settings files for >.profile/.cshrc<" + $INFOTEXT -log "Creating settings files for >.profile/.cshrc<" + + if [ $RECREATE_SETTINGS = "false" ]; then + if [ -f "$SGE_ROOT/$SGE_CELL/common/settings.sh" ]; then + ExecuteAsAdmin $RM "$SGE_ROOT/$SGE_CELL/common/settings.sh" + fi + + if [ -f "$SGE_ROOT/$SGE_CELL/common/settings.csh" ]; then + ExecuteAsAdmin $RM "$SGE_ROOT/$SGE_CELL/common/settings.csh" + fi + fi + + if [ "$execd_service" = "true" ]; then + SGE_EXECD_PORT="" + export SGE_EXECD_PORT + fi + + if [ "$qmaster_service" = "true" ]; then + SGE_QMASTER_PORT="" + export SGE_QMASTER_PORT + fi + + ExecuteAsAdmin util/create_settings.sh "$SGE_ROOT_VAL/$COMMONDIR" + + SetPerm "$SGE_ROOT_VAL/$COMMONDIR/settings.sh" + SetPerm "$SGE_ROOT_VAL/$COMMONDIR/settings.csh" + + $INFOTEXT -wait -auto $AUTO -n "\nHit to continue >> " +} + +SetProductModeExecd() +{ + if [ $AFS = true ]; then + AFS_PREFIX="afs" + else + AFS_PREFIX="" + fi + + if [ $CSP = true ]; then + + case $SGE_ARCH in + + aix* | hp11*) + SEC_COUNT=`strings -a $SGE_BIN/sge_qmaster | grep "AIMK_SECURE_OPTION_ENABLED" | wc -l` + ;; + *) + # strings(1) may not be installed (e.g. IZ2506). + if type strings >/dev/null 2>&1; then + SEC_COUNT=`strings $SGE_BIN/sge_qmaster | grep "AIMK_SECURE_OPTION_ENABLED" | wc -l` + else + # Do our best, but the results of grep on a binary are + # unspecified generally. + SEC_COUNT=0 + grep AIMK_SECURE_OPTION_ENABLED $SGE_BIN/sge_qmaster >/dev/null 2>&1 && + SEC_COUNT=1 + fi + ;; + esac + + if [ $SEC_COUNT -ne 1 ]; then + $INFOTEXT "\n>sge_qmaster< binary not compiled with >-secure< option (or strings(1) missing)!\n" + $INFOTEXT -wait -auto $AUTO -n "Hit to cancel the installation >> " + exit 1 + else + CSP_PREFIX="csp" + fi + else + CSP_PREFIX="" + fi + + if [ $AFS = "false" ]; then + if [ $CSP = "false" ]; then + PRODUCT_MODE="none" + else + PRODUCT_MODE="${CSP_PREFIX}" + fi + else + PRODUCT_MODE="${AFS_PREFIX}" + fi +} + +ProcessSGEClusterNameExecd() +{ + # execd installation can create cluster_name file using this + if [ "$1" = "execd" ]; then + SafelyCreateFile "$SGE_ROOT"/$SGE_CELL/common/cluster_name 644 "$SGE_CLUSTER_NAME" + fi + + $ECHO + $INFOTEXT "Your \$SGE_CLUSTER_NAME: %s\n" $SGE_CLUSTER_NAME + $INFOTEXT -log "Your \$SGE_CLUSTER_NAME: %s" $SGE_CLUSTER_NAME + $INFOTEXT -wait -auto $AUTO -n "Hit to continue >> " + $CLEAR +} + +GetLocalExecdSpoolDirExecd() +{ + LOCAL_EXECD_SPOOL="undef" + if [ "$EXECD_SPOOL_DIR_LOCAL" != "" ]; then + LOCAL_EXECD_SPOOL=$EXECD_SPOOL_DIR_LOCAL + else + if [ "$EXECD_SPOOL_DIR" != "" ]; then + LOCAL_EXECD_SPOOL=$EXECD_SPOOL_DIR + fi + fi + if [ "$LOCAL_EXECD_SPOOL" != "undef" ]; then + MakeLocalSpoolDir + else + $INFOTEXT -log "No Local execd spool defined. Exit" + exit 3 + fi +} + # LocalWords: hasdot nThis seperate expr UpdateConfiguration config libjvm # LocalWords: AddLocalConfiguration nCreating nCan't