[Swift-commit] r7364 - SwiftApps/Swift-MapRed/mapred_combiner_V4

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2013-12-03 10:50:55 -0600 (Tue, 03 Dec 2013)
New Revision: 7364

Modified:
   SwiftApps/Swift-MapRed/mapred_combiner_V4/README
   SwiftApps/Swift-MapRed/mapred_combiner_V4/setup.sh
   SwiftApps/Swift-MapRed/mapred_combiner_V4/sites.midway.xml
Log:
small updates

Modified: SwiftApps/Swift-MapRed/mapred_combiner_V4/README
===================================================================
--- SwiftApps/Swift-MapRed/mapred_combiner_V4/README	2013-12-03 16:45:37 UTC (rev 7363)
+++ SwiftApps/Swift-MapRed/mapred_combiner_V4/README	2013-12-03 16:50:55 UTC (rev 7364)
@@ -63,7 +63,7 @@
 Example - Blastreduce
 =====================
 Run the blast reduce example as follows:
-swift -sites.file sites.local.xml -tc.file tc.data -config swift.properties blastreduce.swift
+swift -sites.file sites.midway.xml -tc.file tc.data -config swift.properties blastreduce.swift
 
 
 Describe workflow

Modified: SwiftApps/Swift-MapRed/mapred_combiner_V4/setup.sh
===================================================================
--- SwiftApps/Swift-MapRed/mapred_combiner_V4/setup.sh	2013-12-03 16:45:37 UTC (rev 7363)
+++ SwiftApps/Swift-MapRed/mapred_combiner_V4/setup.sh	2013-12-03 16:50:55 UTC (rev 7364)
@@ -31,10 +31,10 @@
 chmod a+x exec_server
 chmod a+x exec_client
 
-scp exec_server swift.rcc.uchicago.edu:$MIDWAY_SHARE_FOLDER
-scp exec_client swift.rcc.uchicago.edu:$MIDWAY_SHARE_FOLDER
-scp exec_server login4.beagle.ci.uchicago.edu:$BEAGLE_SHARE_FOLDER
-scp exec_client login4.beagle.ci.uchicago.edu:$BEAGLE_SHARE_FOLDER
+scp exec_server $MIDWAY_USERNAME at swift.rcc.uchicago.edu:$MIDWAY_SHARE_FOLDER
+scp exec_client $MIDWAY_USERNAME at swift.rcc.uchicago.edu:$MIDWAY_SHARE_FOLDER
+scp exec_server $BEAGLE_USERNAME at login4.beagle.ci.uchicago.edu:$BEAGLE_SHARE_FOLDER
+scp exec_client $BEAGLE_USERNAME at login4.beagle.ci.uchicago.edu:$BEAGLE_SHARE_FOLDER
 
 sed -i "s/BEAGLE\_USERNAME/$BEAGLE_USERNAME/g" *xml
 sed -i "s/MIDWAY\_USERNAME/$MIDWAY_USERNAME/g" *xml

Modified: SwiftApps/Swift-MapRed/mapred_combiner_V4/sites.midway.xml
===================================================================
--- SwiftApps/Swift-MapRed/mapred_combiner_V4/sites.midway.xml	2013-12-03 16:45:37 UTC (rev 7363)
+++ SwiftApps/Swift-MapRed/mapred_combiner_V4/sites.midway.xml	2013-12-03 16:50:55 UTC (rev 7364)
@@ -13,16 +13,8 @@
     <profile namespace="globus" key="slots">1</profile>
     <profile namespace="globus" key="maxNodes">2</profile>
     <profile namespace="globus" key="nodeGranularity">2</profile>
-    <profile namespace="karajan" key="jobThrottle">.1</profile>
+    <profile namespace="karajan" key="jobThrottle">.2</profile>
     <profile namespace="karajan" key="initialScore">10000</profile>
     <workdirectory>/tmp/maheshwari/swift.work</workdirectory>
   </pool>
-   <pool handle="localhost">
-     <execution provider="local" />
-     <profile namespace="karajan" key="jobThrottle">0</profile>
-     <profile namespace="karajan" key="initialScore">10000</profile>
-     <filesystem provider="local"/>
-     <workdirectory>/tmp/swift.work</workdirectory>
-     <profile namespace="swift" key="stagingMethod">local</profile>
-   </pool>
 </config>