[Swift-commit] r5225 - trunk/bin/grid

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2011-10-12 14:58:24 -0500 (Wed, 12 Oct 2011)
New Revision: 5225

Modified:
   trunk/bin/grid/foreachsite
   trunk/bin/grid/mk_catalog.rb
   trunk/bin/grid/my-swift-workers
   trunk/bin/grid/ress.rb
Log:
 

Modified: trunk/bin/grid/foreachsite
===================================================================
--- trunk/bin/grid/foreachsite	2011-10-12 18:53:30 UTC (rev 5224)
+++ trunk/bin/grid/foreachsite	2011-10-12 19:58:24 UTC (rev 5225)
@@ -66,7 +66,6 @@
 queue
 
 END
-
     condor_submit condor.sub
   )
 done

Modified: trunk/bin/grid/mk_catalog.rb
===================================================================
--- trunk/bin/grid/mk_catalog.rb	2011-10-12 18:53:30 UTC (rev 5224)
+++ trunk/bin/grid/mk_catalog.rb	2011-10-12 19:58:24 UTC (rev 5225)
@@ -146,7 +146,8 @@
 ]
 
 def ress_query(class_ads)
-  cmd = "condor_status -pool engage-submit.renci.org"
+  cmd = "condor_status -pool engage-central.renci.org"
+  #cmd = "condor_status -pool osg-ress-1.fnal.gov" 
   class_ads[0..-2].each do |class_ad|
     cmd << " -format \"%s|\" #{class_ad}"
   end

Modified: trunk/bin/grid/my-swift-workers
===================================================================
--- trunk/bin/grid/my-swift-workers	2011-10-12 18:53:30 UTC (rev 5224)
+++ trunk/bin/grid/my-swift-workers	2011-10-12 19:58:24 UTC (rev 5225)
@@ -22,7 +22,7 @@
 
 
 class Site
-  attr_accessor :grid_resource, :gridftp, :data_dir, :app_dir, :name, :port
+  attr_accessor :grid_resource, :gridftp, :data_dir, :app_dir, :name, :sport, :wport
   attr_reader :submit_file
 
   # **Ketan: Generate the worker job
@@ -49,7 +49,7 @@
       globus_rsl    = (maxwalltime=240)
       grid_resource = <%= @grid_resource %>
       executable    = #{workerWrapper}
-      arguments     = #{workerContact} <%= @name.gsub(/__.*/,"") %> /tmp
+      arguments     = #{workerContact}:<%= @wport.to_i %> <%= @name.gsub(/__.*/,"") %> /tmp
       environment   = WORKER_LOGGING_LEVEL=INFO
       Input         = #{workerExecutable}
       Error         = condor/$(Process).err
@@ -93,7 +93,6 @@
     $VERBOSE=ov
     jobs.split(" ").size
   end
-
 end
 
 =begin
@@ -200,12 +199,14 @@
     site               = Site.new
     site.name          = name
     site.grid_resource = "gt2 #{value.url}/jobmanager-#{value.jm}"
+    #site.grid_resource = "gt2 #{value.url}/jobmanager-fork"
     site.gridftp       = "gsiftp://#{value.url}"
     site.app_dir       = value.app_dir
     site.data_dir      = value.data_dir
     #site.port          = start_port + ctr
-    site.port          = service_ports[ctr] #**Ketan: assuming this is the worker that needs to connect back to its corresponding service
-    
+    site.sport          = service_ports[ctr] #**Ketan: assuming this is the worker that needs to connect back to its corresponding service
+    site.wport          = worker_ports[ctr]
+
     sites.push site
 
     # **Ketan: can put the coasters_osg.xml template right here.
@@ -219,12 +220,12 @@
         sitename = asite.name
       %>
       <pool handle="<%=sitename%>">
-       <execution provider="coaster-persistent" url="http://localhost:<%= service_ports[ctr]%>" jobmanager="local:local" />
+       <execution provider="coaster-persistent" url="http://localhost:<%= service_ports[ctr].chomp %>" jobmanager="local:local" />
        <profile namespace="globus" key="workerManager">passive</profile>
        <profile namespace="karajan" key="initialScore">10000</profile>
        <profile namespace="karajan" key="jobThrottle">2.99</profile>
        <profile namespace="globus" key="jobsPerNode">16</profile>
-       <gridftp  url="gsiftp://<%=gftp%>"/>
+       <gridftp  url="<%=gftp%>"/>
        <workdirectory><%=data_dir%>/swift_scratch</workdirectory>
       </pool>
       <% ctr += 1
@@ -332,6 +333,5 @@
      r=50 q=25
 =end
 
-
 #dump("coaster_osg.xml", coaster_sites, binding)
 

Modified: trunk/bin/grid/ress.rb
===================================================================
--- trunk/bin/grid/ress.rb	2011-10-12 18:53:30 UTC (rev 5224)
+++ trunk/bin/grid/ress.rb	2011-10-12 19:58:24 UTC (rev 5225)
@@ -47,9 +47,7 @@
       value.app_dir += dir_suffix
       value.data_dir += dir_suffix
     end
-
     yield name, value
   end
 end
 
-