mauischeduler-cvs_notes Mailing List for Maui Scheduler
Brought to you by:
mauisched,
mitchmurphy
Menu
▾
▴
mauischeduler-cvs_notes — Automatic CVS notifications
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(63) |
Dec
(92) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(170) |
Feb
(96) |
Mar
(27) |
Apr
(78) |
May
(24) |
Jun
(4) |
Jul
(2) |
Aug
(5) |
Sep
(2) |
Oct
(19) |
Nov
(19) |
Dec
(6) |
| 2003 |
Jan
(5) |
Feb
(1) |
Mar
(7) |
Apr
(18) |
May
(1) |
Jun
(25) |
Jul
(18) |
Aug
(8) |
Sep
(10) |
Oct
(14) |
Nov
(2) |
Dec
|
| 2004 |
Jan
(7) |
Feb
(2) |
Mar
(14) |
Apr
(2) |
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
(22) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Aaron S. <mau...@us...> - 2005-03-24 19:19:22
|
Update of /cvsroot/mauischeduler/mauisched/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16824 Modified Files: maui_genkey.sh.in maui_grant_db.sh.in Log Message: configged java should be given precedence Index: maui_genkey.sh.in =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/scripts/maui_genkey.sh.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** maui_genkey.sh.in 23 Jan 2002 06:32:33 -0000 1.3 --- maui_genkey.sh.in 24 Mar 2005 19:19:02 -0000 1.4 *************** *** 37,47 **** # java executables to try and execute (in order) # NOTE: need to keep this in sync with other scripts and config.h.in ! ! javas="/usr/bin/java \ /usr/local/bin/java \ /usr/local/jdk/bin/java \ /usr/java/bin/java \ /usr/java/jre1.3.1/bin/java \ ! /usr/java/jre1.3.1_01/bin/java \ ! @JAVA@" for java in $javas ; do --- 37,47 ---- # java executables to try and execute (in order) # NOTE: need to keep this in sync with other scripts and config.h.in ! ! javas="@JAVA@ \ ! /usr/bin/java \ /usr/local/bin/java \ /usr/local/jdk/bin/java \ /usr/java/bin/java \ /usr/java/jre1.3.1/bin/java \ ! /usr/java/jre1.3.1_01/bin/java" for java in $javas ; do Index: maui_grant_db.sh.in =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/scripts/maui_grant_db.sh.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** maui_grant_db.sh.in 17 Jul 2003 20:03:49 -0000 1.6 --- maui_grant_db.sh.in 24 Mar 2005 19:19:06 -0000 1.7 *************** *** 47,57 **** # java executables to try and execute (in order) # NOTE: need to keep this in sync with other scripts and config.h.in ! ! javas="/usr/bin/java \ /usr/local/bin/java \ /usr/local/jdk/bin/java \ /usr/java/bin/java \ /usr/java/jre1.3.1/bin/java \ ! /usr/java/jre1.3.1_01/bin/java \ ! @JAVA@" for java in $javas ; do --- 47,57 ---- # java executables to try and execute (in order) # NOTE: need to keep this in sync with other scripts and config.h.in ! ! javas="@JAVA@ \ ! /usr/bin/java \ /usr/local/bin/java \ /usr/local/jdk/bin/java \ /usr/java/bin/java \ /usr/java/jre1.3.1/bin/java \ ! /usr/java/jre1.3.1_01/bin/java" for java in $javas ; do |
|
From: Aaron S. <mau...@us...> - 2005-03-24 18:06:47
|
Update of /cvsroot/mauischeduler/mauisched/src/unm/maui/wiki In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6296/src/unm/maui/wiki Modified Files: Wiki.java Log Message: bugfix Index: Wiki.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/wiki/Wiki.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** Wiki.java 8 Feb 2005 06:00:46 -0000 1.30 --- Wiki.java 24 Mar 2005 18:06:37 -0000 1.31 *************** *** 991,1009 **** } } else { tok = new StringTokenizer(hosts); while (tok.hasMoreElements()) { ! String host = tok.nextToken(); ! ! // start task on host ! if (Log.logging("wiki-verbose")) { ! Log.out.println("starting job="+jobRes+" on node="+host); ! } ! try { ! // get remote pid and write to file ! sendAndRecvTCP(sj, host); ! } catch (Exception e) { ! throw new RMException(host+" --> "+e.getMessage()); ! } } } } --- 991,1024 ---- } } else { + // HACK NOTE: send to the head node only after all the + // other nodes have been started. This prevents a race + // condition for MPI jobs that try to SSH out to nodes + // before the user has been added to the access file. + String firsthost=null; tok = new StringTokenizer(hosts); + if (tok.hasMoreElements()) { + firsthost = tok.nextToken(); + } while (tok.hasMoreElements()) { ! _sj(sj, tok.nextToken(), jobRes); } + if (firsthost != null) { + _sj(sj, firsthost, jobRes); + } + } + } + + private void _sj (StartJob sj, String host, JobReservation jobRes) + throws RMException + { + // start task on host + if (Log.logging("wiki-verbose")) { + Log.out.println("starting job="+jobRes+" on node="+host); + } + try { + // get remote pid and write to file + sendAndRecvTCP(sj, host); + } catch (Exception e) { + throw new RMException(host+" --> "+e.getMessage()); } } *************** *** 1038,1055 **** } } else { StringTokenizer tok = new StringTokenizer(hosts); ! while (tok.hasMoreTokens()) { ! String host = tok.nextToken(); ! ! // start task on host ! if (Log.logging("wiki-verbose")) { ! Log.out.println("cancelling job="+jobRes+" on node="+host); ! } ! // send message ! try { ! sendAndRecvTCP(cj, host); ! } catch (Exception e) { ! throw new RMException(e.getMessage()); ! } } } --- 1053,1068 ---- } } else { + // HACK NOTE: send to the head node only after all the + // other nodes have been started. + String firsthost=null; StringTokenizer tok = new StringTokenizer(hosts); ! if (tok.hasMoreElements()) { ! firsthost = tok.nextToken(); ! } ! while (tok.hasMoreElements()) { ! _cj(cj, tok.nextToken(), jobRes); ! } ! if (firsthost != null) { ! _cj(cj, firsthost, jobRes); } } *************** *** 1059,1062 **** --- 1072,1089 ---- } + private void _cj (CancelJob cj, String host, JobReservation jobRes) + throws RMException + { + if (Log.logging("wiki-verbose")) { + Log.out.println("cancelling job="+jobRes+" on node="+host); + } + // send message + try { + sendAndRecvTCP(cj, host); + } catch (Exception e) { + throw new RMException(e.getMessage()); + } + } + /** * Send message to a remote Wiki daemon and receive response |
|
From: Aaron S. <mau...@us...> - 2005-02-08 06:55:18
|
Update of /cvsroot/mauischeduler/mauisched/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24448 Modified Files: runmpi_eth.sh.in runmpi_gm.sh.in Log Message: tweak Index: runmpi_eth.sh.in =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/scripts/runmpi_eth.sh.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** runmpi_eth.sh.in 8 Feb 2005 05:43:28 -0000 1.8 --- runmpi_eth.sh.in 8 Feb 2005 06:55:08 -0000 1.9 *************** *** 77,82 **** # Be a good citizen and clean up after yourself! :) # ! if [ ! -z "$MAUI_JOB_USER" ; then ! if [ x"$MAUI_JOB_USER" != 'xroot' ; then headnode=`echo $MAUI_JOB_NODES | sed -e 's/:.*$//g'` for node in `echo $MAUI_JOB_NODES | sed -e 's/:/ /g'` ; do --- 77,82 ---- # Be a good citizen and clean up after yourself! :) # ! if [ ! -z "$MAUI_JOB_USER" ] ; then ! if [ x"$MAUI_JOB_USER" != 'xroot' ] ; then headnode=`echo $MAUI_JOB_NODES | sed -e 's/:.*$//g'` for node in `echo $MAUI_JOB_NODES | sed -e 's/:/ /g'` ; do Index: runmpi_gm.sh.in =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/scripts/runmpi_gm.sh.in,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** runmpi_gm.sh.in 8 Feb 2005 05:43:28 -0000 1.14 --- runmpi_gm.sh.in 8 Feb 2005 06:55:09 -0000 1.15 *************** *** 80,85 **** # Be a good citizen and clean up after yourself! :) # ! if /usr/bin/test ! -z "$MAUI_JOB_USER" ; then ! if /usr/bin/test x"$MAUI_JOB_USER" != 'xroot' ; then headnode=`echo $MAUI_JOB_NODES | sed -e 's/:.*$//g'` for node in `echo $MAUI_JOB_NODES | sed -e 's/:/ /g'` ; do --- 80,85 ---- # Be a good citizen and clean up after yourself! :) # ! if [ ! -z "$MAUI_JOB_USER" ] ; then ! if [ x"$MAUI_JOB_USER" != 'xroot' ] ; then headnode=`echo $MAUI_JOB_NODES | sed -e 's/:.*$//g'` for node in `echo $MAUI_JOB_NODES | sed -e 's/:/ /g'` ; do |
|
From: Aaron S. <mau...@us...> - 2005-02-08 06:01:31
|
Update of /cvsroot/mauischeduler/mauisched/src/unm/maui/sched In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15802/src/unm/maui/sched Modified Files: BasicPolicy.java BasicSchedulable.java Log Message: Java 1.5 tweak Index: BasicPolicy.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/sched/BasicPolicy.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** BasicPolicy.java 4 Mar 2004 00:51:04 -0000 1.12 --- BasicPolicy.java 8 Feb 2005 06:00:46 -0000 1.13 *************** *** 294,300 **** int count = 0; ! Enumeration enum = runHash.keys(); ! while (enum.hasMoreElements()) { ! jobID = (String)enum.nextElement(); job = (Job)runHash.get(jobID); if (user.equals(job.getUser())) { --- 294,300 ---- int count = 0; ! Enumeration enum_ = runHash.keys(); ! while (enum_.hasMoreElements()) { ! jobID = (String)enum_.nextElement(); job = (Job)runHash.get(jobID); if (user.equals(job.getUser())) { Index: BasicSchedulable.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/sched/BasicSchedulable.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BasicSchedulable.java 15 Oct 2002 20:46:29 -0000 1.5 --- BasicSchedulable.java 8 Feb 2005 06:00:46 -0000 1.6 *************** *** 272,279 **** public Exception[] getExceptions () { Exception[] exes = new Exception[exceptions.size()]; ! Enumeration enum = exceptions.elements(); int i=0; ! while (enum.hasMoreElements()) { ! exes[i++] = (Exception)enum.nextElement(); } return exes; --- 272,279 ---- public Exception[] getExceptions () { Exception[] exes = new Exception[exceptions.size()]; ! Enumeration enum_ = exceptions.elements(); int i=0; ! while (enum_.hasMoreElements()) { ! exes[i++] = (Exception)enum_.nextElement(); } return exes; |
|
From: Aaron S. <mau...@us...> - 2005-02-08 06:01:31
|
Update of /cvsroot/mauischeduler/mauisched/src/unm/maui/rm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15802/src/unm/maui/rm Modified Files: BasicMatcher.java NodeSlotMatcher.java Log Message: Java 1.5 tweak Index: BasicMatcher.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/rm/BasicMatcher.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** BasicMatcher.java 18 Jul 2002 23:33:56 -0000 1.10 --- BasicMatcher.java 8 Feb 2005 06:00:46 -0000 1.11 *************** *** 140,146 **** } ! Enumeration enum = reqFeatures.keys(); ! while (enum.hasMoreElements()) { ! key = (String)enum.nextElement(); vec = (Vector)reqFeatures.get(key); cmp = (String)vec.elementAt(1); --- 140,146 ---- } ! Enumeration enum_ = reqFeatures.keys(); ! while (enum_.hasMoreElements()) { ! key = (String)enum_.nextElement(); vec = (Vector)reqFeatures.get(key); cmp = (String)vec.elementAt(1); Index: NodeSlotMatcher.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/rm/NodeSlotMatcher.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** NodeSlotMatcher.java 23 Jan 2002 06:22:50 -0000 1.5 --- NodeSlotMatcher.java 8 Feb 2005 06:00:46 -0000 1.6 *************** *** 168,174 **** // Aggregate disparate slots into the slotHash ! Enumeration enum = slotsListHash.keys(); ! while (enum.hasMoreElements()) { ! node = (Node)enum.nextElement(); hash = (Hashtable)slotsListHash.get(node); SlotID[] slotIDs = new SlotID[hash.size()]; --- 168,174 ---- // Aggregate disparate slots into the slotHash ! Enumeration enum_ = slotsListHash.keys(); ! while (enum_.hasMoreElements()) { ! node = (Node)enum_.nextElement(); hash = (Hashtable)slotsListHash.get(node); SlotID[] slotIDs = new SlotID[hash.size()]; |
|
From: Aaron S. <mau...@us...> - 2005-02-08 06:01:31
|
Update of /cvsroot/mauischeduler/mauisched/src/unm/maui/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15802/src/unm/maui/server Modified Files: CheckJob.java CheckRes.java CheckUser.java ShowQ.java Log Message: Java 1.5 tweak Index: CheckJob.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/server/CheckJob.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** CheckJob.java 29 Mar 2004 22:25:06 -0000 1.13 --- CheckJob.java 8 Feb 2005 06:00:46 -0000 1.14 *************** *** 119,127 **** Hashtable slotHash = res.getSlotHash(); buf.append("<nodes>\n"); ! Enumeration enum = slotHash.keys(); Map tree = Collections.synchronizedMap(new TreeMap()); NodeID nodeID; ! while (enum.hasMoreElements()) { ! nodeID = (NodeID)enum.nextElement(); tree.put(nodeID.toString(), nodeID); } --- 119,127 ---- Hashtable slotHash = res.getSlotHash(); buf.append("<nodes>\n"); ! Enumeration enum_ = slotHash.keys(); Map tree = Collections.synchronizedMap(new TreeMap()); NodeID nodeID; ! while (enum_.hasMoreElements()) { ! nodeID = (NodeID)enum_.nextElement(); tree.put(nodeID.toString(), nodeID); } *************** *** 144,150 **** Hashtable reqFeatures = job.getReqFeatures(); if (reqFeatures != null) { ! Enumeration enum = reqFeatures.keys(); ! while (enum.hasMoreElements()) { ! String str = (String)enum.nextElement(); Vector vec = (Vector)reqFeatures.get(str); buf.append("<feature key='"+vec.elementAt(0)+"' cmp='"); --- 144,150 ---- Hashtable reqFeatures = job.getReqFeatures(); if (reqFeatures != null) { ! Enumeration enum_ = reqFeatures.keys(); ! while (enum_.hasMoreElements()) { ! String str = (String)enum_.nextElement(); Vector vec = (Vector)reqFeatures.get(str); buf.append("<feature key='"+vec.elementAt(0)+"' cmp='"); Index: CheckRes.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/server/CheckRes.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CheckRes.java 29 Mar 2004 22:25:06 -0000 1.11 --- CheckRes.java 8 Feb 2005 06:00:46 -0000 1.12 *************** *** 101,107 **** buf.append("<reslimits>\n"); Hashtable limits = cres.getLimits(); ! Enumeration enum = limits.keys(); ! while (enum.hasMoreElements()) { ! String key = (String)enum.nextElement(); String val = (String)limits.get(key); buf.append("<reslimit key='"+key+"' val='"+val+"'/>\n"); --- 101,107 ---- buf.append("<reslimits>\n"); Hashtable limits = cres.getLimits(); ! Enumeration enum_ = limits.keys(); ! while (enum_.hasMoreElements()) { ! String key = (String)enum_.nextElement(); String val = (String)limits.get(key); buf.append("<reslimit key='"+key+"' val='"+val+"'/>\n"); *************** *** 113,121 **** buf.append("<nodes nodescount='"+res.getNodesCount() +"' slotscount='"+res.getSlotsCount()+"'>\n"); ! Enumeration enum = slotHash.keys(); Map tree = Collections.synchronizedMap(new TreeMap()); NodeID nodeID; ! while (enum.hasMoreElements()) { ! nodeID = (NodeID)enum.nextElement(); tree.put(nodeID.toString(), nodeID); } --- 113,121 ---- buf.append("<nodes nodescount='"+res.getNodesCount() +"' slotscount='"+res.getSlotsCount()+"'>\n"); ! Enumeration enum_ = slotHash.keys(); Map tree = Collections.synchronizedMap(new TreeMap()); NodeID nodeID; ! while (enum_.hasMoreElements()) { ! nodeID = (NodeID)enum_.nextElement(); tree.put(nodeID.toString(), nodeID); } Index: CheckUser.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/server/CheckUser.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CheckUser.java 17 Jan 2004 09:49:42 -0000 1.1 --- CheckUser.java 8 Feb 2005 06:00:46 -0000 1.2 *************** *** 70,82 **** Hashtable globalJobMap = new Hashtable(); Hashtable runHash = scheduler.getRunHash(); ! Enumeration enum = runHash.keys(); ! while (enum.hasMoreElements()) { ! String jobid = (String)enum.nextElement(); Job job = (Job)runHash.get(jobid); Reservation res = job.getReservation(); Hashtable slothash = res.getSlotHash(); ! Enumeration enum2 = slothash.elements(); ! while (enum2.hasMoreElements()) { ! SlotID[] slotids = (SlotID[])enum2.nextElement(); int lenj = slotids.length; for (int j=0; j<lenj; j++) { --- 70,82 ---- Hashtable globalJobMap = new Hashtable(); Hashtable runHash = scheduler.getRunHash(); ! Enumeration enum_ = runHash.keys(); ! while (enum_.hasMoreElements()) { ! String jobid = (String)enum_.nextElement(); Job job = (Job)runHash.get(jobid); Reservation res = job.getReservation(); Hashtable slothash = res.getSlotHash(); ! Enumeration enum_2 = slothash.elements(); ! while (enum_2.hasMoreElements()) { ! SlotID[] slotids = (SlotID[])enum_2.nextElement(); int lenj = slotids.length; for (int j=0; j<lenj; j++) { *************** *** 100,106 **** if (res instanceof SysReservation) { Hashtable slothash = res.getSlotHash(); ! Enumeration enum2 = slothash.elements(); ! while (enum2.hasMoreElements()) { ! SlotID[] slotids = (SlotID[])enum2.nextElement(); int lenj = slotids.length; for (int j=0; j<lenj; j++) { --- 100,106 ---- if (res instanceof SysReservation) { Hashtable slothash = res.getSlotHash(); ! Enumeration enum_2 = slothash.elements(); ! while (enum_2.hasMoreElements()) { ! SlotID[] slotids = (SlotID[])enum_2.nextElement(); int lenj = slotids.length; for (int j=0; j<lenj; j++) { Index: ShowQ.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/server/ShowQ.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ShowQ.java 14 Apr 2002 01:49:05 -0000 1.9 --- ShowQ.java 8 Feb 2005 06:00:46 -0000 1.10 *************** *** 122,128 **** // print everything buf.append("<activejobs val='").append(runHash.size()).append("'>\n"); ! Enumeration enum = runHash.keys(); ! while (enum.hasMoreElements()) { ! id = (String)enum.nextElement(); job = (Job)runHash.get(id); JobReservation res = (JobReservation)job.getReservation(); --- 122,128 ---- // print everything buf.append("<activejobs val='").append(runHash.size()).append("'>\n"); ! Enumeration enum_ = runHash.keys(); ! while (enum_.hasMoreElements()) { ! id = (String)enum_.nextElement(); job = (Job)runHash.get(id); JobReservation res = (JobReservation)job.getReservation(); *************** *** 171,177 **** Hashtable holdHash = scheduler.getHoldHash(); buf.append("<heldjobs val='").append(holdHash.size()).append("'>\n"); ! Enumeration enum = holdHash.keys(); ! while (enum.hasMoreElements()) { ! id = (String)enum.nextElement(); job = (Job)holdHash.get(id); --- 171,177 ---- Hashtable holdHash = scheduler.getHoldHash(); buf.append("<heldjobs val='").append(holdHash.size()).append("'>\n"); ! Enumeration enum_ = holdHash.keys(); ! while (enum_.hasMoreElements()) { ! id = (String)enum_.nextElement(); job = (Job)holdHash.get(id); *************** *** 186,192 **** Hashtable deferredHash = scheduler.getDeferredHash(); buf.append("<deferredjobs val='").append(deferredHash.size()).append("'>\n"); ! Enumeration enum = deferredHash.keys(); ! while (enum.hasMoreElements()) { ! id = (String)enum.nextElement(); job = (Job)deferredHash.get(id); --- 186,192 ---- Hashtable deferredHash = scheduler.getDeferredHash(); buf.append("<deferredjobs val='").append(deferredHash.size()).append("'>\n"); ! Enumeration enum_ = deferredHash.keys(); ! while (enum_.hasMoreElements()) { ! id = (String)enum_.nextElement(); job = (Job)deferredHash.get(id); |
|
From: Aaron S. <mau...@us...> - 2005-02-08 06:01:02
|
Update of /cvsroot/mauischeduler/mauisched/src/unm/maui/wiki In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15802/src/unm/maui/wiki Modified Files: Wiki.java WikiNode.java Log Message: Java 1.5 tweak Index: Wiki.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/wiki/Wiki.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Wiki.java 29 Mar 2004 22:25:07 -0000 1.29 --- Wiki.java 8 Feb 2005 06:00:46 -0000 1.30 *************** *** 560,566 **** Hashtable hash = new Hashtable(); int size=wikiNodesHash.size(); ! Enumeration enum = wikiNodesHash.keys(); for (int i=0; i<size; i++) { ! Object key = enum.nextElement(); hash.put(key, wikiNodesHash.get(key)); } --- 560,566 ---- Hashtable hash = new Hashtable(); int size=wikiNodesHash.size(); ! Enumeration enum_ = wikiNodesHash.keys(); for (int i=0; i<size; i++) { ! Object key = enum_.nextElement(); hash.put(key, wikiNodesHash.get(key)); } *************** *** 754,761 **** // put nodes in alphabetical order in array (ugly) int len = wikiNodesHash.size(); ! Enumeration enum = wikiNodesHash.keys(); Map tree = Collections.synchronizedMap(new TreeMap()); for (int i=0; i<len; i++) { ! nodeID = (NodeID)enum.nextElement(); tree.put(nodeID.toString(), nodeID); } --- 754,761 ---- // put nodes in alphabetical order in array (ugly) int len = wikiNodesHash.size(); ! Enumeration enum_ = wikiNodesHash.keys(); Map tree = Collections.synchronizedMap(new TreeMap()); for (int i=0; i<len; i++) { ! nodeID = (NodeID)enum_.nextElement(); tree.put(nodeID.toString(), nodeID); } *************** *** 1246,1252 **** // make sure responses are OK ! Enumeration enum = responseHash.keys(); for (int i=0; i<size; i++) { ! WikiResponse update = (WikiResponse)responseHash.get(enum.nextElement()); // parse update information --- 1246,1252 ---- // make sure responses are OK ! Enumeration enum_ = responseHash.keys(); for (int i=0; i<size; i++) { ! WikiResponse update = (WikiResponse)responseHash.get(enum_.nextElement()); // parse update information *************** *** 1294,1302 **** int len = jobRes.getNodesCount(); Hashtable slothash = jobRes.getSlotHash(); ! Enumeration enum = slothash.keys(); Map tree = Collections.synchronizedMap(new TreeMap()); NodeID local; for (int i=0; i<len; i++) { ! local = (NodeID)enum.nextElement(); tree.put(local.toString(), local); } --- 1294,1302 ---- int len = jobRes.getNodesCount(); Hashtable slothash = jobRes.getSlotHash(); ! Enumeration enum_ = slothash.keys(); Map tree = Collections.synchronizedMap(new TreeMap()); NodeID local; for (int i=0; i<len; i++) { ! local = (NodeID)enum_.nextElement(); tree.put(local.toString(), local); } *************** *** 1352,1360 **** int len = jobRes.getNodesCount(); Hashtable slothash = jobRes.getSlotHash(); ! Enumeration enum = slothash.keys(); Map tree = Collections.synchronizedMap(new TreeMap()); NodeID nodeID; for (int i=0; i<len; i++) { ! nodeID = (NodeID)enum.nextElement(); tree.put(nodeID.toString(), nodeID); } --- 1352,1360 ---- int len = jobRes.getNodesCount(); Hashtable slothash = jobRes.getSlotHash(); ! Enumeration enum_ = slothash.keys(); Map tree = Collections.synchronizedMap(new TreeMap()); NodeID nodeID; for (int i=0; i<len; i++) { ! nodeID = (NodeID)enum_.nextElement(); tree.put(nodeID.toString(), nodeID); } Index: WikiNode.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/wiki/WikiNode.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** WikiNode.java 11 Feb 2002 09:24:51 -0000 1.4 --- WikiNode.java 8 Feb 2005 06:00:47 -0000 1.5 *************** *** 152,158 **** // Only overwrite/remove values contained in the node's Hash Hashtable f = node.getFeatureHash(); ! Enumeration enum = f.keys(); ! while (enum.hasMoreElements()) { ! Object key = enum.nextElement(); Object val = f.get(key); if (val.toString().equals("REMOVE")) { --- 152,158 ---- // Only overwrite/remove values contained in the node's Hash Hashtable f = node.getFeatureHash(); ! Enumeration enum_ = f.keys(); ! while (enum_.hasMoreElements()) { ! Object key = enum_.nextElement(); Object val = f.get(key); if (val.toString().equals("REMOVE")) { |
|
From: Aaron S. <mau...@us...> - 2005-02-08 06:00:59
|
Update of /cvsroot/mauischeduler/mauisched/src/unm/maui/wikid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15802/src/unm/maui/wikid Modified Files: NodeDaemonImpl.java Log Message: Java 1.5 tweak Index: NodeDaemonImpl.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/wikid/NodeDaemonImpl.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** NodeDaemonImpl.java 8 Feb 2005 05:46:41 -0000 1.23 --- NodeDaemonImpl.java 8 Feb 2005 06:00:47 -0000 1.24 *************** *** 629,636 **** /* Don't cancel jobs -- use checkpoint stuff ! Enumeration enum = procHash.keys(); int size = procHash.size(); for (int i=0; i<size; i++) { ! String key = (String)enum.nextElement(); try { cancelJob(key); --- 629,636 ---- /* Don't cancel jobs -- use checkpoint stuff ! Enumeration enum_ = procHash.keys(); int size = procHash.size(); for (int i=0; i<size; i++) { ! String key = (String)enum_.nextElement(); try { cancelJob(key); |
|
From: Aaron S. <mau...@us...> - 2005-02-08 06:00:59
|
Update of /cvsroot/mauischeduler/mauisched/src/unm/maui/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15802/src/unm/maui/res Modified Files: BasicRes.java BasicSys.java Sys.java SysRes.java Log Message: Java 1.5 tweak Index: BasicRes.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/res/BasicRes.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** BasicRes.java 3 Jan 2003 20:49:58 -0000 1.11 --- BasicRes.java 8 Feb 2005 06:00:46 -0000 1.12 *************** *** 288,292 **** */ public void init () { ! Enumeration enum = slotHash.elements(); int len, size=slotHash.size(); SlotID[] slots; --- 288,292 ---- */ public void init () { ! Enumeration enum_ = slotHash.elements(); int len, size=slotHash.size(); SlotID[] slots; *************** *** 294,298 **** for (int i=0; i<size; i++) { ! slots = (SlotID[])enum.nextElement(); len = slots.length; slotsCount+=len; --- 294,298 ---- for (int i=0; i<size; i++) { ! slots = (SlotID[])enum_.nextElement(); len = slots.length; slotsCount+=len; *************** *** 307,317 **** */ public void shutdown () { ! Enumeration enum = slotHash.keys(); NodeID nodeID; Node node; StringBuffer buf = new StringBuffer(); ! while (enum.hasMoreElements()) { ! nodeID = (NodeID)enum.nextElement(); node = nodeID.getNode(); node.cancelReservation(this); --- 307,317 ---- */ public void shutdown () { ! Enumeration enum_ = slotHash.keys(); NodeID nodeID; Node node; StringBuffer buf = new StringBuffer(); ! while (enum_.hasMoreElements()) { ! nodeID = (NodeID)enum_.nextElement(); node = nodeID.getNode(); node.cancelReservation(this); Index: BasicSys.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/res/BasicSys.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BasicSys.java 25 Jan 2002 10:35:57 -0000 1.4 --- BasicSys.java 8 Feb 2005 06:00:46 -0000 1.5 *************** *** 207,211 **** /** ! * Get columns enumeration of cronline. * @return Enumeration[] */ --- 207,211 ---- /** ! * Get columns enum_eration of cronline. * @return Enumeration[] */ Index: Sys.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/res/Sys.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Sys.java 23 Jan 2002 06:22:50 -0000 1.3 --- Sys.java 8 Feb 2005 06:00:46 -0000 1.4 *************** *** 101,105 **** /** ! * Get columns enumeration of cronline. * @return Enumeration[] */ --- 101,105 ---- /** ! * Get columns enum_eration of cronline. * @return Enumeration[] */ Index: SysRes.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/res/SysRes.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** SysRes.java 27 Sep 2002 08:49:02 -0000 1.10 --- SysRes.java 8 Feb 2005 06:00:46 -0000 1.11 *************** *** 323,329 **** // populate slotIDHash ! Enumeration enum = slotHash.elements(); for (int i=0; i<size; i++) { ! slotIDs = (SlotID[])enum.nextElement(); len = slotIDs.length; --- 323,329 ---- // populate slotIDHash ! Enumeration enum_ = slotHash.elements(); for (int i=0; i<size; i++) { ! slotIDs = (SlotID[])enum_.nextElement(); len = slotIDs.length; |
|
From: Aaron S. <mau...@us...> - 2005-02-08 06:00:59
|
Update of /cvsroot/mauischeduler/mauisched/src/unm/maui/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15802/src/unm/maui/misc Modified Files: JobChecker.java Log Message: Java 1.5 tweak Index: JobChecker.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/misc/JobChecker.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** JobChecker.java 25 Jul 2003 20:34:17 -0000 1.10 --- JobChecker.java 8 Feb 2005 06:00:46 -0000 1.11 *************** *** 132,136 **** Hashtable hash; int size; ! Enumeration enum; if (evt instanceof PrologEvent) { --- 132,136 ---- Hashtable hash; int size; ! Enumeration enum_; if (evt instanceof PrologEvent) { *************** *** 149,155 **** hash = scheduler.getDoneHash(); size = hash.size(); ! enum = hash.keys(); for (int i=0; i<size; i++) { ! String id = (String)enum.nextElement(); try { Job job = (Job)hash.get(id); --- 149,155 ---- hash = scheduler.getDoneHash(); size = hash.size(); ! enum_ = hash.keys(); for (int i=0; i<size; i++) { ! String id = (String)enum_.nextElement(); try { Job job = (Job)hash.get(id); *************** *** 228,234 **** hash = scheduler.getDeferredHash(); size = hash.size(); ! enum = hash.keys(); for (int i=0; i<size; i++) { ! String id = (String)enum.nextElement(); Job job = (Job)hash.get(id); int deferCount = job.getDeferralCount(); --- 228,234 ---- hash = scheduler.getDeferredHash(); size = hash.size(); ! enum_ = hash.keys(); for (int i=0; i<size; i++) { ! String id = (String)enum_.nextElement(); Job job = (Job)hash.get(id); int deferCount = job.getDeferralCount(); |
|
From: Aaron S. <mau...@us...> - 2005-02-08 06:00:58
|
Update of /cvsroot/mauischeduler/mauisched/src/unm/maui/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15802/src/unm/maui/client Modified Files: MauiNode.java Log Message: Java 1.5 tweak Index: MauiNode.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/client/MauiNode.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MauiNode.java 8 Apr 2002 19:45:27 -0000 1.9 --- MauiNode.java 8 Feb 2005 06:00:45 -0000 1.10 *************** *** 483,489 **** String str = "|Cluster="+cluster+" Showing feature="+feature; System.out.println(str+pad.substring(0, outputw-str.length()-1)+"|"); ! Enumeration enum = mapHash.keys(); ! while (enum.hasMoreElements()) { ! String key = (String)enum.nextElement(); byte b = ((Byte)mapHash.get(key)).byteValue(); str = "|"+key+" => "+(char)b; --- 483,489 ---- String str = "|Cluster="+cluster+" Showing feature="+feature; System.out.println(str+pad.substring(0, outputw-str.length()-1)+"|"); ! Enumeration enum_ = mapHash.keys(); ! while (enum_.hasMoreElements()) { ! String key = (String)enum_.nextElement(); byte b = ((Byte)mapHash.get(key)).byteValue(); str = "|"+key+" => "+(char)b; |
|
From: Aaron S. <mau...@us...> - 2005-02-08 06:00:58
|
Update of /cvsroot/mauischeduler/mauisched/src/unm/maui/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15802/src/unm/maui/db Modified Files: MauiMySQL.java Log Message: Java 1.5 tweak Index: MauiMySQL.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/db/MauiMySQL.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** MauiMySQL.java 9 Sep 2003 20:04:14 -0000 1.14 --- MauiMySQL.java 8 Feb 2005 06:00:45 -0000 1.15 *************** *** 492,499 **** Hashtable features = job.getReqFeatures(); ! Enumeration enum = features.keys(); StringBuffer features_text = new StringBuffer(); ! while (enum.hasMoreElements()) { ! Object key = enum.nextElement(); Object obj = features.get(key); features_text.append(key.toString()); --- 492,499 ---- Hashtable features = job.getReqFeatures(); ! Enumeration enum_ = features.keys(); StringBuffer features_text = new StringBuffer(); ! while (enum_.hasMoreElements()) { ! Object key = enum_.nextElement(); Object obj = features.get(key); features_text.append(key.toString()); *************** *** 517,523 **** Hashtable slotHash = jobRes.getSlotHash();// NodeID -> SlotID ! enum = slotHash.keys(); ! while (enum.hasMoreElements()) { ! NodeID nodeID = (NodeID)enum.nextElement(); SlotID[] slotIDs = (SlotID[])slotHash.get(nodeID); len = slotIDs.length; --- 517,523 ---- Hashtable slotHash = jobRes.getSlotHash();// NodeID -> SlotID ! enum_ = slotHash.keys(); ! while (enum_.hasMoreElements()) { ! NodeID nodeID = (NodeID)enum_.nextElement(); SlotID[] slotIDs = (SlotID[])slotHash.get(nodeID); len = slotIDs.length; *************** *** 618,624 **** Hashtable slotHash = cres.getSlotHash();// NodeID -> SlotID ! Enumeration enum = slotHash.keys(); ! while (enum.hasMoreElements()) { ! NodeID nodeID = (NodeID)enum.nextElement(); SlotID[] slotIDs = (SlotID[])slotHash.get(nodeID); int len = slotIDs.length; --- 618,624 ---- Hashtable slotHash = cres.getSlotHash();// NodeID -> SlotID ! Enumeration enum_ = slotHash.keys(); ! while (enum_.hasMoreElements()) { ! NodeID nodeID = (NodeID)enum_.nextElement(); SlotID[] slotIDs = (SlotID[])slotHash.get(nodeID); int len = slotIDs.length; |
|
From: Aaron S. <mau...@us...> - 2005-02-08 06:00:54
|
Update of /cvsroot/mauischeduler/mauisched/src/unm/maui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15802/src/unm/maui Modified Files: Maui.java Log Message: Java 1.5 tweak Index: Maui.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/Maui.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Maui.java 28 Jan 2002 07:16:18 -0000 1.7 --- Maui.java 8 Feb 2005 06:00:45 -0000 1.8 *************** *** 171,177 **** // toplevel. Construct the Properties object. Properties props = new Properties(cfgprops); ! Enumeration enum = sysprops.propertyNames(); ! while (enum.hasMoreElements()) { ! String key = (String)enum.nextElement(); props.put(key, sysprops.getProperty(key)); } --- 171,177 ---- // toplevel. Construct the Properties object. Properties props = new Properties(cfgprops); ! Enumeration enum_ = sysprops.propertyNames(); ! while (enum_.hasMoreElements()) { ! String key = (String)enum_.nextElement(); props.put(key, sysprops.getProperty(key)); } |
|
From: Aaron S. <mau...@us...> - 2005-02-08 05:46:49
|
Update of /cvsroot/mauischeduler/mauisched/src/unm/maui/wikid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13470/unm/maui/wikid Modified Files: NodeDaemonImpl.java Log Message: remove hardcoded stuff Index: NodeDaemonImpl.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/wikid/NodeDaemonImpl.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** NodeDaemonImpl.java 3 Feb 2005 21:15:36 -0000 1.22 --- NodeDaemonImpl.java 8 Feb 2005 05:46:41 -0000 1.23 *************** *** 77,81 **** public final transient static String epilogRemoteProperty = ".epilog.remote"; ! public final transient static String cpFile = Config.datadir+"/node.chk"; --- 77,81 ---- public final transient static String epilogRemoteProperty = ".epilog.remote"; ! public final transient static String cpFileProperty = ".cpfile"; *************** *** 175,178 **** --- 175,183 ---- protected String epilogExe; + /** + * Checkpoint file. + */ + protected String cpFile = Config.datadir+"/node.chk"; + private long iteration=0; private boolean finished = false; *************** *** 358,361 **** --- 363,371 ---- epilogExe = props.getProperty(prefix+epilogRemoteProperty); + str = props.getProperty(prefix+cpFileProperty); + if (str != null) { + cpFile = str; + } + // load checkpointed data only after we've set all properties. loadCheckpoint(); |
|
From: Aaron S. <mau...@us...> - 2005-02-08 05:46:12
|
Update of /cvsroot/mauischeduler/mauisched/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13329 Modified Files: maui-include.h.in Log Message: default to using JAVA Index: maui-include.h.in =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/maui-include.h.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** maui-include.h.in 25 Oct 2003 23:26:58 -0000 1.2 --- maui-include.h.in 8 Feb 2005 05:46:03 -0000 1.3 *************** *** 52,55 **** --- 52,56 ---- #define NUM_JAVAS 10 static char *javas[] = { + "@JAVA@", "/usr/bin/java", "/usr/local/bin/java", *************** *** 60,65 **** "/usr/java/bin/java", "/usr/java/jdk/bin/java", ! "/usr/java/jre/bin/java", ! "@JAVA@" }; --- 61,65 ---- "/usr/java/bin/java", "/usr/java/jdk/bin/java", ! "/usr/java/jre/bin/java" }; |
|
From: Aaron S. <mau...@us...> - 2005-02-08 05:45:20
|
Update of /cvsroot/mauischeduler/mauisched/share In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13145 Modified Files: maui.properties.in Log Message: tweak Index: maui.properties.in =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/share/maui.properties.in,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** maui.properties.in 3 Feb 2005 21:13:36 -0000 1.26 --- maui.properties.in 8 Feb 2005 05:45:11 -0000 1.27 *************** *** 176,179 **** --- 176,182 ---- wiki.stripFQDN=true + # job state (binary running/not-running) checkpoint file + wiki.cpfile=/var/log/maui/node.chk + # job prolog and epilog scripts (executed as root!) wiki.prolog.local=@DATADIR@/prolog-global.sh |
|
From: Aaron S. <mau...@us...> - 2005-02-08 05:44:37
|
Update of /cvsroot/mauischeduler/mauisched In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12960 Modified Files: Makefile.in Log Message: so many compilers, so little time ... Index: Makefile.in =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/Makefile.in,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Makefile.in 31 Jul 2003 23:55:57 -0000 1.20 --- Makefile.in 8 Feb 2005 05:44:29 -0000 1.21 *************** *** 114,118 **** --- 114,122 ---- install:: $(bindir) $(INSTALL.bin) scripts/runmpi_eth.sh $(bindir)/runmpi_eth + $(LN_S) $(bindir)/runmpi_eth $(bindir)/runmpi_eth_gnu + $(LN_S) $(bindir)/runmpi_eth $(bindir)/runmpi_eth_intel $(INSTALL.bin) scripts/runmpi_gm.sh $(bindir)/runmpi_gm + $(LN_S) $(bindir)/runmpi_gm $(bindir)/runmpi_gm_gnu + $(LN_S) $(bindir)/runmpi_gm $(bindir)/runmpi_gm_intel # install in sbin |
|
From: Aaron S. <mau...@us...> - 2005-02-08 05:43:36
|
Update of /cvsroot/mauischeduler/mauisched/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12778 Modified Files: runmpi_eth.sh.in runmpi_gm.sh.in Log Message: so many compilers, so little time ... Index: runmpi_eth.sh.in =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/scripts/runmpi_eth.sh.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** runmpi_eth.sh.in 9 Sep 2003 20:04:14 -0000 1.7 --- runmpi_eth.sh.in 8 Feb 2005 05:43:28 -0000 1.8 *************** *** 32,36 **** # ! mpirun="/usr/local/mpich/ip/pgi/bin/mpirun" # HACK NOTE: Needs to be NFS-mounted directories?: --- 32,40 ---- # ! mpitype=`echo $0 | sed -e 's/.*runmpi_eth_//'` ! if [ -z $mpitype ] ; then ! mpitype='gnu' ! fi ! mpirun="/usr/local/mpich/ip/$mpitype/bin/mpirun" # HACK NOTE: Needs to be NFS-mounted directories?: *************** *** 58,62 **** # ! # start the MPI-over-Myrinet job # $mpirun -np $MAUI_TASK_COUNT -machinefile $tasks_file "$@" --- 62,66 ---- # ! # start the MPI-over-Ethernet job # $mpirun -np $MAUI_TASK_COUNT -machinefile $tasks_file "$@" *************** *** 73,78 **** # Be a good citizen and clean up after yourself! :) # ! if /usr/bin/test ! -z "$MAUI_JOB_USER" ; then ! if /usr/bin/test x"$MAUI_JOB_USER" != 'xroot' ; then headnode=`echo $MAUI_JOB_NODES | sed -e 's/:.*$//g'` for node in `echo $MAUI_JOB_NODES | sed -e 's/:/ /g'` ; do --- 77,82 ---- # Be a good citizen and clean up after yourself! :) # ! if [ ! -z "$MAUI_JOB_USER" ; then ! if [ x"$MAUI_JOB_USER" != 'xroot' ; then headnode=`echo $MAUI_JOB_NODES | sed -e 's/:.*$//g'` for node in `echo $MAUI_JOB_NODES | sed -e 's/:/ /g'` ; do Index: runmpi_gm.sh.in =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/scripts/runmpi_gm.sh.in,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** runmpi_gm.sh.in 9 Sep 2003 20:04:14 -0000 1.13 --- runmpi_gm.sh.in 8 Feb 2005 05:43:28 -0000 1.14 *************** *** 32,36 **** # ! mpirun="/usr/local/mpich/gm/pgi/bin/mpirun" # HACK NOTE: Needs to be NFS-mounted directories?: --- 32,40 ---- # ! mpitype=`echo $0 | sed -e 's/.*runmpi_gm_//'` ! if [ -z $mpitype ] ; then ! mpitype='gnu' ! fi ! mpirun="/usr/local/mpich/gm/$mpitype/bin/mpirun" # HACK NOTE: Needs to be NFS-mounted directories?: |
|
From: Aaron S. <mau...@us...> - 2005-02-03 23:03:06
|
Update of /cvsroot/mauischeduler/mauisched In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23772 Modified Files: maui.version mauisched.spec Log Message: 1.8 -> 1.9 Index: maui.version =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/maui.version,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** maui.version 25 Oct 2003 23:23:09 -0000 1.9 --- maui.version 3 Feb 2005 23:02:56 -0000 1.10 *************** *** 1 **** ! 1.8 --- 1 ---- ! 1.9 Index: mauisched.spec =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/mauisched.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** mauisched.spec 13 Nov 2003 19:41:44 -0000 1.22 --- mauisched.spec 3 Feb 2005 23:02:57 -0000 1.23 *************** *** 14,18 **** %define release 1 # HACK NOTE: keep this in sync with the maui.version file!!!! ! %define mauiversion 1.8 Summary: A Linux Cluster Scheduler --- 14,18 ---- %define release 1 # HACK NOTE: keep this in sync with the maui.version file!!!! ! %define mauiversion 1.9 Summary: A Linux Cluster Scheduler |
|
From: Aaron S. <mau...@us...> - 2005-02-03 21:15:45
|
Update of /cvsroot/mauischeduler/mauisched/src/unm/maui/wikid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32201/src/unm/maui/wikid Modified Files: NodeDaemonImpl.java Log Message: merge from 1.8 Index: NodeDaemonImpl.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/wikid/NodeDaemonImpl.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** NodeDaemonImpl.java 9 Sep 2003 20:04:14 -0000 1.21 --- NodeDaemonImpl.java 3 Feb 2005 21:15:36 -0000 1.22 *************** *** 63,66 **** --- 63,70 ---- public final transient static String minSleepProperty = ".sleep"; + public final transient static String minNodeSleepProperty = ".sleep.node"; + + public final transient static String minSubSleepProperty = ".subsleep"; + public final transient static String jobSleepProperty = ".sleep.jobstart"; *************** *** 131,134 **** --- 135,144 ---- /** + * Minimum sleep for node updates, in seconds--only used if + * present in configuration file... + */ + protected int minNodeSleep = -1; + + /** * Cryptix security library wrapper. */ *************** *** 305,309 **** str = props.getProperty(prefix+sleepIntervalProperty); if (str != null) { ! sleepInterval = Integer.parseInt(str); } --- 315,319 ---- str = props.getProperty(prefix+sleepIntervalProperty); if (str != null) { ! sleepInterval = Integer.parseInt(str) * 1000; // milliseconds } *************** *** 315,319 **** str = props.getProperty(prefix+minSleepProperty); if (str != null) { ! minSleep = Integer.parseInt(str); } --- 325,337 ---- str = props.getProperty(prefix+minSleepProperty); if (str != null) { ! minSleep = Integer.parseInt(str) * 1000; // milliseconds ! str = props.getProperty(prefix+minSubSleepProperty); ! if (str != null) { ! minSleep += Integer.parseInt(str); // miolliseconds ! } ! } ! str = props.getProperty(prefix+minNodeSleepProperty); ! if (str != null) { ! minNodeSleep = Integer.parseInt(str) * 1000; // milliseconds } *************** *** 752,756 **** // stall ... ! Thread.currentThread().sleep(jobSleep); try { --- 770,776 ---- // stall ... ! if (jobSleep > 0) { ! Thread.currentThread().sleep(jobSleep); ! } try { *************** *** 880,883 **** --- 900,906 ---- fireProlog(); + + int minisleep = (minNodeSleep >= 0) ? minNodeSleep : minSleep; + // loop handling commands until stopped while (!finished) { *************** *** 904,912 **** ++iteration; try { ! int randSleep = (int)((double)sleepInterval*(double)Math.random()) + minSleep; if (Log.logging("sched-verbose")) { Log.out.println(threadName+" sleeping for "+randSleep+" seconds"); } ! wait(randSleep*1000); } catch (InterruptedException e) { Log.err.println(e.getMessage()); --- 927,936 ---- ++iteration; try { ! int randSleep = (int)((double)sleepInterval*(double)Math.random()) + minisleep; ! if (Log.logging("sched-verbose")) { Log.out.println(threadName+" sleeping for "+randSleep+" seconds"); } ! wait(randSleep); } catch (InterruptedException e) { Log.err.println(e.getMessage()); *************** *** 1124,1128 **** Log.out.println(Thread.currentThread().getName()+" sleeping for "+randSleep+" seconds"); } ! Thread.currentThread().sleep(randSleep*1000); if (doOnce) { --- 1148,1152 ---- Log.out.println(Thread.currentThread().getName()+" sleeping for "+randSleep+" seconds"); } ! Thread.currentThread().sleep(randSleep); if (doOnce) { |
|
From: Aaron S. <mau...@us...> - 2005-02-03 21:15:09
|
Update of /cvsroot/mauischeduler/mauisched/src/unm/maui/sched In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32065/src/unm/maui/sched Modified Files: Sched.java Log Message: merge from 1.8 Index: Sched.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/sched/Sched.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Sched.java 29 Mar 2004 22:25:06 -0000 1.26 --- Sched.java 3 Feb 2005 21:14:57 -0000 1.27 *************** *** 47,50 **** --- 47,52 ---- public final transient static String sleepIntervalProperty = ".sleep"; + public final transient static String sleepSubIntervalProperty = ".subsleep"; + public final transient static String classProperty = ".class"; *************** *** 78,81 **** --- 80,88 ---- /** + * Sleep interval in milliseconds + */ + protected transient int sleepSubInterval=0; + + /** * Master Reservations (sorted by finishtime). */ *************** *** 193,196 **** --- 200,209 ---- : sleepInterval; + // sleep interval + str = props.getProperty(prefix+sleepSubIntervalProperty); + sleepSubInterval = (str != null) + ? Integer.parseInt(str) + : sleepSubInterval; + // admins str = props.getProperty(prefix+adminsProperty); *************** *** 318,322 **** do { try { ! wait(sleepInterval); } catch (InterruptedException e) { Log.err.println(e.getMessage()); --- 331,335 ---- do { try { ! wait(sleepInterval+sleepSubInterval); } catch (InterruptedException e) { Log.err.println(e.getMessage()); |
|
From: Aaron S. <mau...@us...> - 2005-02-03 21:14:27
|
Update of /cvsroot/mauischeduler/mauisched/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31960/src Modified Files: sss.c Log Message: merge from 1.8 Index: sss.c =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/sss.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** sss.c 25 Nov 2002 02:11:31 -0000 1.13 --- sss.c 3 Feb 2005 21:14:17 -0000 1.14 *************** *** 53,56 **** --- 53,57 ---- #include <errno.h> #include <string.h> + #include <grp.h> #include <sys/types.h> #include <sys/stat.h> *************** *** 143,146 **** --- 144,156 ---- get_stdin(buf, BUFLEN); gid = (int)strtol(buf, (char **)NULL, 10); + + pwd = (struct passwd*)getpwuid(uid); + ptr = pwd->pw_name; + if (ptr != NULL) { + if (initgroups(ptr, gid)) { + perror("initgroups"); + } + } + if (gid >= 0) { setgid(gid); |
|
From: Aaron S. <mau...@us...> - 2005-02-03 21:13:47
|
Update of /cvsroot/mauischeduler/mauisched/share In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31760/share Modified Files: maui.properties.in Log Message: merge from 1.8 Index: maui.properties.in =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/share/maui.properties.in,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** maui.properties.in 16 Apr 2003 05:43:54 -0000 1.25 --- maui.properties.in 3 Feb 2005 21:13:36 -0000 1.26 *************** *** 88,91 **** --- 88,93 ---- # Sleep interval in seconds sched.sleep=5 + # Extra sleep interval in milliseconds + sched.subsleep=0 # Basic matcher handles simple Schedulable reservations (for jobs) |
|
From: Aaron S. <mau...@us...> - 2005-02-03 20:55:29
|
Update of /cvsroot/mauischeduler/mauisched/src/unm/maui/wikid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28215/src/unm/maui/wikid Modified Files: Tag: Maui_1_8 NodeDaemonImpl.java Log Message: tweak Index: NodeDaemonImpl.java =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/wikid/NodeDaemonImpl.java,v retrieving revision 1.21 retrieving revision 1.21.4.1 diff -C2 -d -r1.21 -r1.21.4.1 *** NodeDaemonImpl.java 9 Sep 2003 20:04:14 -0000 1.21 --- NodeDaemonImpl.java 3 Feb 2005 20:55:20 -0000 1.21.4.1 *************** *** 63,66 **** --- 63,70 ---- public final transient static String minSleepProperty = ".sleep"; + public final transient static String minNodeSleepProperty = ".sleep.node"; + + public final transient static String minSubSleepProperty = ".subsleep"; + public final transient static String jobSleepProperty = ".sleep.jobstart"; *************** *** 131,134 **** --- 135,144 ---- /** + * Minimum sleep for node updates, in seconds--only used if + * present in configuration file... + */ + protected int minNodeSleep = -1; + + /** * Cryptix security library wrapper. */ *************** *** 305,309 **** str = props.getProperty(prefix+sleepIntervalProperty); if (str != null) { ! sleepInterval = Integer.parseInt(str); } --- 315,319 ---- str = props.getProperty(prefix+sleepIntervalProperty); if (str != null) { ! sleepInterval = Integer.parseInt(str) * 1000; // milliseconds } *************** *** 315,319 **** str = props.getProperty(prefix+minSleepProperty); if (str != null) { ! minSleep = Integer.parseInt(str); } --- 325,337 ---- str = props.getProperty(prefix+minSleepProperty); if (str != null) { ! minSleep = Integer.parseInt(str) * 1000; // milliseconds ! str = props.getProperty(prefix+minSubSleepProperty); ! if (str != null) { ! minSleep += Integer.parseInt(str); // miolliseconds ! } ! } ! str = props.getProperty(prefix+minNodeSleepProperty); ! if (str != null) { ! minNodeSleep = Integer.parseInt(str) * 1000; // milliseconds } *************** *** 752,756 **** // stall ... ! Thread.currentThread().sleep(jobSleep); try { --- 770,776 ---- // stall ... ! if (jobSleep > 0) { ! Thread.currentThread().sleep(jobSleep); ! } try { *************** *** 880,883 **** --- 900,906 ---- fireProlog(); + + int minisleep = (minNodeSleep >= 0) ? minNodeSleep : minSleep; + // loop handling commands until stopped while (!finished) { *************** *** 904,912 **** ++iteration; try { ! int randSleep = (int)((double)sleepInterval*(double)Math.random()) + minSleep; if (Log.logging("sched-verbose")) { Log.out.println(threadName+" sleeping for "+randSleep+" seconds"); } ! wait(randSleep*1000); } catch (InterruptedException e) { Log.err.println(e.getMessage()); --- 927,936 ---- ++iteration; try { ! int randSleep = (int)((double)sleepInterval*(double)Math.random()) + minisleep; ! if (Log.logging("sched-verbose")) { Log.out.println(threadName+" sleeping for "+randSleep+" seconds"); } ! wait(randSleep); } catch (InterruptedException e) { Log.err.println(e.getMessage()); *************** *** 1124,1128 **** Log.out.println(Thread.currentThread().getName()+" sleeping for "+randSleep+" seconds"); } ! Thread.currentThread().sleep(randSleep*1000); if (doOnce) { --- 1148,1152 ---- Log.out.println(Thread.currentThread().getName()+" sleeping for "+randSleep+" seconds"); } ! Thread.currentThread().sleep(randSleep); if (doOnce) { |
|
From: Aaron S. <mau...@us...> - 2004-07-02 21:42:33
|
Update of /cvsroot/mauischeduler/mauisched/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6542 Modified Files: Tag: Maui_1_8 sss.c Log Message: initgroups() Index: sss.c =================================================================== RCS file: /cvsroot/mauischeduler/mauisched/src/sss.c,v retrieving revision 1.13 retrieving revision 1.13.8.1 diff -C2 -d -r1.13 -r1.13.8.1 *** sss.c 25 Nov 2002 02:11:31 -0000 1.13 --- sss.c 2 Jul 2004 21:42:12 -0000 1.13.8.1 *************** *** 53,56 **** --- 53,57 ---- #include <errno.h> #include <string.h> + #include <grp.h> #include <sys/types.h> #include <sys/stat.h> *************** *** 143,146 **** --- 144,156 ---- get_stdin(buf, BUFLEN); gid = (int)strtol(buf, (char **)NULL, 10); + + pwd = (struct passwd*)getpwuid(uid); + ptr = pwd->pw_name; + if (ptr != NULL) { + if (initgroups(ptr, gid)) { + perror("initgroups"); + } + } + if (gid >= 0) { setgid(gid); |
