[gavia-ms-commit] r1281 - trunk/MetaScheduling/condor_patches

[commit at globus.org]

Author: patricka
Date: 2009-07-29 16:35:32 -0500 (Wed, 29 Jul 2009)
New Revision: 1281

Added:
   trunk/MetaScheduling/condor_patches/oldcondor.onehop.patch
   trunk/MetaScheduling/condor_patches/onehop.patch
Modified:
   trunk/MetaScheduling/condor_patches/README
Log:
Updated Condor one-hop patch to work with the current version of Condor.

Modified: trunk/MetaScheduling/condor_patches/README
===================================================================
--- trunk/MetaScheduling/condor_patches/README	2009-07-13 23:46:45 UTC (rev 1280)
+++ trunk/MetaScheduling/condor_patches/README	2009-07-29 21:35:32 UTC (rev 1281)
@@ -2,6 +2,8 @@
 
 Ideally, this patch should get into condor, but I have no idea whether that will ever happen. 
 
-Right now, you can apply this patch to gt4job.C in the condor 7.1.1 source tree. 
+Right now, you can patch condor with onehop.patch (the other patchfile in this directory is for old versions of Condor). 
 
+Full instructions are on the Gavia wiki at:
 
+http://dev.globus.org/wiki/Patching_Condor_for_One_Hop_File_Staging

Added: trunk/MetaScheduling/condor_patches/oldcondor.onehop.patch
===================================================================
--- trunk/MetaScheduling/condor_patches/oldcondor.onehop.patch	                        (rev 0)
+++ trunk/MetaScheduling/condor_patches/oldcondor.onehop.patch	2009-07-29 21:35:32 UTC (rev 1281)
@@ -0,0 +1,42 @@
+--- gt4job.C.old	2008-07-28 16:05:15.000000000 -0700
++++ gt4job.C	2008-07-30 13:52:45.000000000 -0700
+@@ -1833,11 +1833,16 @@
+ 			while ( (filename = stage_in_list.next()) != NULL ) {
+ 
+ 				*rsl += "<transfer>";
+-				buff.sprintf( "%s%s%s", local_url_base.Value(),
+-							  filename[0] == '/' ? "" : local_iwd.Value(),
+-							  filename );
+-				*rsl += printXMLParam ("sourceUrl", 
+-									   buff.Value());
++
++				if ( !(strncmp(filename, "gsiftp://", 9) ) ) {
++					*rsl += printXMLParam ("sourceUrl", filename);
++				} else {
++					buff.sprintf( "%s%s%s", local_url_base.Value(),
++					              filename[0] == '/' ? "" : local_iwd.Value(),
++					              filename );
++					*rsl += printXMLParam ("sourceUrl", 
++					                       buff.Value());
++				}
+ 				buff.sprintf ("file://%s%s",
+ 							  remote_iwd.Value(),
+ 							  condor_basename (filename));
+@@ -1921,7 +1926,7 @@
+ 			*rsl += "<transfer>";
+ 			buff.sprintf ("file://%s%s",
+ 						  filename[0]=='/' ? "" : remote_iwd.Value(),
+-						  filename);
++						  condor_basename( filename ));
+ 			*rsl += printXMLParam ("sourceUrl", 
+ 								   buff.Value());
+ 			if ( remaps && filename_remap_find( remaps, filename,
+@@ -1929,6 +1934,8 @@
+ 				buff.sprintf( "%s%s%s", local_url_base.Value(),
+ 							  new_name[0] == '/' ? "" : local_iwd.Value(),
+ 							  new_name.Value() );
++			} else if ( !(strncmp(filename, "gsiftp://", 9) ) ) {
++				buff.sprintf( "%s", filename );
+ 			} else {
+ 				buff.sprintf( "%s%s%s", local_url_base.Value(),
+ 							  local_iwd.Value(),

Added: trunk/MetaScheduling/condor_patches/onehop.patch
===================================================================
--- trunk/MetaScheduling/condor_patches/onehop.patch	                        (rev 0)
+++ trunk/MetaScheduling/condor_patches/onehop.patch	2009-07-29 21:35:32 UTC (rev 1281)
@@ -0,0 +1,50 @@
+--- condor-7.2.0/src/condor_gridmanager/gt4job.cpp	2008-12-19 12:10:08.000000000 -0800
++++ /root/gt4job.cpp	2009-02-04 13:49:47.000000000 -0800
+@@ -1859,11 +1859,14 @@ MyString *GT4Job::buildSubmitRSL()
+ 			while ( (filename = stage_in_list.next()) != NULL ) {
+ 
+ 				*rsl += "<transfer>";
+-				buff.sprintf( "%s%s%s", local_url_base.Value(),
+-							  filename[0] == '/' ? "" : local_iwd.Value(),
+-							  filename );
+-				*rsl += printXMLParam ("sourceUrl", 
+-									   buff.Value());
++				if ( !(strncmp(filename, "gsiftp://", 9) ) ) {
++					*rsl += printXMLParam ("sourceUrl", filename);
++				} else {
++					buff.sprintf( "%s%s%s", local_url_base.Value(),
++					              filename[0] == '/' ? "" : local_iwd.Value(),
++					              filename );
++					*rsl += printXMLParam ("sourceUrl", buff.Value());
++				}
+ 				buff.sprintf ("file://%s%s",
+ 							  remote_iwd.Value(),
+ 							  condor_basename (filename));
+@@ -1877,7 +1880,7 @@ MyString *GT4Job::buildSubmitRSL()
+ 				}
+ 				*rsl += "</transfer>";
+ 
+-			}
++			 }
+ 		}
+ 
+ 		*rsl += "</fileStageIn>";
+@@ -1947,7 +1950,7 @@ MyString *GT4Job::buildSubmitRSL()
+ 			*rsl += "<transfer>";
+ 			buff.sprintf ("file://%s%s",
+ 						  filename[0]=='/' ? "" : remote_iwd.Value(),
+-						  filename);
++						  condor_basename( filename ));
+ 			*rsl += printXMLParam ("sourceUrl", 
+ 								   buff.Value());
+ 			if ( remaps && filename_remap_find( remaps, filename,
+@@ -1955,6 +1958,9 @@ MyString *GT4Job::buildSubmitRSL()
+ 				buff.sprintf( "%s%s%s", local_url_base.Value(),
+ 							  new_name[0] == '/' ? "" : local_iwd.Value(),
+ 							  new_name.Value() );
++			} else if ( !(strncmp(filename, "gsiftp://", 9) ) ) {
++			            buff.sprintf( "%s", filename );
++
+ 			} else {
+ 				buff.sprintf( "%s%s%s", local_url_base.Value(),
+ 							  local_iwd.Value(),