Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.7.8.20 #134

Closed
wants to merge 33 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
6e6a0bf
New version
PalNilsson Jun 13, 2024
798b6fb
Pylint updates
PalNilsson Jun 13, 2024
9b27492
Pylint updates
PalNilsson Jun 13, 2024
4a2720a
Pylint updates
PalNilsson Jun 13, 2024
82bb5dd
Fixed problem with logger.INFO
Jun 13, 2024
17db09d
Merge remote-tracking branch 'upstream/next' into next
Jun 13, 2024
28cfda5
Merge remote-tracking branch 'origin/next' into next
Jun 13, 2024
97b533f
Added open_remote_file_cmd.sh to redundants list
Jun 14, 2024
f930210
Added lsetup timing
PalNilsson Jun 14, 2024
5fd26ae
Fixed problem with remote file open aborting too soon. Returning lset…
Jun 17, 2024
72e47ac
Added lsetuptime
Jun 17, 2024
d16da54
Progation and reporting of lsetuptime
Jun 20, 2024
60a225d
Progation and reporting of lsetuptime
Jun 21, 2024
f5ea139
Merge remote-tracking branch 'upstream/next' into next
PalNilsson Jun 24, 2024
a2393fa
Updated version number after merge with Eddie's code
PalNilsson Jun 24, 2024
b38dee6
Removed rucio image from middleware_container
Jun 25, 2024
a88d832
Adjusted default container options
Jun 26, 2024
25cc3d7
Adjusted default container options
Jun 26, 2024
1c8dbb9
Pylint updates
Jun 26, 2024
1c6eef1
Pylint updates
Jun 26, 2024
7ad3493
Merge remote-tracking branch 'upstream/next' into next
Jun 26, 2024
d5b5dc7
Version update after merge
Jun 26, 2024
855065f
Pylint updates
PalNilsson Jun 26, 2024
5929af1
Pylint updates
PalNilsson Jun 26, 2024
d8806e1
Pylint updates
PalNilsson Jun 26, 2024
6e8c881
Pylint updates
PalNilsson Jun 26, 2024
f1a3465
Comment update
PalNilsson Jun 26, 2024
c3618bb
Pylint update
PalNilsson Jun 26, 2024
7d09516
Pylint updates
PalNilsson Jun 26, 2024
32f31cd
Exception correction
PalNilsson Jun 27, 2024
a9d051f
Improved try-statement to catch NameError if psutil module is not ava…
Jun 28, 2024
ec7ae19
Merge remote-tracking branch 'origin/next' into next
Jun 28, 2024
3872682
Updated middleware_container_no_path
Jun 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion PILOTVERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.7.3
3.7.8.20
5 changes: 5 additions & 0 deletions pilot/control/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -788,9 +788,14 @@ def get_data_structure(job: Any, state: str, args: Any, xml: str = "", metadata:
extra = {'readbyterate': readfrac}
else:
logger.debug('read_bytes info not yet available')

# extract and remove any GPU info from data since it will be reported with job metrics
add_gpu_info(data, extra)

# add the lsetup time if set
if job.lsetuptime:
extra['lsetup_time'] = job.lsetuptime

job_metrics = get_job_metrics(job, extra=extra)
if job_metrics:
data['jobMetrics'] = job_metrics
Expand Down
Loading
Loading