[Swift-commit] r3562 - in usertools/swift/swiftconfig: etc/sites etc/sites/cnari-abe etc/sites/cnari-local etc/sites/cnari-queenbee etc/sites/cnari-ranger lib/perl

[noreply at svn.ci.uchicago.edu]

Author: davidk
Date: 2010-08-23 13:08:03 -0500 (Mon, 23 Aug 2010)
New Revision: 3562

Added:
   usertools/swift/swiftconfig/etc/sites/cnari-abe/
   usertools/swift/swiftconfig/etc/sites/cnari-abe/apps
   usertools/swift/swiftconfig/etc/sites/cnari-abe/sites.xml
   usertools/swift/swiftconfig/etc/sites/cnari-local/
   usertools/swift/swiftconfig/etc/sites/cnari-local/apps
   usertools/swift/swiftconfig/etc/sites/cnari-local/sites.xml
   usertools/swift/swiftconfig/etc/sites/cnari-queenbee/
   usertools/swift/swiftconfig/etc/sites/cnari-queenbee/apps
   usertools/swift/swiftconfig/etc/sites/cnari-queenbee/sites.xml
   usertools/swift/swiftconfig/etc/sites/cnari-ranger/
   usertools/swift/swiftconfig/etc/sites/cnari-ranger/apps
   usertools/swift/swiftconfig/etc/sites/cnari-ranger/sites.xml
Modified:
   usertools/swift/swiftconfig/lib/perl/SwiftConfig.pm
Log:
Swiftconfig should now substitute $USER
Added cnari templates


Added: usertools/swift/swiftconfig/etc/sites/cnari-abe/apps
===================================================================
--- usertools/swift/swiftconfig/etc/sites/cnari-abe/apps	                        (rev 0)
+++ usertools/swift/swiftconfig/etc/sites/cnari-abe/apps	2010-08-23 18:08:03 UTC (rev 3562)
@@ -0,0 +1 @@
+cnari-abe

Added: usertools/swift/swiftconfig/etc/sites/cnari-abe/sites.xml
===================================================================
--- usertools/swift/swiftconfig/etc/sites/cnari-abe/sites.xml	                        (rev 0)
+++ usertools/swift/swiftconfig/etc/sites/cnari-abe/sites.xml	2010-08-23 18:08:03 UTC (rev 3562)
@@ -0,0 +1,18 @@
+<pool handle="cnari-abe">
+    <profile namespace="karajan" key="initialScore">10000</profile>
+    <profile namespace="karajan" key="jobThrottle">1.28</profile>
+    <profile namespace="globus" key="maxWallTime">10</profile>
+    <profile namespace="globus" key="maxTime">172800</profile>
+    <profile namespace="globus" key="slots">10</profile>
+    <profile namespace="globus" key="maxNodes">8</profile>
+    <profile namespace="globus" key="workersPerNode">8</profile>
+    <profile namespace="globus" key="nodeGranularity">8</profile>
+    <profile namespace="globus" key="queue">normal</profile>
+    <profile namespace="globus" key="project">TG-DBS080004N</profile>
+    <profile namespace="globus" key="name">configtest</profile>
+    <filesystem provider="gsiftp" url="gsiftp://gridftp-abe.ncsa.teragrid.org"/>
+    <execution provider="coaster" jobManager="gt2:gt2:PBS" url="grid-abe.ncsa.teragrid.org"/>
+    <profile namespace="globus" key="workersPerNode">8</profile>
+    <workdirectory>/scratch/users/sidgrid/$USER</workdirectory>
+</pool>
+

Added: usertools/swift/swiftconfig/etc/sites/cnari-local/apps
===================================================================
--- usertools/swift/swiftconfig/etc/sites/cnari-local/apps	                        (rev 0)
+++ usertools/swift/swiftconfig/etc/sites/cnari-local/apps	2010-08-23 18:08:03 UTC (rev 3562)
@@ -0,0 +1 @@
+cnari-local

Added: usertools/swift/swiftconfig/etc/sites/cnari-local/sites.xml
===================================================================
--- usertools/swift/swiftconfig/etc/sites/cnari-local/sites.xml	                        (rev 0)
+++ usertools/swift/swiftconfig/etc/sites/cnari-local/sites.xml	2010-08-23 18:08:03 UTC (rev 3562)
@@ -0,0 +1,7 @@
+<pool handle="cnari-local">
+  <execution provider="local" />
+  <gridftp url="local://localhost" />
+  <profile namespace="karajan" key="initialScore">10000</profile>
+  <profile key="jobThrottle" namespace="karajan">.31</profile>
+  <workdirectory>$HOME/swiftwork</workdirectory>
+</pool>

