Skip to content
Snippets Groups Projects
Commit adf7cfe2 authored by Moe Jette's avatar Moe Jette
Browse files

Fix bug in processing job feature requests with node counts (could fail

    to schedule job if some nodes have not associated features).
parent 1361f31e
No related branches found
No related tags found
No related merge requests found
...@@ -35,6 +35,8 @@ documents those changes that are of interest to users and admins. ...@@ -35,6 +35,8 @@ documents those changes that are of interest to users and admins.
management yet. management yet.
-- For srun/sbatch --get-user-env option (Moab use only) look for "env" -- For srun/sbatch --get-user-env option (Moab use only) look for "env"
command in both /bin and /usr/sbin (for Suse Linux). command in both /bin and /usr/sbin (for Suse Linux).
-- Fix bug in processing job feature requests with node counts (could fail
to schedule job if some nodes have not associated features).
* Changes in SLURM 1.3.1 * Changes in SLURM 1.3.1
======================== ========================
......
...@@ -233,7 +233,7 @@ static int _match_feature(char *seek, char *available) ...@@ -233,7 +233,7 @@ static int _match_feature(char *seek, char *available)
if (seek == NULL) if (seek == NULL)
return 1; /* nothing to look for */ return 1; /* nothing to look for */
if (available == NULL) if (available == NULL)
return SLURM_SUCCESS; /* nothing to find */ return 0; /* nothing to find */
tmp_available = xstrdup(available); tmp_available = xstrdup(available);
found = 0; found = 0;
...@@ -1636,8 +1636,6 @@ static bitstr_t *_valid_features(struct job_details *details_ptr, ...@@ -1636,8 +1636,6 @@ static bitstr_t *_valid_features(struct job_details *details_ptr,
bit_set(result_bits, 0); bit_set(result_bits, 0);
return result_bits; return result_bits;
} }
if (available == NULL) /* no features */
return result_bits;
result = 1; /* assume good for now */ result = 1; /* assume good for now */
last_op = FEATURE_OP_AND; last_op = FEATURE_OP_AND;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment