ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/CRAB/python/SchedulerEdg.py

Comparing COMP/CRAB/python/SchedulerEdg.py (file contents):
Revision 1.11 by corvo, Fri Sep 23 10:26:41 2005 UTC vs.
Revision 1.12 by fanzago, Mon Sep 26 08:59:06 2005 UTC

#	Line 44 | Line 44 | class SchedulerEdg(Scheduler):
44		# Add EDG_WL_LOCATION to the python path
45
46		try:
47	<	path = os.environ['GLITE_WMS_LOCATION']
48	<	#            path = os.environ['EDG_WL_LOCATION']
47	>	#            path = os.environ['GLITE_WMS_LOCATION']
48	>	path = os.environ['EDG_WL_LOCATION']
49		except:
50	<	msg = "Error: the GLITE_WMS_LOCATION variable is not set."
51	<	#            msg = "Error: the EDG_WL_LOCATION variable is not set."
50	>	#            msg = "Error: the GLITE_WMS_LOCATION variable is not set."
51	>	msg = "Error: the EDG_WL_LOCATION variable is not set."
52		raise CrabException(msg)
53
54		libPath=os.path.join(path, "lib")
#	Line 79 | Line 79 | class SchedulerEdg(Scheduler):
79		Returns part of a job script which does scheduler-specific work.
80		"""
81		txt = '\n'
82	+	txt += 'CloseCEs=`edg-brokerinfo getCE`\n'
83		# MARCO
84	<	txt += 'CloseCEs=`glite-brokerinfo getCE`\n'
84	>	#txt += 'CloseCEs=`glite-brokerinfo getCE`\n'
85		# MARCO
86		txt += 'echo "CloseCEs = $CloseCEs"\n'
87		txt += 'CE=`echo $CloseCEs | sed -e "s/:.*//"`\n'
#	Line 218 | Line 219 | class SchedulerEdg(Scheduler):
219		""" Query a status of the job with id """
220
221		hstates = {}
222	<	#        Status = importName('edg_wl_userinterface_common_LbWrapper', 'Status')
223	<	Status = importName('glite_wmsui_LbWrapper', 'Status')
222	>	Status = importName('edg_wl_userinterface_common_LbWrapper', 'Status')
223	>	#        Status = importName('glite_wmsui_LbWrapper', 'Status')
224		# Bypass edg-job-status interfacing directly to C++ API
225		# Job attribute vector to retrieve status without edg-job-status
226		level = 0

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines