ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

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

Comparing COMP/CRAB/python/SchedulerRemoteglidein.py (file contents):
Revision 1.2 by belforte, Mon Aug 27 20:16:24 2012 UTC vs.
Revision 1.3 by belforte, Mon Sep 17 15:34:25 2012 UTC

#	Line 149 | Line 149 | class SchedulerRemoteglidein(SchedulerGr
149		jobDir = common.work_space.jobDir()
150		taskDir=common.work_space.topDir().split('/')[-2]
151		shareDir = common.work_space.shareDir()
152	+	submissionDay = time.strftime("%y%m%d",time.localtime())
153
154		params = {'shareDir':shareDir,
155		'jobDir':jobDir,
156	<	'taskDir':taskDir}
156	>	'taskDir':taskDir,
157	>	'submissionDay':submissionDay}
158
159		return params
160
#	Line 270 | Line 272 | class SchedulerRemoteglidein(SchedulerGr
272		if not remoteHost:
273		raise CrabException('FATAL ERROR: remoteHost not defined')
274
275	<	common.logger.info("try to find out username for remote Host via uberftp ...")
276	<	command="uberftp %s pwd|grep User|awk '{print $3}'" % remoteHost
277	<	(status, output) = commands.getstatusoutput(command)
278	<	if status == 0:
279	<	remoteUser = output
280	<	common.logger.info("remoteUser set to %s" % remoteUser)
281	<	if remoteUser==None:
282	<	raise CrabException('FATAL ERROR: REMOTE USER not defined')
275	>	#common.logger.info("try to find out username for remote Host via uberftp ...")
276	>	#command="uberftp %s pwd|grep User|awk '{print $3}'" % remoteHost
277	>	#(status, output) = commands.getstatusoutput(command)
278	>	#if status == 0:
279	>	#    remoteUser = output
280	>	#    common.logger.info("remoteUser set to %s" % remoteUser)
281	>	#    if remoteUser==None:
282	>	#        raise CrabException('FATAL ERROR: REMOTE USER not defined')
283
284	<	remoteUserHost = remoteUser + '@' + remoteHost
284	>	#remoteUserHost = remoteUser + '@' + remoteHost
285	>	remoteUserHost = remoteHost
286
287		common._db.updateTask_({'serverName':remoteUserHost})
288

Diff Legend

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