From 153bf0e83b36a95e6121e38f876c41d7d0aeb9ed Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Tue, 17 Oct 2006 21:48:23 +0000
Subject: [PATCH] svn merge -r9818:9824
https://eris.llnl.gov/svn/slurm/branches/slurm-1.1
---
NEWS | 3 ++-
doc/man/man1/srun.1 | 8 +++++++-
src/plugins/select/bluegene/plugin/bluegene.c | 2 --
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/NEWS b/NEWS
index 74c286026f6..ac37493fb9b 100644
--- a/NEWS
+++ b/NEWS
@@ -15,7 +15,8 @@ documents those changes that are of interest to users and admins.
-- Multi-core support in sinfo, squeue, and scontrol.
-- Memory can be treated as a consumable resource.
-- New srun options --ntasks-per-[node|socket|core].
- -- patch from HP patch.1.2.0.pre4.061017.crcore_hints
+ -- Patch from HP patch.1.2.0.pre4.061017.crcore_hints, supports cores as consumable
+ resource.
* Changes in SLURM 1.2.0-pre3
=============================
diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1
index ed9063fb8e6..eea7dfd649d 100644
--- a/doc/man/man1/srun.1
+++ b/doc/man/man1/srun.1
@@ -1080,7 +1080,13 @@ are:
.TP
\fBSLURM_CPUS_ON_NODE\fR
-Count of processors available to the job on this node
+Count of processors available to the job on this node.
+Note the select/linear plugin allocates entire nodes to
+jobs, so the value indicates the total count of CPUs on the node.
+The select/cons_res plugin allocates individual processors
+to jobs, so this number indicates the number of processors
+on this node allocated to the job.
+
.TP
\fBSLURM_JOBID\fR
Job id of the executing job
diff --git a/src/plugins/select/bluegene/plugin/bluegene.c b/src/plugins/select/bluegene/plugin/bluegene.c
index 5d16cd2211f..bb0d1d1a2e0 100644
--- a/src/plugins/select/bluegene/plugin/bluegene.c
+++ b/src/plugins/select/bluegene/plugin/bluegene.c
@@ -287,7 +287,6 @@ extern void process_nodes(bg_record_t *bg_record)
if(!bg_record->bg_block_list) {
bg_record->bg_block_list =
list_create(destroy_ba_node);
- info("got here");
}
bg_record->bp_count = 0;
@@ -445,7 +444,6 @@ extern void copy_bg_record(bg_record_t *fir_record, bg_record_t *sec_record)
if(fir_record->bg_block_list) {
itr = list_iterator_create(fir_record->bg_block_list);
while((ba_node = list_next(itr))) {
- info("got here 2");
new_ba_node = ba_copy_node(ba_node);
list_push(sec_record->bg_block_list, new_ba_node);
}
--
GitLab