ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

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

Comparing COMP/CRAB/python/cmscp.py (file contents):
Revision 1.52 by spiga, Wed May 27 17:40:12 2009 UTC vs.
Revision 1.80 by fanzago, Mon Jul 26 16:50:46 2010 UTC

#	Line 1 | Line 1
1		#!/usr/bin/env python
2		import sys, os
3	+	try:
4	+	import json
5	+	except:
6	+	import simplejson as json
7		from ProdCommon.Storage.SEAPI.SElement import SElement, FullPath
8		from ProdCommon.Storage.SEAPI.SBinterface import *
9		from ProdCommon.Storage.SEAPI.Exceptions import *
#	Line 17 | Line 21 | class cmscp:
21		$3 if needed: file name (the output file name)
22		$5 remote SE (complete endpoint)
23		$6 srm version
24	<	--lfn $LFNBaseName
24	>	--for_lfn $LFNBaseName
25		output:
26		return 0 if all ok
27		return 60307 if srmcp failed
28		return 60303 if file already exists in the SE
29		"""
26	–
27	–	#set default
30		self.params = {"source":'', "destination":'','destinationDir':'', "inputFileList":'', "outputFileList":'', \
31	<	"protocol":'', "option":'', "middleware":'', "srm_version":'srmv2', "lfn":'' }
31	>	"protocol":'', "option":'', "middleware":'', "srm_version":'srmv2', "for_lfn":'', "se_name":'' }
32		self.debug = 0
33	+	#### for fallback copy
34		self.local_stage = 0
35		self.params.update( args )
36	+	## timeout needed for subprocess command of SEAPI
37	+	## they should be a bit higher then the corresponding passed by command line
38	+	## default values
39	+	self.subprocesstimeout = { \
40	+	'copy':   3600, \
41	+	'exists': 1200, \
42	+	'delete': 1200, \
43	+	'size':   1200 \
44	+	}
45
46		return
47
#	Line 59 | Line 71 | class cmscp:
71		file_to_copy.append(self.params['inputFileList'])
72		self.params['inputFileList'] = file_to_copy
73
74	<	if not self.params['lfn'] and self.local_stage == 1 : HelpOptions()
74	>	#if not self.params['lfn'] and self.local_stage == 1 : HelpOptions()
75	>	if not self.params['for_lfn'] and self.local_stage == 1 : HelpOptions()
76
77		## TO DO:
78		#### add check for outFiles
#	Line 76 | Line 89 | class cmscp:
89		# stage out from WN
90		if self.params['middleware'] :
91		results = self.stager(self.params['middleware'],self.params['inputFileList'])
92	+	self.writeJsonFile(results)
93		self.finalReport(results)
94		# Local interaction with SE
95		else:
96		results = self.copy(self.params['inputFileList'], self.params['protocol'], self.params['option'] )
97	+	self.writeJsonFile(results)
98		return results
99	+
100	+	def writeJsonFile( self, results ):
101	+	"""
102	+	write a json file containing copy results for each file
103	+	"""
104	+	if self.debug:
105	+	print 'in writeJsonFile() : \n'
106	+	print "---->>>> in writeJsonFile results =  ", results
107	+	fp = open('resultCopyFile', 'w')
108	+	json.dump(results, fp)
109	+	fp.close()
110	+	if self.debug:
111	+	print '    reading resultCopyFile : \n'
112	+	lp = open('resultCopyFile', "r")
113	+	inputDict = json.load(lp)
114	+	lp.close()
115	+	print "    inputDict = ", inputDict
116	+	return
117	+
118	+	def checkLcgUtils( self ):
119	+	"""
120	+	_checkLcgUtils_
121	+	check the lcg-utils version and report
122	+	"""
123	+	import commands
124	+	cmd = "lcg-cp --version | grep lcg_util"
125	+	status, output = commands.getstatusoutput( cmd )
126	+	num_ver = -1
127	+	if output.find("not found") == -1 or status == 0:
128	+	temp = output.split("-")
129	+	version = ""
130	+	if len(temp) >= 2:
131	+	version = output.split("-")[1]
132	+	temp = version.split(".")
133	+	if len(temp) >= 1:
134	+	num_ver = int(temp[0])*10
135	+	num_ver += int(temp[1])
136	+	return num_ver
137
138		def setProtocol( self, middleware ):
139		"""
#	Line 91 | Line 144 | class cmscp:
144		if self.debug:
145		print 'setProtocol() :\n'
146		print '\tmiddleware =  %s utils \n'%middleware
147	<
147	>
148		lcgOpt={'srmv1':'-b -D srmv1  -t 2400 --verbose',
149		'srmv2':'-b -D srmv2  -t 2400 --verbose'}
150	+	if self.checkLcgUtils() >= 17:
151	+	lcgOpt={'srmv1':'-b -D srmv1 --srm-timeout 2400 --sendreceive-timeout 2400 --connect-timeout 300 --verbose',
152	+	'srmv2':'-b -D srmv2 --srm-timeout 2400 --sendreceive-timeout 2400 --connect-timeout 300 --verbose'}
153	+
154		srmOpt={'srmv1':' -report ./srmcp.report -retry_timeout 480000 -retry_num 3 -streams_num=1 ',
155	<	'srmv2':' -report=./srmcp.report -retry_timeout=480000 -retry_num=3 '}
155	>	'srmv2':' -report=./srmcp.report -retry_timeout=480000 -retry_num=3 -storagetype=permanent '}
156		rfioOpt=''
157
158	+	## FEDE for hadoop ###
159	+	hadoopOpt = ''
160	+	####
161	+
162		supported_protocol = None
163		if middleware.lower() in ['osg','lcg','condor','sge']:
164		supported_protocol = [('srm-lcg',lcgOpt[self.params['srm_version']]),\
165		(self.params['srm_version'],srmOpt[self.params['srm_version']])]
166		elif middleware.lower() in ['lsf','caf']:
167		supported_protocol = [('rfio',rfioOpt)]
168	+	elif middleware.lower() in ['pbs']:
169	+	supported_protocol = [('rfio',rfioOpt),('local','')]
170	+	elif middleware.lower() in ['arc']:
171	+	supported_protocol = [('srmv2','-debug'),('srmv1','-debug')]
172	+	## FEDE for hadoop ###
173	+	elif middleware.lower() in ['hadoop']:
174	+	supported_protocol = [('hadoop', hadoopOpt)]
175	+	####
176		else:
177		## here we can add support for any kind of protocol,
178		## maybe some local schedulers need something dedicated
#	Line 111 | Line 180 | class cmscp:
180		return supported_protocol
181
182
183	<	def checkCopy (self, copy_results, len_list_files, prot, lfn='', se=''):
183	>	def checkCopy (self, copy_results, len_list_files, prot):
184		"""
185		Checks the status of copy and update result dictionary
186		"""
187	+
188		list_retry = []
189		list_not_existing = []
190	+	list_already_existing = []
191	+	list_fallback = []
192		list_ok = []
193
194		if self.debug:
#	Line 127 | Line 199 | class cmscp:
199		list_ok.append(file)
200		reason = 'Copy succedeed with %s utils'%prot
201		dict['reason'] = reason
202	+	elif er_code == '60308':
203	+	list_fallback.append( file )
204	+	reason = 'Copy succedeed with %s utils'%prot
205	+	dict['reason'] = reason
206		elif er_code == '60302':
207		list_not_existing.append( file )
208	<	elif er_code == '10041':
208	>	elif er_code == '60303':
209	>	list_already_existing.append( file )
210	>	else :
211		list_retry.append( file )
134	–	## WHAT TO DO IN GENERAL FAILURE CONDITION
135	–	#else:
136	–	#    list_retry.append( file )
212
213		if self.debug:
214		print "\t file %s \n"%file
215		print "\t dict['erCode'] %s \n"%dict['erCode']
216		print "\t dict['reason'] %s \n"%dict['reason']
217
218	<	if (lfn != '') and (se != ''):
144	<	upDict = self.updateReport(file, er_code, dict['reason'], lfn, se)
145	<	else:
146	<	upDict = self.updateReport(file, er_code, dict['reason'])
218	>	upDict = self.updateReport(file, er_code, dict['reason'])
219
220		copy_results.update(upDict)
221
#	Line 151 | Line 223 | class cmscp:
223		if len(list_ok) != 0:
224		msg += '\tCopy of %s succedeed with %s utils\n'%(str(list_ok),prot)
225		if len(list_ok) != len_list_files :
226	<	msg += '\tCopy of %s failed using %s for files \n'%(str(list_retry),prot)
227	<	msg += '\tCopy of %s failed using %s : files not found \n'%(str(list_not_existing),prot)
226	>	if len(list_fallback)!=0:
227	>	msg += '\tCopy of %s succedeed with %s utils in the fallback SE\n'%(str(list_fallback),prot)
228	>	if len(list_retry)!=0:
229	>	msg += '\tCopy of %s failed using %s for files \n'%(str(list_retry),prot)
230	>	if len(list_not_existing)!=0:
231	>	msg += '\tCopy of %s failed using %s : files not found \n'%(str(list_not_existing),prot)
232	>	if len(list_already_existing)!=0:
233	>	msg += '\tCopy of %s failed using %s : files already existing\n'%(str(list_already_existing),prot)
234		if self.debug : print msg
235
236	<	return copy_results, list_ok, list_retry
236	>	return copy_results, list_ok, list_retry, list_fallback
237	>
238	>	def check_for_retry_localSE (self, copy_results):
239	>	"""
240	>	Checks the status of copy and create the list of file to copy to CloseSE
241	>	"""
242	>	list_retry_localSE = []
243	>
244	>	if self.debug:
245	>	print 'in check_for_retry_localSE() :\n'
246	>	print "\t results in check local = ", copy_results
247	>	for file, dict in copy_results.iteritems():
248	>	er_code = dict['erCode']
249	>	if er_code != '0' and  er_code != '60302' and er_code != '60308':
250	>	list_retry_localSE.append( file )
251	>
252	>	if self.debug:
253	>	print "\t file %s \n"%file
254	>	print "\t dict['erCode'] %s \n"%dict['erCode']
255	>	print "\t dict['reason'] %s \n"%dict['reason']
256	>
257	>	return list_retry_localSE
258	>
259
260		def LocalCopy(self, list_retry, results):
261		"""
#	Line 166 | Line 266 | class cmscp:
266		print '\t list_retry %s utils \n'%list_retry
267		print '\t len(list_retry) %s \n'%len(list_retry)
268
269	<	list_files = list_retry
270	<	self.params['inputFilesList']=list_files
271	<
269	>	list_files = list_retry
270	>	self.params['inputFileList']=list_files
271	>
272		### copy backup
273		from ProdCommon.FwkJobRep.SiteLocalConfig import loadSiteLocalConfig
274		siteCfg = loadSiteLocalConfig()
275		seName = siteCfg.localStageOut.get("se-name", None)
276		catalog = siteCfg.localStageOut.get("catalog", None)
277		implName = siteCfg.localStageOut.get("command", None)
278	+	option = siteCfg.localStageOut.get("option", None)
279	+
280		if (implName == 'srm'):
281	<	implName='srmv1'
282	<	self.params['srm_version']=implName
283	<	##### to be improved ###############
284	<	if (implName == 'rfcp'):
285	<	self.params['middleware']='lsf'
286	<	####################################
281	>	protocol = 'srmv2'
282	>	elif (implName == 'srmv2-lcg'):
283	>	protocol = 'srm-lcg'
284	>	elif (implName == 'rfcp-CERN'):
285	>	protocol = 'rfio'
286	>	elif (implName == 'rfcp'):
287	>	protocol = 'rfio'
288	>	else: protocol = implName
289
186	–	self.params['protocol']=implName
290		tfc = siteCfg.trivialFileCatalog()
291
292		if self.debug:
293		print '\t siteCFG %s \n'%siteCfg
294		print '\t seName %s \n'%seName
295		print '\t catalog %s \n'%catalog
296	<	print "\t self.params['protocol'] %s \n"%self.params['protocol']
296	>	print "\t fallback protocol %s \n"%protocol
297	>	print "\t fallback option %s \n"%option
298		print '\t tfc %s '%tfc
299	<	print "\t self.params['inputFilesList'] %s \n"%self.params['inputFilesList']
299	>	print "\t self.params['inputFileList'] %s \n"%self.params['inputFileList']
300
301	+	if (str(self.params['for_lfn']).find("/store/") == 0):
302	+	temp = str(self.params['for_lfn']).replace("/store/","/store/temp/",1)
303	+	self.params['for_lfn']= temp
304	+
305	+	if ( self.params['for_lfn'][-1] != '/' ) : self.params['for_lfn'] = self.params['for_lfn'] + '/'
306	+
307		file_backup=[]
308	<	for input in self.params['inputFilesList']:
309	<	file = self.params['lfn'] + os.path.basename(input)
308	>	for input in self.params['inputFileList']:
309	>	file = self.params['for_lfn'] + os.path.basename(input)
310		surl = tfc.matchLFN(tfc.preferredProtocol, file)
311		file_backup.append(surl)
312		if self.debug:
313	<	print '\t lfn %s \n'%self.params['lfn']
313	>	print '\t for_lfn %s \n'%self.params['for_lfn']
314		print '\t file %s \n'%file
315		print '\t surl %s \n'%surl
316
317		destination=os.path.dirname(file_backup[0])
318	+	if ( destination[-1] != '/' ) : destination = destination + '/'
319		self.params['destination']=destination
320	+	self.params['se_name']=seName
321
322		if self.debug:
323		print "\t self.params['destination']%s \n"%self.params['destination']
324	<	print "\t self.params['protocol'] %s \n"%self.params['protocol']
325	<	print "\t self.params['option']%s \n"%self.params['option']
326	<
327	<	for prot, opt in self.setProtocol( self.params['middleware'] ):
328	<	if self.debug: print '\tIn LocalCopy trying the stage out with %s utils \n'%prot
329	<	localCopy_results = self.copy( self.params['inputFileList'], prot, opt )
330	<	if localCopy_results.keys() == [''] or localCopy_results.keys() == '' :
331	<	results.update(localCopy_results)
332	<	else:
333	<	localCopy_results, list_ok, list_retry = self.checkCopy(localCopy_results, len(list_files), prot, self.params['lfn'], seName)
334	<	results.update(localCopy_results)
335	<	if len(list_ok) == len(list_files) :
336	<	break
337	<	if len(list_retry):
338	<	list_files = list_retry
339	<	else: break
228	<	if self.debug:
229	<	print "\t localCopy_results = %s \n"%localCopy_results
230	<
324	>	print "\t protocol %s \n"%protocol
325	>	print "\t optionn%s \n"%option
326	>
327	>	if self.debug: print '\tIn LocalCopy trying the stage out with %s utils \n'%protocol
328	>	if self.debug: print '\tUsing as option %s \n'%option
329	>
330	>	localCopy_results = self.copy( self.params['inputFileList'], protocol, option, backup='yes' )
331	>
332	>	if localCopy_results.keys() == [''] or localCopy_results.keys() == '' :
333	>	results.update(localCopy_results)
334	>	else:
335	>	localCopy_results, list_ok, list_retry, list_fallback = self.checkCopy(localCopy_results, len(list_files), protocol)
336	>
337	>	results.update(localCopy_results)
338	>	if self.debug:
339	>	print "\t localCopy_results = %s \n"%localCopy_results
340		return results
341
342		def stager( self, middleware, list_files ):
#	Line 242 | Line 351 | class cmscp:
351
352		results={}
353		for prot, opt in self.setProtocol( middleware ):
354	<	if self.debug: print '\tTrying the stage out with %s utils \n'%prot
354	>	if self.debug:
355	>	print '\tTrying the stage out with %s utils \n'%prot
356	>	print '\tand options %s\n'%opt
357	>
358		copy_results = self.copy( list_files, prot, opt )
359		if copy_results.keys() == [''] or copy_results.keys() == '' :
360		results.update(copy_results)
361		else:
362	<	copy_results, list_ok, list_retry = self.checkCopy(copy_results, len(list_files), prot)
362	>	copy_results, list_ok, list_retry, list_fallback = self.checkCopy(copy_results, len(list_files), prot)
363		results.update(copy_results)
364		if len(list_ok) == len(list_files) :
365		break
366	<	if len(list_retry):
366	>	if len(list_retry):
367		list_files = list_retry
368		else: break
369	<
369	>
370		if self.local_stage:
371	<	if len(list_retry):
372	<	results = self.LocalCopy(list_retry, results)
373	<
371	>	list_retry_localSE = self.check_for_retry_localSE(results)
372	>	if len(list_retry_localSE):
373	>	if self.debug:
374	>	print "\t list_retry_localSE %s \n"%list_retry_localSE
375	>	results = self.LocalCopy(list_retry_localSE, results)
376	>
377		if self.debug:
378		print "\t results %s \n"%results
379		return results
#	Line 272 | Line 387 | class cmscp:
387		self.dest_prot = protocol
388		if not self.params['source'] : self.source_prot = 'local'
389		Source_SE  = self.storageInterface( self.params['source'], self.source_prot )
390	<	if not self.params['destination'] : self.dest_prot = 'local'
391	<	Destination_SE = self.storageInterface( self.params['destination'], self.dest_prot )
390	>	if not self.params['destination'] :
391	>	self.dest_prot = 'local'
392	>	Destination_SE = self.storageInterface( self.params['destinationDir'], self.dest_prot )
393	>	else:
394	>	Destination_SE = self.storageInterface( self.params['destination'], self.dest_prot )
395
396		if self.debug :
397		msg  = '\t(source=%s,  protocol=%s)'%(self.params['source'], self.source_prot)
398		msg += '\t(destination=%s,  protocol=%s)'%(self.params['destination'], self.dest_prot)
399	+	msg += '\t(destinationDir=%s,  protocol=%s)'%(self.params['destinationDir'], self.dest_prot)
400		print msg
401
402		return Source_SE, Destination_SE
403
404	<	def copy( self, list_file, protocol, options ):
404	>	def copy( self, list_file, protocol, options, backup='no' ):
405		"""
406		Make the real file copy using SE API
407		"""
408		msg = ""
409	+	results = {}
410		if self.debug :
411		msg  = 'copy() :\n'
412		msg += '\tusing %s protocol\n'%protocol
#	Line 294 | Line 414 | class cmscp:
414		try:
415		Source_SE, Destination_SE = self.initializeApi( protocol )
416		except Exception, ex:
417	<	return self.updateReport('', '-1', str(ex))
417	>	for filetocopy in list_file:
418	>	results.update( self.updateReport(filetocopy, '-1', str(ex)))
419	>	return results
420	>
421	>	prot = Destination_SE.protocol
422	>	self.hostname=Destination_SE.hostname
423
424		# create remote dir
425	<	if Destination_SE.protocol in ['gridftp','rfio','srmv2']:
425	>	### FEDE for hadoop
426	>	if Destination_SE.protocol in ['gridftp','rfio','srmv2','hadoop']:
427		try:
428		self.createDir( Destination_SE, Destination_SE.protocol )
429		except OperationException, ex:
430	<	return self.updateReport('', '60316', str(ex))
430	>	for filetocopy in list_file:
431	>	results.update( self.updateReport(filetocopy, '60316', str(ex)))
432	>	return results
433		## when the client commands are not found (wrong env or really missing)
434		except MissingCommand, ex:
435		msg = "ERROR %s %s" %(str(ex), str(ex.detail))
436	<	return self.updateReport('', '10041', msg)
436	>	for filetocopy in list_file:
437	>	results.update( self.updateReport(filetocopy, '10041', msg))
438	>	return results
439	>	except Exception, ex:
440	>	msg = "ERROR %s" %(str(ex))
441	>	for filetocopy in list_file:
442	>	results.update( self.updateReport(filetocopy, '-1', msg))
443	>	return results
444
445		## prepare for real copy  ##
446		try :
#	Line 315 | Line 450 | class cmscp:
450		except ProtocolMismatch, ex:
451		msg  = "ERROR : Unable to create SBinterface with %s protocol"%protocol
452		msg += str(ex)
453	<	return self.updateReport('', '-1', msg)
453	>	for filetocopy in list_file:
454	>	results.update( self.updateReport(filetocopy, '-1', msg))
455	>	return results
456
457	<	results = {}
457	>	self.hostname = Destination_SE.hostname
458	>
459		## loop over the complete list of files
460		for filetocopy in list_file:
461		if self.debug : print '\tStart real copy for %s'%filetocopy
462		try :
463		ErCode, msg = self.checkFileExist( sbi_source, sbi_dest, filetocopy, options )
464		except Exception, ex:
465	<	ErCode = -1
465	>	ErCode = '60307'
466		msg = str(ex)
467		if ErCode == '0':
468		ErCode, msg = self.makeCopy( sbi, filetocopy , options, protocol,sbi_dest )
469	+	if (ErCode == '0') and (backup == 'yes'):
470	+	ErCode = '60308'
471		if self.debug : print '\tCopy results for %s is %s'%( os.path.basename(filetocopy), ErCode)
472		results.update( self.updateReport(filetocopy, ErCode, msg))
473		return results
#	Line 378 | Line 518 | class cmscp:
518		raise Exception(msg)
519		except AlreadyExistsException, ex:
520		if self.debug: print "\tThe directory already exist"
521	<	pass
521	>	pass
522	>	except Exception, ex:
523	>	msg = "ERROR %s %s" %(str(ex), str(ex.detail))
524	>	if self.debug : print '\t'+msg+'\n\t'+str(ex.detail)+'\n'
525	>	raise Exception(msg)
526		return msg
527
528		def checkFileExist( self, sbi_source, sbi_dest, filetocopy, option ):
#	Line 392 | Line 536 | class cmscp:
536		f_tocopy=filetocopy
537		if self.source_prot != 'local':f_tocopy = os.path.basename(filetocopy)
538		try:
539	<	checkSource = sbi_source.checkExists( f_tocopy , opt=option )
539	>	checkSource = sbi_source.checkExists( f_tocopy , opt=option, tout = self.subprocesstimeout['exists'] )
540		if self.debug : print '\tCheck for local file %s exist succeded \n'%f_tocopy
541		except OperationException, ex:
542		msg  ='ERROR: problems checkig if source file %s exist'%filetocopy
#	Line 427 | Line 571 | class cmscp:
571		f_tocopy=filetocopy
572		if self.dest_prot != 'local':f_tocopy = os.path.basename(filetocopy)
573		try:
574	<	check = sbi_dest.checkExists( f_tocopy, opt=option )
574	>	check = sbi_dest.checkExists( f_tocopy, opt=option, tout = self.subprocesstimeout['exists'] )
575		if self.debug : print '\tCheck for remote file %s exist succeded \n'%f_tocopy
576		except OperationException, ex:
577		msg  = 'ERROR: problems checkig if file %s already exist'%filetocopy
#	Line 480 | Line 624 | class cmscp:
624		ErCode = '0'
625		msg = ''
626
627	+	if  self.params['option'].find('space_token')>=0:
628	+	space_token=self.params['option'].split('=')[1]
629	+	if protocol == 'srmv2': option = '%s -space_token=%s'%(option,space_token)
630	+	if protocol == 'srm-lcg': option = '%s -S %s'%(option,space_token)
631		try:
632	<	sbi.copy( source_file , dest_file , opt = option)
632	>	sbi.copy( source_file , dest_file , opt = option, tout = self.subprocesstimeout['copy'])
633		except TransferException, ex:
634		msg  = "Problem copying %s file" % filetocopy
635		msg += str(ex)
#	Line 514 | Line 662 | class cmscp:
662		dbgmsg  = '\t'+msg+'\n\t'+str(ex.detail)+'\n'
663		dbgmsg += '\t'+str(ex.output)+'\n'
664		print dbgmsg
665	+	except AuthorizationException, ex:
666	+	ErCode = '60307'
667	+	msg  = "Problem copying %s file" % filetocopy
668	+	msg += str(ex)
669	+	if self.debug :
670	+	dbgmsg  = '\t'+msg+'\n\t'+str(ex.detail)+'\n'
671	+	dbgmsg += '\t'+str(ex.output)+'\n'
672	+	print dbgmsg
673	+	except SEAPITimeout, ex:
674	+	ErCode = '60317'
675	+	msg  = "Problem copying %s file" % filetocopy
676	+	msg += str(ex)
677	+	if self.debug :
678	+	dbgmsg  = '\t'+msg+'\n\t'+str(ex.detail)+'\n'
679	+	dbgmsg += '\t'+str(ex.output)+'\n'
680	+	print dbgmsg
681	+
682		if ErCode == '0' and protocol.find('srmv') == 0:
683		remote_file_size = -1
684		local_file_size = os.path.getsize( source_file )
685		try:
686	<	remote_file_size = sbi_dest.getSize( dest_file, opt=option )
686	>	remote_file_size = sbi_dest.getSize( dest_file, opt=option, tout = self.subprocesstimeout['size'] )
687		if self.debug : print '\t Check of remote size succeded for file %s\n'%dest_file
688		except TransferException, ex:
689		msg  = "Problem checking the size of %s file" % filetocopy
#	Line 554 | Line 719 | class cmscp:
719		f_tocopy=filetocopy
720		if self.dest_prot != 'local':f_tocopy = os.path.basename(filetocopy)
721		try:
722	<	sbi_dest.delete( f_tocopy, opt=option )
722	>	sbi_dest.delete( f_tocopy, opt=option, tout = self.subprocesstimeout['delete'] )
723		if self.debug : '\t deletion of file %s succeeded\n'%str(filetocopy)
724		except OperationException, ex:
725		msg  ='ERROR: problems removing partially staged file %s'%filetocopy
#	Line 567 | Line 732 | class cmscp:
732
733		return
734
735	<	def updateReport(self, file, erCode, reason, lfn='', se='' ):
735	>	#def updateReport(self, file, erCode, reason, lfn='', se='' ):
736	>	def updateReport(self, file, erCode, reason):
737		"""
738		Update the final stage out infos
739		"""
740		jobStageInfo={}
741		jobStageInfo['erCode']=erCode
742		jobStageInfo['reason']=reason
743	<	jobStageInfo['lfn']=lfn
744	<	jobStageInfo['se']=se
743	>	if not self.params['for_lfn']: self.params['for_lfn']=''
744	>	if not self.params['se_name']: self.params['se_name']=''
745	>	if not self.hostname: self.hostname=''
746	>	if (erCode != '0') and (erCode != '60308'):
747	>	jobStageInfo['for_lfn']='/copy_problem/'
748	>	else:
749	>	jobStageInfo['for_lfn']=self.params['for_lfn']
750	>	jobStageInfo['se_name']=self.params['se_name']
751	>	jobStageInfo['endpoint']=self.hostname
752
753		report = { file : jobStageInfo}
754		return report
#	Line 594 | Line 767 | class cmscp:
767		reason = " ".join(reason.split("'"))
768		reason="'%s'"%reason
769		if file:
770	<	if dict['lfn']=='':
771	<	lfn = '$LFNBaseName/'+os.path.basename(file)
770	>	if dict['for_lfn']=='':
771	>	lfn = '${LFNBaseName}'+os.path.basename(file)
772		se  = '$SE'
773	+	LFNBaseName = '$LFNBaseName'
774		else:
775	<	lfn = dict['lfn']+os.path.basename(file)
776	<	se = dict['se']
777	<	#dict['lfn'] # to be implemented
775	>	lfn = dict['for_lfn']+os.path.basename(file)
776	>	se = dict['se_name']
777	>	LFNBaseName = os.path.dirname(lfn)
778	>	if (LFNBaseName[-1] != '/'):
779	>	LFNBaseName = LFNBaseName + '/'
780	>
781	>
782		txt += 'echo "Report for File: '+file+'"\n'
783		txt += 'echo "LFN: '+lfn+'"\n'
784		txt += 'echo "StorageElement: '+se+'"\n'
785		txt += 'echo "StageOutExitStatusReason = %s" | tee -a $RUNTIME_AREA/$repo\n'%reason
786		txt += 'echo "StageOutSE = '+se+'" >> $RUNTIME_AREA/$repo\n'
787	<	#txt += 'export LFNBaseName='+lfn+'\n'
610	<	txt += 'export SE='+se+'\n'
787	>
788
789		if dict['erCode'] != '0':
790		cmscp_exit_status = dict['erCode']
791		else:
792		txt += 'echo "StageOutExitStatusReason = %s" | tee -a $RUNTIME_AREA/$repo\n'%reason
793		cmscp_exit_status = dict['erCode']
617	–	cmscp_exit_status = dict['erCode']
794		txt += '\n'
795		txt += 'export StageOutExitStatus='+str(cmscp_exit_status)+'\n'
796	<	txt +=  'echo "StageOutExitStatus = '+str(cmscp_exit_status)+'" | tee -a $RUNTIME_AREA/$repo\n'
796	>	txt += 'echo "StageOutExitStatus = '+str(cmscp_exit_status)+'" | tee -a $RUNTIME_AREA/$repo\n'
797		outFile.write(str(txt))
798		outFile.close()
799		return
#	Line 678 | Line 854 | if __name__ == '__main__' :
854
855		allowedOpt = ["source=", "destination=", "inputFileList=", "outputFileList=", \
856		"protocol=","option=", "middleware=", "srm_version=", \
857	<	"destinationDir=", "lfn=", "local_stage", "debug", "help"]
857	>	"destinationDir=", "for_lfn=", "local_stage", "debug", "help", "se_name="]
858		try:
859		opts, args = getopt.getopt( sys.argv[1:], "", allowedOpt )
860		except getopt.GetoptError, err:

Diff Legend

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