From 22e9a182e1aec199057db98ee98c046b76b82acd Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Thu, 10 Sep 2009 17:44:28 +0000
Subject: [PATCH] svn merge -r18657:18671
https://eris.llnl.gov/svn/slurm/branches/slurm-2.0
---
src/slurmctld/acct_policy.c | 2 ++
src/slurmd/slurmd/slurmd.c | 16 +++++++++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/slurmctld/acct_policy.c b/src/slurmctld/acct_policy.c
index 7a0d9ae6495..73f5cd2624d 100644
--- a/src/slurmctld/acct_policy.c
+++ b/src/slurmctld/acct_policy.c
@@ -604,6 +604,8 @@ end_qos:
job_ptr->details->min_nodes,
assoc_ptr->grp_nodes, assoc_ptr->acct);
_cancel_job(job_ptr);
+ rc = false;
+ goto end_it;
} else if ((assoc_ptr->grp_used_nodes +
job_ptr->details->min_nodes) >
assoc_ptr->grp_nodes) {
diff --git a/src/slurmd/slurmd/slurmd.c b/src/slurmd/slurmd/slurmd.c
index d8c37c85287..30c33885c28 100644
--- a/src/slurmd/slurmd/slurmd.c
+++ b/src/slurmd/slurmd/slurmd.c
@@ -734,7 +734,21 @@ _read_config(void)
&conf->block_map_size,
&conf->block_map, &conf->block_map_inv);
- if(!cf->fast_schedule) {
+ if(cf->fast_schedule &&
+ ((conf->conf_cpus != conf->actual_cpus) ||
+ (conf->sockets != conf->actual_sockets) ||
+ (conf->cores != conf->actual_cores) ||
+ (conf->threads != conf->actual_threads))) {
+ info("Node configuration differs from hardware\n"
+ " Procs=%u:%u(hw) Sockets=%u:%u(hw)\n"
+ " CoresPerSocket%u:%u(hw) ThreadsPerCore:%u:%u(hw)",
+ conf->conf_cpus, conf->actual_cpus,
+ conf->conf_sockets, conf->actual_sockets,
+ conf->conf_cores, conf->actual_cores,
+ conf->conf_threads, conf->actual_threads);
+ }
+
+ if((cf->fast_schedule == 0) || (conf->actual_cpus < conf->conf_cpus)) {
conf->cpus = conf->actual_cpus;
conf->sockets = conf->actual_sockets;
conf->cores = conf->actual_cores;
--
GitLab