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.

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

plugin: initialize factor weights on plugin load #458

Merged
merged 1 commit into from
Jun 7, 2024
Merged

plugin: initialize factor weights on plugin load #458

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 14 additions & 7 deletions src/plugins/mf_priority.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ extern "C" {
// flux-accounting
#define BANK_INFO_MISSING 999

// default weights for each factor in the priority calculation for a job
#define DEFAULT_FSHARE_WEIGHT 100000
#define DEFAULT_QUEUE_WEIGHT 10000
#define DEFAULT_AGE_WEIGHT 1000

std::map<int, std::map<std::string, Association>> users;
std::map<std::string, Queue> queues;
std::map<int, std::string> users_def_bank;
Expand Down Expand Up @@ -75,11 +80,6 @@ int64_t priority_calculation (flux_plugin_t *p,
fshare_weight = priority_weights["fairshare"];
queue_weight = priority_weights["queue"];

// check values of priority factor weights; if not configured,
// these will be set to -1, so just use default weights
if (fshare_weight == -1) fshare_weight = 100000;
if (queue_weight == -1) queue_weight = 10000;

if (urgency == FLUX_JOB_URGENCY_HOLD)
return FLUX_JOB_PRIORITY_MIN;

Expand Down Expand Up @@ -201,8 +201,10 @@ static int conf_update_cb (flux_plugin_t *p,
}

// assign unpacked weights into priority_weights map
priority_weights["fairshare"] = fshare_weight;
priority_weights["queue"] = queue_weight;
if (fshare_weight != -1)
priority_weights["fairshare"] = fshare_weight;
if (queue_weight != -1)
priority_weights["queue"] = queue_weight;

return 0;
}
Expand Down Expand Up @@ -1108,6 +1110,11 @@ extern "C" int flux_plugin_init (flux_plugin_t *p)
< 0)
return -1;

// initialize the weights of the priority factors with default values
priority_weights["fairshare"] = DEFAULT_FSHARE_WEIGHT;
priority_weights["queue"] = DEFAULT_QUEUE_WEIGHT;
priority_weights["age"] = DEFAULT_AGE_WEIGHT;

return 0;
}

Expand Down
Loading