Added: usertools/swift/swiftconfig/etc/sites/cnari-queenbee/apps
===================================================================
--- usertools/swift/swiftconfig/etc/sites/cnari-queenbee/apps	                        (rev 0)
+++ usertools/swift/swiftconfig/etc/sites/cnari-queenbee/apps	2010-08-23 18:08:03 UTC (rev 3562)
@@ -0,0 +1 @@
+cnari-queenbee

Added: usertools/swift/swiftconfig/etc/sites/cnari-queenbee/sites.xml
===================================================================
--- usertools/swift/swiftconfig/etc/sites/cnari-queenbee/sites.xml	                        (rev 0)
+++ usertools/swift/swiftconfig/etc/sites/cnari-queenbee/sites.xml	2010-08-23 18:08:03 UTC (rev 3562)
@@ -0,0 +1,18 @@
+<pool handle="cnari-queenbee">
+      <profile namespace="karajan" key="initialScore">10000</profile>
+      <profile namespace="karajan" key="jobThrottle">1.28</profile>
+      <profile namespace="globus" key="maxWallTime">10</profile>
+      <profile namespace="globus" key="maxTime">172800</profile>
+      <profile namespace="globus" key="slots">10</profile>
+      <profile namespace="globus" key="maxNodes">8</profile>
+      <profile namespace="globus" key="workersPerNode">8</profile>
+      <profile namespace="globus" key="nodeGranularity">8</profile>
+      <profile namespace="globus" key="queue">workq</profile>
+      <profile namespace="globus" key="project">TG-DBS080004N</profile>
+      <profile namespace="globus" key="name">configtest</profile>
+      <filesystem provider="gsiftp" url="gridftp-qb.loni-lsu.teragrid.org:2811"/>
+      <execution provider="coaster" jobManager="gt2:gt2:PBS" url="grid-qb.loni-lsu.teragrid.org:2120"/>
+      <profile namespace="globus" key="workersPerNode">8</profile>
+      <workdirectory>/work/scommuni/$USER</workdirectory>
+</pool>
+

Added: usertools/swift/swiftconfig/etc/sites/cnari-ranger/apps
===================================================================
--- usertools/swift/swiftconfig/etc/sites/cnari-ranger/apps	                        (rev 0)
+++ usertools/swift/swiftconfig/etc/sites/cnari-ranger/apps	2010-08-23 18:08:03 UTC (rev 3562)
@@ -0,0 +1 @@
+cnari-ranger

Added: usertools/swift/swiftconfig/etc/sites/cnari-ranger/sites.xml
===================================================================
--- usertools/swift/swiftconfig/etc/sites/cnari-ranger/sites.xml	                        (rev 0)
+++ usertools/swift/swiftconfig/etc/sites/cnari-ranger/sites.xml	2010-08-23 18:08:03 UTC (rev 3562)
@@ -0,0 +1,16 @@
+<pool handle="cnari-ranger">
+      <profile namespace="karajan" key="initialScore">10000</profile>
+      <profile namespace="karajan" key="jobThrottle">1.28</profile>
+      <profile namespace="globus" key="maxWallTime">10</profile>
+      <profile namespace="globus" key="maxTime">172800</profile>
+      <profile namespace="globus" key="slots">10</profile>
+      <profile namespace="globus" key="maxNodes">8</profile>
+      <profile namespace="globus" key="workersPerNode">16</profile>
+      <profile namespace="globus" key="nodeGranularity">16</profile>
+      <profile namespace="globus" key="queue">long</profile>
+      <profile namespace="globus" key="project">TG-DBS080004N</profile>
+      <filesystem provider="gsiftp" url="gsiftp://gridftp.ranger.tacc.teragrid.org"/>
+      <execution provider="coaster" jobManager="gt2:gt2:SGE" url="gatekeeper.ranger.tacc.teragrid.org"/>
+      <profile namespace="globus" key="workersPerNode">16</profile>
+      <workdirectory>/work/00926/tg459516/sidgrid_out/$USER</workdirectory>
+</pool>

Modified: usertools/swift/swiftconfig/lib/perl/SwiftConfig.pm
===================================================================
--- usertools/swift/swiftconfig/lib/perl/SwiftConfig.pm	2010-08-23 05:26:28 UTC (rev 3561)
+++ usertools/swift/swiftconfig/lib/perl/SwiftConfig.pm	2010-08-23 18:08:03 UTC (rev 3562)
@@ -292,6 +292,7 @@
     # Work directory
     if ( $xml_ref->{workdirectory} ) {
         $xml_ref->{workdirectory}[0] =~ s/\$HOME/$ENV{'HOME'}/;
+	$xml_ref->{workdirectory}[0] =~ s/\$USER/$ENV{'USER'}/;
         $xml_ref->{workdirectory} =
             [ get_entry( 'Work Directory', $xml_ref->{workdirectory}[0], $option_default) ];
     }