From 53d7ff3329a89f4282505dc74fab3d9c6572368e Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Fri, 3 Nov 2006 21:35:52 +0000
Subject: [PATCH] fix for some places looking at only a uint16_t where it is
really uint32_t
---
src/plugins/select/bluegene/plugin/select_bluegene.c | 4 ++--
src/slurmctld/job_mgr.c | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/plugins/select/bluegene/plugin/select_bluegene.c b/src/plugins/select/bluegene/plugin/select_bluegene.c
index f8aebe940c7..e8cddd45bcb 100644
--- a/src/plugins/select/bluegene/plugin/select_bluegene.c
+++ b/src/plugins/select/bluegene/plugin/select_bluegene.c
@@ -497,7 +497,7 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
SELECT_DATA_MAX_PROCS,
&tmp);
- if(job_desc->min_nodes == (uint16_t) NO_VAL)
+ if(job_desc->min_nodes == (uint32_t) NO_VAL)
return SLURM_SUCCESS;
select_g_get_jobinfo(job_desc->select_jobinfo,
SELECT_DATA_GEOMETRY, &req_geometry);
@@ -554,7 +554,7 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
job_desc->min_nodes = 1;
}
- if(job_desc->max_nodes == (uint16_t) NO_VAL)
+ if(job_desc->max_nodes == (uint32_t) NO_VAL)
return SLURM_SUCCESS;
if(job_desc->max_nodes > bluegene_bp_node_cnt) {
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 6466d9f6eed..cf284fbf062 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -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_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->num_procs, max_procs);
@@ -1808,7 +1808,8 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
}
if (job_desc->max_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;
goto cleanup;
}
--
GitLab