[gavia-ms-commit] r1289 - branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise

commit at globus.org commit at globus.org
Fri Jul 31 15:53:17 CDT 2009 

Author: andre
Date: 2009-07-31 15:53:16 -0500 (Fri, 31 Jul 2009)
New Revision: 1289

Modified:
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/find-gavia-resource-advertise-tools.in
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/gavia-resource-advertise.in
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/rp-provider-config.xml.in
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/setup-gavia-resource-advertise.pl
Log:
checkpoint commit on testing branch

Modified: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/find-gavia-resource-advertise-tools.in
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/find-gavia-resource-advertise-tools.in	2009-07-30 20:31:16 UTC (rev 1288)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/find-gavia-resource-advertise-tools.in	2009-07-31 20:53:16 UTC (rev 1289)
@@ -211,6 +211,7 @@
 
 AC_OUTPUT(
   gavia-resource-advertise
-  condor_condig:condor_config.in
+  condor_condig
+  gavia-resource-advertise.conf
   rp-provider-config.xml
 )

Modified: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/gavia-resource-advertise.in
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/gavia-resource-advertise.in	2009-07-30 20:31:16 UTC (rev 1288)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/gavia-resource-advertise.in	2009-07-31 20:53:16 UTC (rev 1289)
@@ -46,7 +46,7 @@
 #
 # Setup
 #
-# 1. Create the file gavia-resource-advertise.conf (default location ~/.condor) and insert 
+# 1. Create the file gavia-resource-advertise.conf (default location $GLOBUS_LOCATION/etc) and insert 
 #    in it at least these attributes:
 #
 #      queue_name = "grid"            // the queue that the outside world sees
@@ -217,11 +217,11 @@
 
              -c path_to_classad_config             ||
             
-              \$CLASSAD_CONFIG environment variable ||
+              \$GAVIA_RESOURCE_ADVERTISE_CONFIG environment variable ||
 
-              /etc/condor/gavia-resource-advertise.conf             ||
+              $GLOBUS_LOCATION/etc/gavia-resource-advertise.conf             ||
  
-              \$HOME/.condor/gavia-resource-advertise.conf
+              \$HOME/.gavia/gavia-resource-advertise.conf
 
 
 
@@ -414,13 +414,13 @@
 #  Look up the file gavia-resource-advertise.conf in these places:
 #
 #    0. option given with -c on cmd line
-#    1. CLASSAD_CONFIG env var
-#    2. /etc/condor/gavia-resource-advertise.conf
-#    3. $HOME/.condor/gavia-resource-advertise.conf
+#    1. GAVIA_RESOURCE_ADVERTISE_CONFIG env var
+#    2. $GLOBUS_LOCATION/etc/gavia-resource-advertise.conf
+#    3. $HOME/.gavia/gavia-resource-advertise.conf
 #
 
-my $search  = "/etc/condor/ or \$HOME/.condor/ and \n" . 
-    "Environment variable CLASSAD_CONFIG is not set";
+my $search  = "\$GLOBUS_LOCATION/etc/ or \$HOME/.gavia/ and \n" . 
+    "Environment variable GAVIA_RESOURCE_ADVERTISE_CONFIG is not set";
 
 #
 # Set  $classad_config if not set on cmd line
@@ -428,15 +428,15 @@
 if ( $classad_config ) {
     $search  = "path $classad_config specified on command line\n";
 }
-elsif ( $ENV{CLASSAD_CONFIG} ) {
-    $classad_config =  $ENV{CLASSAD_CONFIG};
-    $search = "CLASSAD_CONFIG = $ENV{CLASSAD_CONFIG}"; 
+elsif ( $ENV{GAVIA_RESOURCE_ADVERTISE_CONFIG} ) {
+    $classad_config =  $ENV{GAVIA_RESOURCE_ADVERTISE_CONFIG};
+    $search = "GAVIA_RESOURCE_ADVERTISE_CONFIG = $ENV{GAVIA_RESOURCE_ADVERTISE_CONFIG}"; 
 }
-elsif ( -s "/etc/condor/gavia-resource-advertise.conf" ) {
-    $classad_config = "/etc/condor/gavia-resource-advertise.conf";
+elsif ( -s $ENV{GLOBUS_LOCATION}."/etc/gavia-resource-advertise.conf" ) {
+    $classad_config = $ENV{GLOBUS_LOCATION}."/etc/gavia-resource-advertise.conf";
 }
-elsif ( -s $ENV{HOME}."/.condor/gavia-resource-advertise.conf" ) {
-    $classad_config = $ENV{HOME}."/.condor/gavia-resource-advertise.conf";
+elsif ( -s $ENV{HOME}."/.gavia/gavia-resource-advertise.conf" ) {
+    $classad_config = $ENV{HOME}."/.gavia/gavia-resource-advertise.conf";
 }
 
 # Make sure the file exists and is not empty

Modified: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/rp-provider-config.xml.in
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/rp-provider-config.xml.in	2009-07-30 20:31:16 UTC (rev 1288)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/rp-provider-config.xml.in	2009-07-31 20:53:16 UTC (rev 1289)
@@ -6,7 +6,7 @@
    <ns1:resourcePropertyImpl xsi:type="xsd:string" xmlns:xsd="http://www.w3.org/2001/XMLSchema">org.globus.mds.usefulrp.rpprovider.SingleValueResourcePropertyProvider</ns1:resourcePropertyImpl>
    <ns1:resourcePropertyElementProducers xsi:type="ns1:resourcePropertyElementProducerConfig">
    <ns1:className xsi:type="xsd:string" xmlns:xsd="http://www.w3.org/2001/XMLSchema">org.globus.mds.usefulrp.rpprovider.producers.ExternalProcessElementProducer</ns1:className>
-   <ns1:arguments xsi:type="xsd:string" xmlns:xsd="http://www.w3.org/2001/XMLSchema">@GAVIA_RESOURCE_ADVERTISE_EXEC@</ns1:arguments>
+   <ns1:arguments xsi:type="xsd:string" xmlns:xsd="http://www.w3.org/2001/XMLSchema">@GAVIA_RESOURCE_ADVERTISE_PATH@</ns1:arguments>
    <ns1:period xsi:type="xsd:int" xmlns:xsd="http://www.w3.org/2001/XMLSchema">60</ns1:period>
    </ns1:resourcePropertyElementProducers>
  </ns1:configArray>

Modified: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/setup-gavia-resource-advertise.pl
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/setup-gavia-resource-advertise.pl	2009-07-30 20:31:16 UTC (rev 1288)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/setup-gavia-resource-advertise.pl	2009-07-31 20:53:16 UTC (rev 1289)
@@ -1,3 +1,5 @@
+use File::Copy;
+
 my $gpath = $ENV{GPT_LOCATION};
 
 if (!defined($gpath))
@@ -54,13 +56,20 @@
     exit 2;
 }
 
-# Set executable permissions for script
+# Copy the gavia-resource-advertise executable at the right location.
+copy("./gavia-resource-advertise", "$pgm_file") or die "File cannot be copied.";
+# Set executable permissions for gavia-resource-advertise
 chmod(0755, $pgm_file) || die "Can't set permissions on $pgm_file\n";
 
 # Copy rp-provider-config.xml at the right location.  Make sure not
-# to override already existing files.
+# to overwrite already existing files.
 install_file("rp-provider-config.xml", $globusdir . "/etc/globus_wsrf_mds_index/rp-provider-config.xml");
 
+# Copy config files.  Make sure not to overwrite already existing files.
+install_file("gavia-resource-advertise.conf", $globusdir . "/etc");
+install_file("condor_config", $ENV{HOME} . "/.condor");
+
+
 # Check if the RPProvider seems to be enabled...
 open(FILE,"$globusdir/etc/globus_wsrf_mds_index/server-config.wsdd");
 if (grep{/ResourcePropertyProviderCollection/} <FILE>)
@@ -77,6 +86,7 @@
 open(FILE,"$globusdir/etc/globus_wsrf_mds_index/upstream.xml");
 if (grep{/GaviaResourceRP/} <FILE>)
 {
+    print "The $globusdir/etc/globus_wsrf_mds_index/upstream.xml file already contains a GaviaResourceRP resource proterty name.\nKeeping the file as is.\n";
 }
 else
 {

More information about the gavia-ms-commit mailing list