| 159 |
|
glideinTime = "%d" % (int(self.EDG_clock_time)+5) # 5 min to wrapup |
| 160 |
|
jobParams += '+MaxWallTimeMins = '+ glideinTime + '; ' |
| 161 |
|
else: |
| 162 |
< |
jobParams += '+MaxWallTimeMins = %d; ' % (60*22) |
| 162 |
> |
jobParams += '+MaxWallTimeMins = %d; ' % (60*22 - 5) # 22h default in glidein, 5min to wrap |
| 163 |
|
|
| 164 |
|
if self.max_rss : |
| 165 |
|
jobParams += 'request_memory = '+self.max_rss+';' |
| 239 |
|
|
| 240 |
|
txt += 'func_exit() { \n' |
| 241 |
|
txt += self.wsExitFunc_common() |
| 242 |
< |
|
| 242 |
> |
txt += '#Check for stdout/err in new location as of condor 7.7\n' |
| 243 |
> |
txt += ' if [ -s _condor_stdout ]; then\n' |
| 244 |
> |
txt += ' echo "Found _condor_stdout/err, rename for OSB"\n' |
| 245 |
> |
txt += ' cp -pfv _condor_stdout CMSSW_${NJob}.stdout\n' |
| 246 |
> |
txt += ' cp -pfv _condor_stderr CMSSW_${NJob}.stderr\n' |
| 247 |
> |
txt += ' fi\n' |
| 248 |
|
txt += ' tar zcvf ${out_files}.tgz ${final_list}\n' |
| 249 |
|
txt += ' tmp_size=`ls -gGrta ${out_files}.tgz | awk \'{ print $3 }\'`\n' |
| 250 |
|
txt += ' rm ${out_files}.tgz\n' |
