Merge remote branch 'origin/slurm-2.6'

NEWS

@@ -42,6 +42,10 @@ documents those changes that are of interest to users and admins.
  -- Corrected the hdf5 profile user guide and the acct_gather.conf
     documentation.
  -- IPMI - Fix Math bug getting new wattage.
+ -- Corrected the AcctGatherProfileType documentation in slurm.conf
+ -- Corrected the sh5util program to print the header in the csv file 
+    only once, set the debug messages at debug() level, make the argument 
+    check case insensitive and avoid printing duplicate \n.
 
 * Changes in Slurm 2.6.0
 ========================

src/plugins/acct_gather_profile/hdf5/sh5util/sh5util.c

@@ -1074,6 +1074,7 @@ static void _extract_data()
 		return;
 	}
 	nsteps = get_int_attribute(jgid_root, ATTR_NSTEPS);
+	header = true;
 	for (stepx=0; stepx<nsteps; stepx++) {
 		if ((params.step_id != -1) && (stepx != params.step_id))
 			continue;
@@ -1119,13 +1120,14 @@ static void _extract_data()
 			H5Gclose(jgid_node);
 			if (!params.series || !strcmp(params.series, "*")) {
 				for (isx=0; isx<num_series; isx++) {
-					_extract_node_level(
-						fp, stepx, jgid_nodes,
-						nnodes, true,
-						series_names[isx]);
+					_extract_node_level(fp, stepx, jgid_nodes,
+					                    nnodes, header,
+					                    series_names[isx]);
+					header = false;
+
 				}
-			} else if (!strcmp(params.series, GRP_TASKS)) {
-				header = true;
+			} else if (strcasecmp(params.series, GRP_TASKS) == 0
+			           || strcasecmp(params.series, GRP_TASK) == 0) {
 				for (isx=0; isx<num_series; isx++) {
 					if (strstr(series_names[isx],
 						   GRP_TASK)) {
@@ -1138,8 +1140,9 @@ static void _extract_data()
 				}
 			} else {
 				_extract_node_level(fp, stepx, jgid_nodes,
-						    nnodes, true,
-						    params.series);
+				                    nnodes, header,
+				                    params.series);
+				header = false;
 			}
 			_delete_string_list(series_names, num_series);
 			series_names = NULL;
@@ -1168,13 +1171,13 @@ int main (int argc, char **argv)
 	profile_init();
 	switch (params.mode) {
 	case SH5UTIL_MODE_MERGE:
-		info("Merging node-step files into %s",
-		     params.output);
+		debug("Merging node-step files into %s",
+		      params.output);
 		_merge_step_files();
 		break;
 	case SH5UTIL_MODE_EXTRACT:
-		info("Extracting job data from %s into %s\n",
-		     params.input, params.output);
+		debug("Extracting job data from %s into %s",
+		      params.input, params.output);
 		_extract_data();
 		break;
 	default: