[Swift-commit] r6793 - in SwiftTutorials/ATPESC_2013-08-06: cloud part02 part03 part05 part06 part07
ketan at ci.uchicago.edu
ketan at ci.uchicago.edu
Tue Aug 6 15:28:52 CDT 2013
Author: ketan
Date: 2013-08-06 15:28:52 -0500 (Tue, 06 Aug 2013)
New Revision: 6793
Modified:
SwiftTutorials/ATPESC_2013-08-06/cloud/README
SwiftTutorials/ATPESC_2013-08-06/cloud/addcloud.sh
SwiftTutorials/ATPESC_2013-08-06/cloud/hosts.txt
SwiftTutorials/ATPESC_2013-08-06/cloud/sites.xml
SwiftTutorials/ATPESC_2013-08-06/cloud/tc.data
SwiftTutorials/ATPESC_2013-08-06/part02/apps
SwiftTutorials/ATPESC_2013-08-06/part03/apps
SwiftTutorials/ATPESC_2013-08-06/part05/apps
SwiftTutorials/ATPESC_2013-08-06/part06/apps
SwiftTutorials/ATPESC_2013-08-06/part07/apps
SwiftTutorials/ATPESC_2013-08-06/part07/sites.xml
Log:
adding persistent coasters line to apps
Modified: SwiftTutorials/ATPESC_2013-08-06/cloud/README
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/cloud/README 2013-08-06 20:24:37 UTC (rev 6792)
+++ SwiftTutorials/ATPESC_2013-08-06/cloud/README 2013-08-06 20:28:52 UTC (rev 6793)
@@ -12,6 +12,10 @@
swift -sites.file sites.xml -config cf -tc.file tc p7.swift
swift -sites.file sites.xml -config cf -tc.file tc p8.swift
swift -sites.file sites.xml -config cf -tc.file tc p9.swift
+- Add the cloud resources to existing non-cloud examples:
+ ./addcloud.sh <dir> #where dir is a tutorial script directory
+ e.g.
+ ./addcloud.sh ../p01 #will add cloud resources to p01 sites pool
- Finally, to clean up the log files, kill agent and shutdown the coaster service:
./cleanme
Modified: SwiftTutorials/ATPESC_2013-08-06/cloud/addcloud.sh
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/cloud/addcloud.sh 2013-08-06 20:24:37 UTC (rev 6792)
+++ SwiftTutorials/ATPESC_2013-08-06/cloud/addcloud.sh 2013-08-06 20:28:52 UTC (rev 6793)
@@ -1,5 +1,9 @@
#!/bin/bash
+#Add cloud resource pool to a sites file.
+#Usage: ./addcloud.sh <dirname>
+#Will add the cloud resource pool to the sites.xml file in <dirname> provided as an arg
+
EXPECTED_ARGS=1
if [ $# -ne $EXPECTED_ARGS ]
@@ -9,15 +13,10 @@
exit 1
fi
-sed -n '2,12 p' sites.xml > poolentry.xml
+sed -e 's/<config>//' -e 's/<\/config>//' sites.xml > poolentry.xml
cloudpool=$(cat poolentry.xml)
-#echo $cloudpool
-#sed '/\<\/config\>/i\
-#$(cloudpool)' $1/sites.xml
-#echo $cloudpool
-
sed -i "/<\/config>/i\
$(echo $cloudpool | sed -e 's/\\/\\\\/g' -e 's/\//\\\//g')" $1/sites.xml
Modified: SwiftTutorials/ATPESC_2013-08-06/cloud/hosts.txt
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/cloud/hosts.txt 2013-08-06 20:24:37 UTC (rev 6792)
+++ SwiftTutorials/ATPESC_2013-08-06/cloud/hosts.txt 2013-08-06 20:28:52 UTC (rev 6793)
@@ -1,3 +1,3 @@
54.214.98.22
-54.212.81.224
-54.212.72.98
+54.212.124.129
+54.218.221.157
Modified: SwiftTutorials/ATPESC_2013-08-06/cloud/sites.xml
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/cloud/sites.xml 2013-08-06 20:24:37 UTC (rev 6792)
+++ SwiftTutorials/ATPESC_2013-08-06/cloud/sites.xml 2013-08-06 20:28:52 UTC (rev 6793)
@@ -1,7 +1,7 @@
<config>
<pool handle="persistent-coasters">
<execution provider="coaster-persistent"
- url="http://localhost:52379"
+ url="http://localhost:44120"
jobmanager="local:local"/>
<profile namespace="globus" key="workerManager">passive</profile>
<profile namespace="globus" key="jobsPerNode">8</profile>
Modified: SwiftTutorials/ATPESC_2013-08-06/cloud/tc.data
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/cloud/tc.data 2013-08-06 20:24:37 UTC (rev 6792)
+++ SwiftTutorials/ATPESC_2013-08-06/cloud/tc.data 2013-08-06 20:28:52 UTC (rev 6793)
@@ -82,3 +82,6 @@
persistent-coasters cat /bin/cat null null null
persistent-coasters bash /bin/bash null null null
persistent-coasters echo /bin/echo null null null
+persistent-coasters cat /bin/cat null null null
+persistent-coasters bash /bin/bash null null null
+persistent-coasters echo /bin/echo null null null
Modified: SwiftTutorials/ATPESC_2013-08-06/part02/apps
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/part02/apps 2013-08-06 20:24:37 UTC (rev 6792)
+++ SwiftTutorials/ATPESC_2013-08-06/part02/apps 2013-08-06 20:28:52 UTC (rev 6793)
@@ -1 +1,2 @@
localhost simulate simulate.sh
+persistent-coasters simulate simulate.sh
Modified: SwiftTutorials/ATPESC_2013-08-06/part03/apps
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/part03/apps 2013-08-06 20:24:37 UTC (rev 6792)
+++ SwiftTutorials/ATPESC_2013-08-06/part03/apps 2013-08-06 20:28:52 UTC (rev 6793)
@@ -1 +1,2 @@
localhost simulate simulate.sh
+persistent-coasters simulate simulate.sh
Modified: SwiftTutorials/ATPESC_2013-08-06/part05/apps
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/part05/apps 2013-08-06 20:24:37 UTC (rev 6792)
+++ SwiftTutorials/ATPESC_2013-08-06/part05/apps 2013-08-06 20:28:52 UTC (rev 6793)
@@ -1,2 +1,4 @@
localhost simulate simulate.sh
localhost stats stats.sh
+persistent-coasters simulate simulate.sh
+persistent-coasters stats stats.sh
Modified: SwiftTutorials/ATPESC_2013-08-06/part06/apps
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/part06/apps 2013-08-06 20:24:37 UTC (rev 6792)
+++ SwiftTutorials/ATPESC_2013-08-06/part06/apps 2013-08-06 20:28:52 UTC (rev 6793)
@@ -1,2 +1,4 @@
localhost simulate simulate.sh
localhost stats stats.sh
+persistent-coasters simulate simulate.sh
+persistent-coasters stats stats.sh
Modified: SwiftTutorials/ATPESC_2013-08-06/part07/apps
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/part07/apps 2013-08-06 20:24:37 UTC (rev 6792)
+++ SwiftTutorials/ATPESC_2013-08-06/part07/apps 2013-08-06 20:28:52 UTC (rev 6793)
@@ -1 +1,2 @@
tukey sh /bin/bash
+persistent-coasters sh /bin/bash
Modified: SwiftTutorials/ATPESC_2013-08-06/part07/sites.xml
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/part07/sites.xml 2013-08-06 20:24:37 UTC (rev 6792)
+++ SwiftTutorials/ATPESC_2013-08-06/part07/sites.xml 2013-08-06 20:28:52 UTC (rev 6793)
@@ -11,4 +11,5 @@
<profile namespace="globus" key="maxTime">900</profile>
<workdirectory>/home/{env.USER}/swiftwork</workdirectory>
</pool>
+<pool handle="persistent-coasters"> <execution provider="coaster-persistent" url="http://localhost:52379" jobmanager="local:local"/> <profile namespace="globus" key="workerManager">passive</profile> <profile namespace="globus" key="jobsPerNode">8</profile> <profile key="jobThrottle" namespace="karajan">.23999</profile> <profile namespace="karajan" key="initialScore">10000</profile> <filesystem provider="local" url="none" /> <workdirectory>/tmp/ketan</workdirectory> </pool>
</config>
More information about the Swift-commit
mailing list