[gavia-ms-commit] r1276 - trunk/MetaScheduling/GridResourceAdvertise

[commit at globus.org]

Author: andre
Date: 2009-07-07 12:43:34 -0500 (Tue, 07 Jul 2009)
New Revision: 1276

Modified:
   trunk/MetaScheduling/GridResourceAdvertise/classad.conf
   trunk/MetaScheduling/GridResourceAdvertise/classad.pm
Log:
bugfix 6173; the resource status, the resource rank and the resource current rank are now configurable via the classad.conf file

Modified: trunk/MetaScheduling/GridResourceAdvertise/classad.conf
===================================================================
--- trunk/MetaScheduling/GridResourceAdvertise/classad.conf	2009-07-07 15:16:47 UTC (rev 1275)
+++ trunk/MetaScheduling/GridResourceAdvertise/classad.conf	2009-07-07 17:43:34 UTC (rev 1276)
@@ -54,3 +54,12 @@
 
 # TODO: Describe this (default: yes)
 #show_cn = @showCN@
+
+# Resource status  (default = 'Production')
+#resource_status = Production
+
+# Resource rank (default = '0.000000')
+#resource_rank = 0.000000
+
+# Resource current rank (default = '0.000000')
+#resource_current_rank = 0.000000

Modified: trunk/MetaScheduling/GridResourceAdvertise/classad.pm
===================================================================
--- trunk/MetaScheduling/GridResourceAdvertise/classad.pm	2009-07-07 15:16:47 UTC (rev 1275)
+++ trunk/MetaScheduling/GridResourceAdvertise/classad.pm	2009-07-07 17:43:34 UTC (rev 1276)
@@ -289,7 +289,14 @@
 
 my $grid_type = undef; # Default is GT 4
 
+my $resource_status = "Production";
 
+my $resource_rank = "0.000000";
+
+my $resource_current_rank = "0.000000";
+
+
+
 # NOTE
 # Instead of defining $ncpusReserved in classad.conf with
 #    reserved_cpus = 10
@@ -527,6 +534,10 @@
 $condor_home = $config{condor_home} if ( $config{condor_home} );
 $condor_config = $config{condor_config} if ( $config{condor_config} );
 
+$resource_status = $config{resource_status} if ( $config{resource_status} );
+$resource_rank = $config{resource_rank} if ( $config{resource_rank} );
+$resource_current_rank = $config{resource_current_rank} if ( $config{resource_current_rank} );
+
 #
 # Check that all required params are defined and valid
 #
@@ -631,6 +642,9 @@
     print "  condor_home  = $condor_home\n";
     print "  condor_config  = $condor_config\n"  if ( $condor_config );
     print "  probe_interval = $probe_interval\n" if ( $probe_interval );
+    print "  resource_status = $resource_status\n";
+    print "  resource_rank = $resource_rank\n";
+    print "  resource_current_rank = $resource_current_rank\n";
 }
 
 #exit;
@@ -2621,8 +2635,8 @@
 CpuModel              = "$cpuModel"
 $ad{'OpSys'}{$ns}     = "$opSys"
 Requirements          = $req
-Rank                  = 0.000000
-CurrentRank           = 0.000000
+Rank                  = $resource_rank
+CurrentRank           = $resource_current_rank
 WantAdRevaluate       = $ad_re_eval
 CurMatches            = 0
 MaxMatches            = $ncpuFree
@@ -2635,7 +2649,7 @@
 job_manager_type      = "$lrms_name_condorg"
 $ad{'queue'}{$ns}      = "$input_queue"
 $ad{'hostname'}{$ns}   = "$resource_name"
-$ad{'status'}{$ns}     = "Production"
+$ad{'status'}{$ns}     = "$resource_status"
 $ad{'totalCPUs'}{$ns}      = $ncpuAvail
 $ad{'availCPUs'}{$ns}  = $ncpuUnused
 $ad{'freeCPUs'}{$ns}       = $ncpuFree
@@ -2760,7 +2774,7 @@
         <GateKeeperPort>8443</GateKeeperPort>
         <JobManager>ManagedJobFactoryService-$LRMS_NAME</JobManager>        
         <ContactString>https://$resource_name:8443/wsrf/services/ManagedJobFactoryService</ContactString>
-        <Status>Production</Status>
+        <Status>$resource_status</Status>
         <RunningJobs>$jobs_running</RunningJobs>
         <WaitingJobs>$jobs_waiting</WaitingJobs>
         <TotalJobs>$jobs_total</TotalJobs>
@@ -2787,8 +2801,8 @@
         <ResourceClassAd_AEnteredCurrentActivity>$activity_timestamp</ResourceClassAd_AEnteredCurrentActivity>
         <ResourceClassAd_State>$state_condorg</ResourceClassAd_State>
         <ResourceClassAd_Requirements>$req</ResourceClassAd_Requirements>
-        <ResourceClassAd_Rank>0.000000</ResourceClassAd_Rank>
-        <ResourceClassAd_CurrentRank>0.000000</ResourceClassAd_CurrentRank>
+        <ResourceClassAd_Rank>$resource_rank</ResourceClassAd_Rank>
+        <ResourceClassAd_CurrentRank>$resource_current_rank</ResourceClassAd_CurrentRank>
         <ResourceClassAd_WantAdRevaluate>$ad_re_eval</ResourceClassAd_WantAdRevaluate>
         <ResourceClassAd_CurMatches>0</ResourceClassAd_CurMatches>
         <ResourceClassAd_MaxMatches>$ncpuAvail</ResourceClassAd_MaxMatches>