Moved scontrol show job's Comment= field to the last item displayed

Moved scontrol show node's Reason= field to the last item displayed

NEWS

@@ -4,7 +4,7 @@ documents those changes that are of interest to users and admins.
 * Changes in SLURM 2.1.0-pre10
 =============================
  -- Improve sview layout of blocks in use.
- -- A user can not change the dimensions of the grid in sview.
+ -- A user can now change the dimensions of the grid in sview.
  -- BLUEGENE - improved startup speed further for large numbers of defined
     blocks
  -- Fix to _get_job_min_nodes() in wiki2/get_jobs.c suggested by Michal Novotny

src/api/job_info.c

@@ -588,19 +588,8 @@ line13:
 		xstrcat(out, tmp_line);
 	}
 
-	/****** Line 18 (optional) ******/
-	if (job_ptr->comment) {
-		if (one_liner)
-			xstrcat(out, " ");
-		else
-			xstrcat(out, "\n   ");
-		snprintf(tmp_line, sizeof(tmp_line), "Comment=%s ",
-			 job_ptr->comment);
-		xstrcat(out, tmp_line);
-	}
-
 #ifdef HAVE_BG
-	/****** Line 19 (optional) ******/
+	/****** Line 18 (optional) ******/
 	select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
 				       select_buf, sizeof(select_buf),
 				       SELECT_PRINT_BG_ID);
@@ -613,8 +602,8 @@ line13:
 			 "Block_ID=%s", select_buf);
 		xstrcat(out, tmp_line);
 	}
-#endif
-	/****** Line 20 (optional) ******/
+
+	/****** Line 19 (optional) ******/
 	select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
 				       select_buf, sizeof(select_buf),
 				       SELECT_PRINT_MIXED_SHORT);
@@ -626,9 +615,8 @@ line13:
 		xstrcat(out, select_buf);
 	}
 
-#ifdef HAVE_BG
 #ifdef HAVE_BGL
-	/****** Line 21 (optional) ******/
+	/****** Line 20 (optional) ******/
 	select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
 				       select_buf, sizeof(select_buf),
 				       SELECT_PRINT_BLRTS_IMAGE);
@@ -642,7 +630,7 @@ line13:
 		xstrcat(out, tmp_line);
 	}
 #endif
-	/****** Line 22 (optional) ******/
+	/****** Line 21 (optional) ******/
 	select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
 				select_buf, sizeof(select_buf),
 				SELECT_PRINT_LINUX_IMAGE);
@@ -660,7 +648,7 @@ line13:
 #endif
 		xstrcat(out, tmp_line);
 	}
-	/****** Line 23 (optional) ******/
+	/****** Line 22 (optional) ******/
 	select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
 				select_buf, sizeof(select_buf),
 				SELECT_PRINT_MLOADER_IMAGE);
@@ -673,7 +661,7 @@ line13:
 			 "MloaderImage=%s", select_buf);
 		xstrcat(out, tmp_line);
 	}
-	/****** Line 24 (optional) ******/
+	/****** Line 23 (optional) ******/
 	select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
 				select_buf, sizeof(select_buf),
 				SELECT_PRINT_RAMDISK_IMAGE);
@@ -693,6 +681,17 @@ line13:
 	}
 #endif
 
+	/****** Line 24 (optional) ******/
+	if (job_ptr->comment) {
+		if (one_liner)
+			xstrcat(out, " ");
+		else
+			xstrcat(out, "\n   ");
+		snprintf(tmp_line, sizeof(tmp_line), "Comment=%s ",
+			 job_ptr->comment);
+		xstrcat(out, tmp_line);
+	}
+
 	if (one_liner)
 		xstrcat(out, "\n");
 	else

src/api/node_info.c

@@ -204,8 +204,8 @@ slurm_sprint_node_table (node_info_t * node_ptr,
 		snprintf(tmp_line, sizeof(tmp_line), "OS=%s ", node_ptr->os);
 		xstrcat(out, tmp_line);
 	}
-	snprintf(tmp_line, sizeof(tmp_line), "RealMemory=%u Reason=%s",
-		 node_ptr->real_memory, node_ptr->reason);
+	snprintf(tmp_line, sizeof(tmp_line), "RealMemory=%u Sockets=%u",
+		 node_ptr->real_memory, node_ptr->sockets);
 	xstrcat(out, tmp_line);
 	if (one_liner)
 		xstrcat(out, " ");
@@ -215,16 +215,25 @@ slurm_sprint_node_table (node_info_t * node_ptr,
 	/****** Line 4 ******/
 
 	snprintf(tmp_line, sizeof(tmp_line),
-		 "Sockets=%u State=%s%s%s%s ThreadsPerCore=%u "
-		 "TmpDisk=%u Weight=%u",
-		 node_ptr->sockets, node_state_string(my_state),
-		 comp_str, drain_str, power_str, node_ptr->threads,
-		 node_ptr->tmp_disk, node_ptr->weight);
+		 "State=%s%s%s%s ThreadsPerCore=%u TmpDisk=%u Weight=%u",
+		 node_state_string(my_state), comp_str, drain_str, power_str,
+		 node_ptr->threads, node_ptr->tmp_disk, node_ptr->weight);
+	xstrcat(out, tmp_line);
+	if (one_liner)
+		xstrcat(out, " ");
+	else
+		xstrcat(out, "\n   ");
+
+	/****** Line 5 ******/
+
+	snprintf(tmp_line, sizeof(tmp_line), "Reason=%s",
+		 node_ptr->reason);
 	xstrcat(out, tmp_line);
 	if (one_liner)
 		xstrcat(out, "\n");
 	else
 		xstrcat(out, "\n\n");
+
 	return out;
 }
 

testsuite/expect/README

@@ -94,7 +94,7 @@ test1.7    Confirm that job time limit function works (--time option).
 test1.8    Confirm that basic srun stdin, stdout, and stderr options work
            (--input, --output, and --error option respectively).
 test1.9    Test of srun verbose mode (--verbose option).
-test1.10   Test of srun/slurmd debug mode (--debug option).
+test1.10   Test of srun/slurmd debug mode (--slurmd-debug option).
 test1.11   Test job name option (--job-name).
 test1.12   Test of --checkpoint option. This does not validate the
            checkpoint file itself.