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

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2013-12-03 10:15:47 -0600 (Tue, 03 Dec 2013)
New Revision: 7362

Modified:
   SwiftApps/Swift-MapRed/mapred_combiner_V4/multiple.xml
   SwiftApps/Swift-MapRed/mapred_combiner_V4/setup.sh
Log:
small changes to setup

Modified: SwiftApps/Swift-MapRed/mapred_combiner_V4/multiple.xml
===================================================================
--- SwiftApps/Swift-MapRed/mapred_combiner_V4/multiple.xml	2013-12-03 16:06:10 UTC (rev 7361)
+++ SwiftApps/Swift-MapRed/mapred_combiner_V4/multiple.xml	2013-12-03 16:15:47 UTC (rev 7362)
@@ -24,7 +24,7 @@
     <profile namespace="globus" key="maxtime">1200</profile>
     <profile namespace="globus" key="maxWalltime">00:10:00</profile>
     <profile namespace="globus" key="queue">development</profile> 
-    <profile namespace="globus" key="userHomeOverride">/lustre/beagle/BEAGLE_USERNAME/swiftwork</profile>
+    <profile namespace="globus" key="userHomeOverride">/lustre/beagle/yadunandb/swiftwork</profile>
     <profile namespace="globus" key="slots">1</profile>
     <profile namespace="globus" key="maxnodes">4</profile>
     <profile namespace="globus" key="nodeGranularity">4</profile>
@@ -32,8 +32,8 @@
     <profile namespace="karajan" key="initialScore">10000</profile>
     <!-- <profile namespace="karajan" key="workerLoggingLevel">trace</profile> -->
     <profile namespace="globus" key="workerLoggingLevel">DEBUG</profile>
-    <!-- <workdirectory>/lustre/beagle/MIDWAY_USERNAMEb/swiftwork</workdirectory> -->
-    <workdirectory>/tmp/BEAGLE_USERNAME/swiftwork</workdirectory>
+    <!-- <workdirectory>/lustre/beagle/yadunandb/swiftwork</workdirectory> -->
+    <workdirectory>/tmp/yadunandb/swiftwork</workdirectory>
  </pool>
 
 
@@ -49,15 +49,15 @@
     <profile namespace="globus" key="maxtime">2400</profile>
     <profile namespace="globus" key="maxWalltime">00:20:00</profile>
     <profile namespace="globus" key="queue">batch</profile>
-    <profile namespace="globus" key="userHomeOverride">/lustre/beagle/BEAGLE_USERNAME/swiftwork</profile>
+    <profile namespace="globus" key="userHomeOverride">/lustre/beagle/yadunandb/swiftwork</profile>
     <profile namespace="globus" key="slots">1</profile>
     <profile namespace="globus" key="maxnodes">4</profile>
     <profile namespace="globus" key="nodeGranularity">1</profile>
     <profile namespace="karajan" key="jobThrottle">1.00</profile>
     <profile namespace="karajan" key="initialScore">10000</profile>
     <!-- <filesystem provider="local"/> -->
-    <!-- <workdirectory>/lustre/beagle/BEAGLE_USERNAME/swiftwork</workdirectory> -->
-   <workdirectory>/tmp/BEAGLE_USERNAME/swiftwork</workdirectory>
+    <!-- <workdirectory>/lustre/beagle/yadunandb/swiftwork</workdirectory> -->
+   <workdirectory>/tmp/yadunandb/swiftwork</workdirectory>
   </pool>
 
   <pool handle="beagle_remote">
@@ -68,14 +68,14 @@
     <profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24;pbs.resource_list=advres=wilde.1768</profile>
     <profile namespace="globus" key="maxtime">1200</profile>
     <profile namespace="globus" key="maxWalltime">00:10:00</profile>
-    <profile namespace="globus" key="userHomeOverride">/lustre/beagle/BEAGLE_USERNAME/swiftwork</profile>
+    <profile namespace="globus" key="userHomeOverride">/lustre/beagle/yadunandb/swiftwork</profile>
     <profile namespace="globus" key="slots">1</profile>
     <profile namespace="globus" key="maxnodes">1</profile>
     <profile namespace="globus" key="nodeGranularity">1</profile>
     <profile namespace="karajan" key="jobThrottle">1.00</profile>
     <profile namespace="karajan" key="initialScore">10000</profile>
-    <!-- <workdirectory>/tmp/BEAGLE_USERNAME/swiftwork</workdirectory> -->
-    <workdirectory>/lustre/beagle/BEAGLE_USERNAME/swiftwork</workdirectory>
+    <!-- <workdirectory>/tmp/yadunandb/swiftwork</workdirectory> -->
+    <workdirectory>/lustre/beagle/yadunandb/swiftwork</workdirectory>
   </pool>
 
   <pool handle="midway">
@@ -93,7 +93,7 @@
     <profile namespace="globus" key="nodeGranularity">4</profile>
     <profile namespace="karajan" key="jobThrottle">.64</profile>
     <profile namespace="karajan" key="initialScore">10000</profile>
-    <workdirectory>/tmp/MIDWAY_USERNAME</workdirectory>
+    <workdirectory>/tmp/yadunand</workdirectory>
   </pool>
 
 </config>

Modified: SwiftApps/Swift-MapRed/mapred_combiner_V4/setup.sh
===================================================================
--- SwiftApps/Swift-MapRed/mapred_combiner_V4/setup.sh	2013-12-03 16:06:10 UTC (rev 7361)
+++ SwiftApps/Swift-MapRed/mapred_combiner_V4/setup.sh	2013-12-03 16:15:47 UTC (rev 7362)
@@ -1,15 +1,17 @@
 #!/bin/bash
 
+set -x
 # Configure the following before proceeding the run the scripts
 
-[ ! -z $BEAGLE_USERNAME ] || BEAGLE_USERNAME="yadunandb"
-[ ! -z $MIDWAY_USERNAME ] || MIDWAY_USERNAME="yadunand"
+[ ! -z $BEAGLE_USERNAME ] || BEAGLE_USERNAME="ketan"
+[ ! -z $MIDWAY_USERNAME ] || MIDWAY_USERNAME="maheshwari"
 
 # Do not change
 BEAGLE_SHARE_FOLDER=/lustre/beagle/$BEAGLE_USERNAME/bin/
 MIDWAY_SHARE_FOLDER=/scratch/midway/$MIDWAY_USERNAME/bin/
+
 echo "$BEAGLE_SHARE_FOLDER is in PATH on BEAGLE"
-echo "MIDWAY_SHARE_FOLDER is in PATH on MIDWAY"
+echo "$MIDWAY_SHARE_FOLDER is in PATH on MIDWAY"
 
 if [ -f "map_wrapper.sh" ];then
     sed -i "s/BEAGLE\_USERNAME/$BEAGLE_USERNAME/g" map_wrapper.sh