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

BF: CS-915 job is assigned to the defaultdepartment despite the user being member of an other department #43

Merged
merged 1 commit into from
Jan 3, 2025
Merged

BF: CS-915 job is assigned to the defaultdepartment despite the user being member of an other department #43

Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions source/daemons/qmaster/sge_userset_qmaster.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ job_is_valid_department(lListElem *job, lList **alpp, const char *dept_name, con

// Is the department name the default department then we can skip remaining tests.
// The default department is always valid and the user or group(s) do not need to be part of it.
if (!strcmp(dept_name, DEFAULT_DEPARTMENT)) {
if (strcmp(dept_name, DEFAULT_DEPARTMENT) == 0) {
DRETURN(true);
}

Expand Down Expand Up @@ -340,7 +340,11 @@ job_set_department(lListElem *job, lList **alpp, const lList *userset_list) {
// Find the first department where the user is a member of
const lListElem *dept;
for_each_ep(dept, userset_list) {
if (job_is_valid_department(job, nullptr, lGetString(dept, US_name), userset_list)) {
const char *dept_name = lGetString(dept, US_name);
if (strcmp(dept_name, DEFAULT_DEPARTMENT) == 0) {
continue;
}
if (job_is_valid_department(job, nullptr, dept_name, userset_list)) {
lSetString(job, JB_department, lGetString(dept, US_name));
DRETURN(true);
}
Expand Down
39 changes: 10 additions & 29 deletions source/libs/sched/sgeee.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,17 +695,11 @@ job_is_active( lListElem *job,
/*--------------------------------------------------------------------
* locate_department - locate the department object by name
*--------------------------------------------------------------------*/

static lListElem *
locate_department( lList *dept_list,
const char *name )
{
if (!name)
locate_department(lList *dept_list, const char *name) {
if (name == nullptr) {
return nullptr;

/*-------------------------------------------------------------
* Look up the department object by name
*-------------------------------------------------------------*/
}

return lGetElemStrRW(dept_list, US_name, name);
}
Expand Down Expand Up @@ -759,8 +753,7 @@ sge_set_job_refs( lListElem *job,
* locate user object and save off reference
*-------------------------------------------------------------*/

ref->user = user_list_locate(lists->user_list,
lGetString(job, JB_owner));
ref->user = user_list_locate(lists->user_list, lGetString(job, JB_owner));
if (ref->user) {
lSetUlong(ref->user, UU_job_cnt, 0);
lSetUlong(ref->user, UU_pending_job_cnt, 0);
Expand All @@ -770,8 +763,7 @@ sge_set_job_refs( lListElem *job,
* locate project object and save off reference
*-------------------------------------------------------------*/

ref->project = prj_list_locate(lists->project_list,
lGetString(job, JB_project));
ref->project = prj_list_locate(lists->project_list, lGetString(job, JB_project));
if (ref->project) {
lSetUlong(ref->project, PR_job_cnt, 0);
lSetUlong(ref->project, PR_pending_job_cnt, 0);
Expand Down Expand Up @@ -813,8 +805,7 @@ sge_set_job_refs( lListElem *job,
* locate department object and save off reference in job entry
*-------------------------------------------------------------*/

ref->dept = locate_department(lists->dept_list,
lGetString(job, JB_department));
ref->dept = locate_department(lists->dept_list, lGetString(job, JB_department));
if (ref->dept) {
lSetUlong(ref->dept, US_job_cnt, 0);
lSetUlong(ref->dept, US_pending_job_cnt, 0);
Expand All @@ -827,9 +818,7 @@ sge_set_job_refs( lListElem *job,
*--------------------------------------------------------------------*/

static void
sge_set_job_cnts( sge_ref_t *ref,
int queued )
{
sge_set_job_cnts(sge_ref_t *ref, int queued) {
int prj_job_cnt_nm = queued ? PR_pending_job_cnt : PR_job_cnt;
int user_job_cnt_nm = queued ? UU_pending_job_cnt : UU_job_cnt;
int us_job_cnt_nm = queued ? US_pending_job_cnt : US_job_cnt;
Expand All @@ -842,8 +831,6 @@ sge_set_job_cnts( sge_ref_t *ref,
if (ref->dept) {
lAddUlong(ref->dept, us_job_cnt_nm, 1);
}

return;
}


Expand All @@ -852,9 +839,7 @@ sge_set_job_cnts( sge_ref_t *ref,
*--------------------------------------------------------------------*/

static void
sge_unset_job_cnts( sge_ref_t *ref,
int queued )
{
sge_unset_job_cnts(sge_ref_t *ref, int queued) {
int prj_job_cnt_nm = queued ? PR_pending_job_cnt : PR_job_cnt;
int user_job_cnt_nm = queued ? UU_pending_job_cnt : UU_job_cnt;
int us_job_cnt_nm = queued ? US_pending_job_cnt : US_job_cnt;
Expand All @@ -867,7 +852,6 @@ sge_unset_job_cnts( sge_ref_t *ref,
if (ref->dept) {
lAddUlong(ref->dept, us_job_cnt_nm, -1);
}
return;
}


Expand Down Expand Up @@ -1609,10 +1593,7 @@ calc_job_share_tree_tickets_pass2( sge_ref_t *ref, double total_share_tree_ticke
* ???
*******************************************************************************/
static void copy_ftickets(sge_ref_list_t *source, sge_ref_list_t *dest){
if (source == nullptr || dest == nullptr) {
return;
}
else {
if (source != nullptr && dest != nullptr) {
sge_ref_t *dest_r = dest->ref;
sge_ref_t *source_r = source->ref;

Expand Down Expand Up @@ -2673,7 +2654,7 @@ sge_calc_tickets( scheduler_all_data_t *lists,
}

/*-----------------------------------------------------------------
* Note: use of the the job_ref_t array assumes that no jobs
* Note: use of the job_ref_t array assumes that no jobs
* will be removed from the job lists and the job list order will
* be maintained during the execution of sge_calc_tickets.
*-----------------------------------------------------------------*/
Expand Down
Loading