Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Slurm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tud-zih-energy
Slurm
Commits
53d7ff33
Commit
53d7ff33
authored
18 years ago
by
Danny Auble
Browse files
Options
Downloads
Patches
Plain Diff
fix for some places looking at only a uint16_t where it is really uint32_t
parent
04549a47
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/plugins/select/bluegene/plugin/select_bluegene.c
+2
-2
2 additions, 2 deletions
src/plugins/select/bluegene/plugin/select_bluegene.c
src/slurmctld/job_mgr.c
+3
-2
3 additions, 2 deletions
src/slurmctld/job_mgr.c
with
5 additions
and
4 deletions
src/plugins/select/bluegene/plugin/select_bluegene.c
+
2
−
2
View file @
53d7ff33
...
@@ -497,7 +497,7 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
...
@@ -497,7 +497,7 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
SELECT_DATA_MAX_PROCS
,
SELECT_DATA_MAX_PROCS
,
&
tmp
);
&
tmp
);
if
(
job_desc
->
min_nodes
==
(
uint
16
_t
)
NO_VAL
)
if
(
job_desc
->
min_nodes
==
(
uint
32
_t
)
NO_VAL
)
return
SLURM_SUCCESS
;
return
SLURM_SUCCESS
;
select_g_get_jobinfo
(
job_desc
->
select_jobinfo
,
select_g_get_jobinfo
(
job_desc
->
select_jobinfo
,
SELECT_DATA_GEOMETRY
,
&
req_geometry
);
SELECT_DATA_GEOMETRY
,
&
req_geometry
);
...
@@ -554,7 +554,7 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
...
@@ -554,7 +554,7 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
job_desc
->
min_nodes
=
1
;
job_desc
->
min_nodes
=
1
;
}
}
if
(
job_desc
->
max_nodes
==
(
uint
16
_t
)
NO_VAL
)
if
(
job_desc
->
max_nodes
==
(
uint
32
_t
)
NO_VAL
)
return
SLURM_SUCCESS
;
return
SLURM_SUCCESS
;
if
(
job_desc
->
max_nodes
>
bluegene_bp_node_cnt
)
{
if
(
job_desc
->
max_nodes
>
bluegene_bp_node_cnt
)
{
...
...
This diff is collapsed.
Click to expand it.
src/slurmctld/job_mgr.c
+
3
−
2
View file @
53d7ff33
...
@@ -1671,7 +1671,7 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
...
@@ -1671,7 +1671,7 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
select_g_get_jobinfo
(
job_desc
->
select_jobinfo
,
select_g_get_jobinfo
(
job_desc
->
select_jobinfo
,
SELECT_DATA_MAX_PROCS
,
&
max_procs
);
SELECT_DATA_MAX_PROCS
,
&
max_procs
);
debug2
(
"after alteration asking for nodes %u-%u procs %u-%
d
"
,
debug2
(
"after alteration asking for nodes %u-%u procs %u-%
u
"
,
job_desc
->
min_nodes
,
job_desc
->
max_nodes
,
job_desc
->
min_nodes
,
job_desc
->
max_nodes
,
job_desc
->
num_procs
,
max_procs
);
job_desc
->
num_procs
,
max_procs
);
...
@@ -1808,7 +1808,8 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
...
@@ -1808,7 +1808,8 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
}
}
if
(
job_desc
->
max_nodes
&&
if
(
job_desc
->
max_nodes
&&
(
job_desc
->
max_nodes
<
job_desc
->
min_nodes
))
{
(
job_desc
->
max_nodes
<
job_desc
->
min_nodes
))
{
info
(
"Job's max_nodes < min_nodes"
);
info
(
"Job's max_nodes(%u) < min_nodes(%u)"
,
job_desc
->
max_nodes
,
job_desc
->
min_nodes
);
error_code
=
ESLURM_TOO_MANY_REQUESTED_NODES
;
error_code
=
ESLURM_TOO_MANY_REQUESTED_NODES
;
goto
cleanup
;
goto
cleanup
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment