svn merge -r17206:17233 https://eris.llnl.gov/svn/slurm/branches/slurm-1.3

NEWS

@@ -294,6 +294,11 @@ documents those changes that are of interest to users and admins.
  -- BLUEGENE - on job cancellation we call jm_cancel_job and then wait until
     the system cleans up the job.  Before we would send a SIGKILL right 
     at the beginning. 
+ -- BLUEGENE - if a user specifies a node count that can not be met the job 
+    will be refused instead of before the plugin would search for the next 
+    larger size that could be created.  This prevents users asking for 
+    things that can't be created, and then getting something back they might 
+    not be expecting.
 
 * Changes in SLURM 1.3.14
 =========================

src/plugins/select/bluegene/block_allocator/block_allocator.c

@@ -598,7 +598,7 @@ extern int new_ba_request(ba_request_t* ba_request)
 				  ba_request->elongate_geos,
 				  ba_request->rotate);
 		}	
-	startagain:		
+//	startagain:		
 		picked=0;
 		for(i=0;i<8;i++)
 			checked[i]=0;
@@ -649,9 +649,21 @@ extern int new_ba_request(ba_request_t* ba_request)
 							break;
 					}		
 				}				
+				/* This size can not be made into a
+				   block return.  If you want to try
+				   until we find the next largest block
+				   uncomment the code below and the goto
+				   above. If a user specifies a max
+				   node count the job will never
+				   run.  
+				*/
 				if(i2==1) {
-					ba_request->size +=1;
-					goto startagain;
+					error("Can't make a block of "
+					      "%d into a cube.",
+					      ba_request->size);
+					return 0;
+/* 					ba_request->size +=1; */
+/* 					goto startagain; */
 				}
 						
 			} else {

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

@@ -195,12 +195,19 @@ extern List create_dynamic_block(List block_list,
 	if(request->conn_type == SELECT_NAV)
 		request->conn_type = SELECT_TORUS;
 	
+	//debug("going to create %d", request->size);
 	if(!new_ba_request(request)) {
-		error("Problems with request for size %d geo %dx%dx%d", 
-		      request->size,
-		      request->geometry[X], 
-		      request->geometry[Y], 
-		      request->geometry[Z]);
+		if(geo[X] == (uint16_t)NO_VAL) {
+			error("Problems with request for size %d geo %dx%dx%d", 
+			      request->size,
+			      request->geometry[X], 
+			      request->geometry[Y], 
+			      request->geometry[Z]);
+		} else {
+			error("Problems with request for size %d.  "
+			      "No geo given.", 
+			      request->size);
+		}
 		rc = ESLURM_INTERCONNECT_FAILURE;
 		goto finished;
 	}