[Swift-commit] r6873 - in SwiftTutorials/CIC_2013-08-09: cloud doc part08
wilde at ci.uchicago.edu
wilde at ci.uchicago.edu
Thu Aug 15 13:31:07 CDT 2013
Author: wilde
Date: 2013-08-15 13:31:07 -0500 (Thu, 15 Aug 2013)
New Revision: 6873
Removed:
SwiftTutorials/CIC_2013-08-09/cloud/README
SwiftTutorials/CIC_2013-08-09/cloud/addcloud.sh
SwiftTutorials/CIC_2013-08-09/cloud/cleanme
Modified:
SwiftTutorials/CIC_2013-08-09/cloud/apps
SwiftTutorials/CIC_2013-08-09/doc/TODO
SwiftTutorials/CIC_2013-08-09/part08/sites.xml
Log:
for cic
Deleted: SwiftTutorials/CIC_2013-08-09/cloud/README
===================================================================
--- SwiftTutorials/CIC_2013-08-09/cloud/README 2013-08-15 17:30:06 UTC (rev 6872)
+++ SwiftTutorials/CIC_2013-08-09/cloud/README 2013-08-15 18:31:07 UTC (rev 6873)
@@ -1,32 +0,0 @@
-Quick steps
------------
-- Change to cloud dir:
- cd ~/cloud
-- Copy the private key tutorial.pem to your .ssh dir:
- cp tutorial.pem ~/.ssh/
-- Source the setup script on command line:
- source ./setup
-- Run the catsn Swift script:
- ./run.catsn
-- Run the simanalyze Swift script:
- 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 create a new site pool "both.xml"
-
-- Finally, to clean up the log files, kill agent and shutdown the coaster service:
- ./cleanme
-
-Notes
------
-The run.catsn contains the full commandline to call Swift scripts with configuration files. This is how they look like:
-
-catsn:
-swift -sites.file sites.xml -tc.file tc -config cf catsn.swift -n=10
-
-To know more about the configuration files, see Swift user-guide:
-http://www.ci.uchicago.edu/swift/guides/release-0.94/userguide/userguide.html
-
Deleted: SwiftTutorials/CIC_2013-08-09/cloud/addcloud.sh
===================================================================
--- SwiftTutorials/CIC_2013-08-09/cloud/addcloud.sh 2013-08-15 17:30:06 UTC (rev 6872)
+++ SwiftTutorials/CIC_2013-08-09/cloud/addcloud.sh 2013-08-15 18:31:07 UTC (rev 6873)
@@ -1,27 +0,0 @@
-#!/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 ]
-then
- echo "Expecting 1 arg : Got $*"
- echo "usage $0 <targetdirectory>"
- exit 1
-fi
-
-sed -e 's/<config>//' -e 's/<\/config>//' sites.xml > poolentry.xml
-
-cloudpool=$(cat poolentry.xml)
-
-#escape some characters and add pool entry to sites file
-sed "/<\/config>/i\
-$(echo $cloudpool | sed -e 's/\\/\\\\/g' -e 's/\//\\\//g')" $1/sites.xml > $1/both.xml
-
-echo "Done."
-echo "To run with the new setup, cd into $1 and use '-sites.file both.xml' option with Swift commandline"
-echo "eg. swift <p<xx>.swift> -sites.file both.xml"
-
Modified: SwiftTutorials/CIC_2013-08-09/cloud/apps
===================================================================
--- SwiftTutorials/CIC_2013-08-09/cloud/apps 2013-08-15 17:30:06 UTC (rev 6872)
+++ SwiftTutorials/CIC_2013-08-09/cloud/apps 2013-08-15 18:31:07 UTC (rev 6873)
@@ -1,9 +1,3 @@
-persistent-coasters echo echo
persistent-coasters sh /bin/bash
localhost local_sh /bin/bash
-persistent-coasters cat cat
-persistent-coasters random /root/cloud/bin/random.sh
-persistent-coasters average /root/cloud/bin/avg.sh
-persistent-coasters randpl /root/cloud/bin/random.pl
-persistent-coasters calcpi /root/cloud/bin/pi.sh
Deleted: SwiftTutorials/CIC_2013-08-09/cloud/cleanme
===================================================================
--- SwiftTutorials/CIC_2013-08-09/cloud/cleanme 2013-08-15 17:30:06 UTC (rev 6872)
+++ SwiftTutorials/CIC_2013-08-09/cloud/cleanme 2013-08-15 18:31:07 UTC (rev 6873)
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-echo "cleaning up ..."
-rm -rf outdir/ *.d *.log *.rlog logs hi.* *.kml *.swiftx _concurrent output
-
-echo "stopping coaster service"
-stop-coaster-service
-
-echo "Killing ssh-agent"
-killall -u $USER ssh-agent
-
Modified: SwiftTutorials/CIC_2013-08-09/doc/TODO
===================================================================
--- SwiftTutorials/CIC_2013-08-09/doc/TODO 2013-08-15 17:30:06 UTC (rev 6872)
+++ SwiftTutorials/CIC_2013-08-09/doc/TODO 2013-08-15 18:31:07 UTC (rev 6873)
@@ -8,6 +8,10 @@
get hosts.txt for cloud dynamically
+Show variety of UC3 activity and what ran where
+
+
+
ISSUES
error in pin files? debug and turn back on
Modified: SwiftTutorials/CIC_2013-08-09/part08/sites.xml
===================================================================
--- SwiftTutorials/CIC_2013-08-09/part08/sites.xml 2013-08-15 17:30:06 UTC (rev 6872)
+++ SwiftTutorials/CIC_2013-08-09/part08/sites.xml 2013-08-15 18:31:07 UTC (rev 6873)
@@ -1,7 +1,7 @@
<config>
<pool handle="uc3">
<execution provider="coaster" jobmanager="local:condor"/>
- <profile namespace="karajan" key="jobThrottle">10.00</profile>
+ <profile namespace="karajan" key="jobThrottle">2.00</profile>
<profile namespace="karajan" key="initialScore">10000</profile>
<profile namespace="globus" key="jobsPerNode">1</profile>
<profile namespace="globus" key="maxtime">300</profile>
@@ -14,9 +14,10 @@
<profile namespace="globus" key="condor.+AccountingGroup">"group_friends.{env.USER}"</profile>
<profile namespace="globus" key="jobType">nonshared</profile>
- <!-- Requirements = regexp("uc3-c*", Machine) -->
- <!-- <profile namespace="globus" key="condor.Requirements">regexp("uc3-c*", Machine)</profile> -->
- <!-- <profile namespace="globus" key="condor.Requirements">UidDomain == "osg-gk.mwt2.org"</profile> -->
+ <!-- UC3 --> <profile namespace="globus" key="condor.Requirements">regexp("uc3-c*", Machine)</profile>
+ <!-- MWT2 --> <!-- <profile namespace="globus" key="condor.Requirements">UidDomain == "osg-gk.mwt2.org"</profile> -->
+ <!-- OSG --> <!-- <profile namespace="globus" key="condor.Requirements">isUndefined(GLIDECLIENT_Name) == FALSE</profile> -->
+ <!-- MULT --> <!-- <profile namespace="globus" key="condor.Requirements">UidDomain == "osg-gk.mwt2.org" && (regexp("iut2-c*", Machine) || regexp("uct2-c*", Machine)) </profile> -->
<workdirectory>.</workdirectory>
</pool>
More information about the Swift-commit
mailing list