Changeset 2515 in /cluster/svnroot


Ignore:
Timestamp:
Jul 12, 2010 2:28:19 PM (10 years ago)
Author:
fitz
Message:

(#185) hostname to prefer node* over pxenode*, amend pbs_server config defaults, add liberation-specific details to pbs install script

Location:
bccd-ng/branches/fitz-devel/trees
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • bccd-ng/branches/fitz-devel/trees/bin/bccd-hostname

    r2137 r2515  
    1818                $hname = gethostbyaddr(inet_aton($iaddr),AF_INET);
    1919                if (defined($hname)) {
    20                         $hostname = $hname unless ($hostname =~ m/.+\.bccd.+/);
     20                        $hostname = $hname unless ($hostname =~ m/^node...\.bccd.+/);
    2121                }
    2222        }
  • bccd-ng/branches/fitz-devel/trees/etc/init.d/pbs

    r2514 r2515  
    1313ROOT=/bccd/software/torque
    1414INSTALL=$ROOT/install
    15 SOURCE=$ROOT/torque-package
     15SOURCE=$INSTALL/torque-package
    1616SERV_HOME=/etc/pbs
    1717INST_FILE=$INSTALL/liberated_install
     
    2121if [ ! -f $INST_FILE ]; then
    2222        echo -n "Installing TORQUE packages... "
    23         $SOURCE-clients-linux-i686.sh --install &> /dev/null
    24         $SOURCE-devel-linux-i686.sh --install &> /dev/null
    25         $SOURCE-doc-linux-i686.sh --install &> /dev/null
    26         $SOURCE-server-linux-i686.sh --install &> /dev/null
    27         $SOURCE-mom-linux-i686.sh --install &> /dev/null
     23        for i in clients devel doc server mom; do
     24                $SOURCE-$i-linux-i686.sh --install &> /dev/null
     25
     26                if test $? != 0; then
     27                        echo "Installtion of TORQUE $i failed!"
     28                        exit 5 # from LSB: "program is not installed"
     29                fi
     30        done
    2831        echo
    2932
     
    4043        if [[ "`hostname`" =~ $HEADNODE ]]; then
    4144                echo -n "Configuring TORQUE server... "
    42                 cp $ROOT/nodes $SERV_HOME/server_priv/
    43                 echo "SERVERHOST pxenode000.bccd.net" > $SERV_HOME/torque.cfg
     45                if test -f $SERV_HOME; then
     46                        mv $SERV_HOME $SERV_HOME.bak
     47                fi
    4448                $ROOT/sbin/pbs_server -t create
    45                 $ROOT/bin/qmgr < $ROOT/pbs_server.conf &> /dev/null
     49                $ROOT/bin/qmgr < $INSTALL/pbs_server.conf &> /dev/null
    4650                $ROOT/bin/qterm -t quick
     51                cp $INSTALL/nodes $SERV_HOME/server_priv/
     52                echo "SERVERHOST pxenode000.bccd.net" >> $SERV_HOME/torque.cfg
    4753
    4854                # pbs_sched is very picky about where connections come from.
     
    5460        fi
    5561
     62        if [ "`cat /etc/bccd-stage`" == "LIBERATED" ]; then
     63                # mom needs to know who to connect to in liberation
     64                echo "\$pbsserver pxenode000.bccd.net" >> $SERV_HOME/mom_priv/config
     65
     66                for n in {11..99}; do
     67                        echo "pxenode0$n.bccd.net" >> $SERV_HOME/server_priv/nodes
     68                done
     69                echo "pxenode100.bccd.net" >> $SERV_HOME/server_priv/nodes
     70
     71                date > $INST_FILE
     72        fi
     73
    5674        # The pbs_* init script will start:
    5775        # - pbs_mom if not HEADNODE
     
    6078        /etc/init.d/pbs_server start
    6179        /etc/init.d/pbs_sched start
    62 
    63         if [ "`cat /etc/bccd-stage`" == "LIBERATED" ]; then
    64                 date > $INST_FILE
    65         fi
    6680fi
  • bccd-ng/branches/fitz-devel/trees/software/bccd/software/torque-2.4.8/install/pbs_server.conf

    r2514 r2515  
    77create queue bccd
    88set queue bccd queue_type = Execution
     9set queue bccd resources_default.nodes = 1
    910set queue bccd enabled = True
    1011set queue bccd started = True
     
    1415set server scheduling = True
    1516set server acl_host_enable = True
    16 set server acl_hosts = *.bccd.net
     17set server acl_hosts = node*.bccd.net
     18set server acl_hosts += pxenode*.bccd.net
    1719set server acl_hosts += localhost
    1820set server managers = root@node000.bccd.net
     21set server managers += root@pxenode000.bccd.net
    1922set server default_queue = bccd
    2023set server log_events = 511
Note: See TracChangeset for help on using the changeset viewer.