Skip to content

Add support for configurable job uniqueness. #265

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.

Sign up for GitHub

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

Merged
jpwhite4 merged 3 commits into from
May 26, 2023
Merged

Add support for configurable job uniqueness. #265

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4400da2
Add support for configurable job uniqueness.
jpwhite4 May 8, 2023
8554cb7
Update as per review comments.
jpwhite4 May 26, 2023
deb7efd
Fixes for code review comments.
jpwhite4 May 26, 2023
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
1 change: 1 addition & 0 deletions config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"hostname_mode": "hostname",
"pcp_log_dir": "/data/pcp-logs/my_cluster_name",
"script_dir": "/data/jobscripts/my_cluster_name",
"job_uniq_mode": "local_job_id",
Copy link
Copy Markdown
Contributor

@connersaeli connersaeli May 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't there need to be a corresponding update to configure_resource() in supremm_setup.py for this config parameter?

Copy link
Copy Markdown
Member Author

@jpwhite4 jpwhite4 May 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Originally I planned for this to be just to support ACCESS XDMoD (this code has been running on the XSEDE/ACCESS version for many years via a custom patch). Have to think about this...........

Copy link
Copy Markdown
Member Author

@jpwhite4 jpwhite4 May 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. Plan is to autodetect the job unique identifier - no need for a configuration setting.


// fast_index uses an alternative method of indexing job-level pcp archives which can significantly speed
// up the indexarchives.py script. The tradeoff is that the indexed archive end time is not found and the
Expand Down
23 changes: 22 additions & 1 deletion src/supremm/xdmodaccount.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ class XDMoDAcct(Accounting):
def __init__(self, resource_id, config):
super(XDMoDAcct, self).__init__(resource_id, config)

job_uniq_mode = 'local_job_id'
for _, resconfig in config.resourceconfigs():
if resconfig['resource_id'] == resource_id:
if 'job_unique_mode' in resconfig:
job_uniq_mode = resconfig['job_unique_mode']
break

self.dbsettings = config.getsection("datawarehouse")

xdmod_schema_version = self.detectXdmodSchema()
Expand All @@ -25,6 +32,13 @@ def __init__(self, resource_id, config):
jf.`job_id` AS `job_id`,
jf.`resource_id` AS `resource_id`,
COALESCE(jf.`local_job_id_raw`, jf.`local_jobid`) AS `local_job_id`,
"""
if job_uniq_mode == 'local_job_id':
self._query += "COALESCE(jf.`local_job_id_raw`, jf.`local_jobid`) as `job_uniq_id`, "
else:
self._query += "IF(jf.`local_job_array_index` = -1, jf.`local_jobid`, CONCAT(jf.`local_jobid`, '_', jf.`local_job_array_index`)) as job_uniq_id, "

self._query += """
jf.`start_time_ts` AS `start_time`,
jf.`end_time_ts` AS `end_time`,
jf.`submit_time_ts` AS `submit`,
Expand Down Expand Up @@ -71,6 +85,13 @@ def __init__(self, resource_id, config):
jf.`job_id` as `job_id`,
jf.`resource_id` as `resource_id`,
COALESCE(jf.`local_job_id_raw`, jf.`local_jobid`) as `local_job_id`,
"""
if job_uniq_mode == 'local_job_id':
self._query += "COALESCE(jf.`local_job_id_raw`, jf.`local_jobid`) as `job_uniq_id`, "
else:
self._query += "IF(jf.`local_job_array_index` = -1, jf.`local_jobid`, CONCAT(jf.`local_jobid`, '_', jf.`local_job_array_index`)) as job_uniq_id, "

self._query += """
jf.`start_time_ts` as `start_time`,
jf.`end_time_ts` as `end_time`,
jf.`submit_time_ts` as `submit`,
Expand Down Expand Up @@ -280,7 +301,7 @@ def executequery(self, query, data):
jobpk = record['job_id']
del record['job_id']
record['host_list'] = hostlist
job = Job(jobpk, str(record['local_job_id']), record)
job = Job(jobpk, str(record['job_uniq_id']), record)
job.set_nodes(hostlist)
job.set_rawarchives(hostarchives)

Expand Down