Merge branch 'slurm-2.5'

NEWS

@@ -76,6 +76,7 @@ documents those changes that are of interest to users and admins.
     built.
  -- Comment out all of the logic in the job_submit/defaults plugin. The logic
     is only an example and not meant for actual use.
+ -- Eliminate configuration file 4096 character line limitation.
 
 * Changes in SLURM 2.5.3
 ========================

doc/man/man5/bluegene.conf.5

@@ -15,7 +15,6 @@ same directory as the \fBslurm.conf\fP file.
 Parameter names are case insensitive.
 Any text following a "#" in the configuration file is treated
 as a comment through the end of that line.
-The size of each line in the file is limited to 4096 characters.
 Changes to the configuration file take only effect upon restart of
 the slurmctld daemon.  "scontrol reconfigure" does nothing with this file.
 Changes will only take place after a restart of the controller.

doc/man/man5/cgroup.conf.5

@@ -16,7 +16,6 @@ same directory as the \fBslurm.conf\fP file.
 Parameter names are case insensitive.
 Any text following a "#" in the configuration file is treated
 as a comment through the end of that line.
-The size of each line in the file is limited to 4096 characters.
 Changes to the configuration file take effect upon restart of
 SLURM daemons, daemon receipt of the SIGHUP signal, or execution
 of the command "scontrol reconfigure" unless otherwise noted.

doc/man/man5/cray.conf.5

@@ -16,7 +16,6 @@ installation and this file will not be required.
 Parameter names are case insensitive.
 Any text following a "#" in the configuration file is treated
 as a comment through the end of that line.
-The size of each line in the file is limited to 4096 characters.
 Changes to the configuration file take effect upon restart of
 SLURM daemons, daemon receipt of the SIGHUP signal, or execution
 of the command "scontrol reconfigure" unless otherwise noted.

doc/man/man5/gres.conf.5

@@ -15,7 +15,6 @@ set by the gres plugin function node_config_load(), this file may be optional.
 Parameter names are case insensitive.
 Any text following a "#" in the configuration file is treated
 as a comment through the end of that line.
-The size of each line in the file is limited to 4096 characters.
 Changes to the configuration file take effect upon restart of
 SLURM daemons, daemon receipt of the SIGHUP signal, or execution
 of the command "scontrol reconfigure" unless otherwise noted.

doc/man/man5/slurm.conf.5

@@ -19,7 +19,6 @@ option on the command line.
 The contents of the file are case insensitive except for the names of nodes
 and partitions. Any text following a "#" in the configuration file is treated
 as a comment through the end of that line.
-The size of each line in the file is limited to 4096 characters.
 Changes to the configuration file take effect upon restart of
 SLURM daemons, daemon receipt of the SIGHUP signal, or execution
 of the command "scontrol reconfigure" unless otherwise noted.

doc/man/man5/slurmdbd.conf.5

@@ -12,7 +12,6 @@ environment variable.
 The contents of the file are case insensitive except for the names of nodes
 and files. Any text following a "#" in the configuration file is treated
 as a comment through the end of that line.
-The size of each line in the file is limited to 4096 characters.
 Changes to the configuration file take effect upon restart of
 SlurmDbd or daemon receipt of the SIGHUP signal unless otherwise noted.
 .LP

doc/man/man5/topology.conf.5

@@ -14,7 +14,6 @@ same directory as the \fBslurm.conf\fP file.
 Parameter names are case insensitive.
 Any text following a "#" in the configuration file is treated
 as a comment through the end of that line.
-The size of each line in the file is limited to 4096 characters.
 Changes to the configuration file take effect upon restart of
 SLURM daemons, daemon receipt of the SIGHUP signal, or execution
 of the command "scontrol reconfigure" unless otherwise noted.

doc/man/man5/wiki.conf.5

@@ -12,7 +12,6 @@ same directory as the \fBslurm.conf\fP file.
 Parameter names are case insensitive.
 Any text following a "#" in the configuration file is treated
 as a comment through the end of that line.
-The size of each line in the file is limited to 4096 characters.
 Changes to the configuration file take effect upon restart of
 SLURM daemons, daemon receipt of the SIGHUP signal, or execution
 of the command "scontrol reconfigure" unless otherwise noted.

src/common/parse_config.c

@@ -870,13 +870,13 @@ int s_p_parse_file(s_p_hashtbl_t *hashtbl, uint32_t *hash_val, char *filename,
 		   bool ignore_new)
 {
 	FILE *f;
-	char line[BUFFER_SIZE];
 	char *leftover = NULL;
 	int rc = SLURM_SUCCESS;
 	int line_number;
 	int merged_lines;
 	int inc_rc;
 	struct stat stat_buf;
+	char *line = NULL;
 
 	if (!filename) {
 		error("s_p_parse_file: No filename given.");
@@ -899,9 +899,10 @@ int s_p_parse_file(s_p_hashtbl_t *hashtbl, uint32_t *hash_val, char *filename,
 		return SLURM_ERROR;
 	}
 
+	line = xmalloc(sizeof(char) * stat_buf.st_size);
 	line_number = 1;
 	while ((merged_lines = _get_next_line(
-			line, BUFFER_SIZE, hash_val, f)) > 0) {
+			line, stat_buf.st_size, hash_val, f)) > 0) {
 		/* skip empty lines */
 		if (line[0] == '\0') {
 			line_number += merged_lines;
@@ -937,6 +938,7 @@ int s_p_parse_file(s_p_hashtbl_t *hashtbl, uint32_t *hash_val, char *filename,
 		line_number += merged_lines;
 	}
 
+	xfree(line);
 	fclose(f);
 	return rc;
 }