Scale partition node count in partition by c-nodes per BP on bluegene systems.

src/plugins/select/bluegene/plugin/select_bluegene.c

@@ -383,37 +383,23 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
 				found_record = bg_record;
 			list_iterator_destroy(itr);
 		}
-		if(!found_record|| 
+		if(!found_record || 
 		   (found_record->cpus_per_bp == procs_per_node))
 			(*nodes) = bluegene_bp_node_cnt;
 		else
 			(*nodes) = found_record->node_cnt;		
 		break;
 	case SELECT_APPLY_NODE_MIN_OFFSET:
-		if(bg_list) {
-			itr = list_iterator_create(bg_list);
-			bg_record = (bg_record_t *)list_next(itr);
-			list_iterator_destroy(itr);
+		if((*nodes) == 1) {
+			/* Job will actually get more than one c-node, 
+			 * but we can't be sure exactly how much so we 
+			 * don't scale up this value. */
+			break;
 		}
-		if(!bg_record || 
-		   (bg_record->cpus_per_bp == procs_per_node)) 
-			(*nodes) *= bluegene_bp_node_cnt;
-		else 
-			(*nodes) *= bg_record->node_cnt;		
+		(*nodes) *= bluegene_bp_node_cnt;
 		break;
 	case SELECT_APPLY_NODE_MAX_OFFSET:
-		if(bg_list) {
-			itr = list_iterator_create(bg_list);
-			while ((bg_record = (bg_record_t *) 
-				list_next(itr)) != NULL) 
-				found_record = bg_record;
-			list_iterator_destroy(itr);
-		}
-		if(!found_record || 
-		   (found_record->cpus_per_bp == procs_per_node))
-			(*nodes) *= bluegene_bp_node_cnt;
-		else
-			(*nodes) *= found_record->node_cnt;		
+		(*nodes) *= bluegene_bp_node_cnt;
 		break;
 	case SELECT_SET_NODE_CNT:
 		select_g_get_jobinfo(job_desc->select_jobinfo,

src/slurmctld/partition_mgr.c

@@ -711,8 +711,8 @@ void pack_part(struct part_record *part_ptr, Buf buffer)
 				&altered);
 	pack32((uint32_t)altered, buffer);
 	altered = part_ptr->min_nodes;
-	/* select_g_alter_node_cnt(SELECT_APPLY_NODE_MIN_OFFSET,  */
-/* 				&altered); */
+	select_g_alter_node_cnt(SELECT_APPLY_NODE_MIN_OFFSET,
+ 				&altered); 
 	pack32((uint32_t)altered, buffer);
 	altered = part_ptr->total_nodes;
 	select_g_alter_node_cnt(SELECT_APPLY_NODE_MAX_OFFSET,