Skip to content

plugin: minor improvements to logic, variable initialization #817

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
mergify merged 3 commits into from
Feb 18, 2026
Merged

plugin: minor improvements to logic, variable initialization #817

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6187c0
plugin: add held job ID initialization
cmoussa1 Feb 17, 2026
9a32c01
plugin: add "return 0" on success
cmoussa1 Feb 17, 2026
8a3d804
plugin: check held_jobs before calling function
cmoussa1 Feb 17, 2026
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
12 changes: 8 additions & 4 deletions src/plugins/mf_priority.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@ static int check_and_release_held_jobs (flux_plugin_t *p, Association *b)
held_job.id,
D_ASSOC_MSJ) < 0) {
dependency = D_ASSOC_MSJ;
held_job_id = held_job.id;
goto error;
}
held_job.remove_dep (D_ASSOC_MSJ);
Expand Down Expand Up @@ -376,6 +377,7 @@ static int check_and_release_held_jobs (flux_plugin_t *p, Association *b)
// move onto the next Job
++it;
}
return 0;
error:
flux_jobtap_raise_exception (p,
held_job_id,
Expand Down Expand Up @@ -1476,10 +1478,12 @@ static int run_cb (flux_plugin_t *p,
b->cur_sched_jobs--;
// check to see if any jobs held due to max_sched_jobs limit can now
// have their dependency removed
if (check_and_release_held_jobs (p, b) < 0) {
flux_log_error (h,
"job.state.run: error checking and releasing "
"held jobs for association");
if (!b->held_jobs.empty ()) {
if (check_and_release_held_jobs (p, b) < 0) {
flux_log_error (h,
"job.state.run: error checking and releasing held "
"jobs for association");
}
}

return 0;
Expand Down
Loading