diff --git a/NEWS b/NEWS
index 4478e28fc2fe675c54813d7515fb7e4b98fb2aab..8402fe75f5576798fa7dd0f71efe70fb4e35ea75 100644
--- a/NEWS
+++ b/NEWS
@@ -48,6 +48,7 @@ documents those changes that are of interest to users and admins.
distributed separately has been moved within the main SLURM distribution
and is packaged as a separate RPM.
-- Added configuration parameter MaxTasksPerNode.
+ -- Remove configuration parameter SrunIOTimeout.
* Changes in SLURM 2.1.0-pre2
=============================
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index b58544946e7ee6a3958380e052de5e96b7b535ed..68e3b92bc9bc5238e47e24885bd1d1ef592ce8ab 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -1433,21 +1433,6 @@ completion of a job step. The command line arguments for the executable will
be the command and arguments of the job step. This configuration parameter
may be overridden by srun's \fB\-\-epilog\fR parameter.
-.TP
-\fBSrunIOTimeout\fR
-While the \fBsrun\fR detects the termination of tasks under almost all
-circumstances, there are abnormal deamon failures which may not be
-detected immediately.
-Such abnormal failures can be detected by \fBsrun\fR using a more active
-polling mechanism.
-Note that polling does have an impact upon application performance.
-The interval of polling is specified by the \fBSrunIOTimeout\fR
-parameter and its units are seconds.
-\fBsrun\fR's \fB\-\-io\-timeout\fR option takes precedence over
-this configuration parameter.
-The default value is 0 (no polling).
-The value may not exceed 65533 seconds.
-
.TP
\fBSrunProlog\fR
Fully qualified pathname of an executable to be run by srun prior to the
diff --git a/slurm/slurm.h.in b/slurm/slurm.h.in
index e7786f072e31a3fd0d0418be7146460e973f75c4..ea7813cf2fd2c12a8121676345d29caa451b00a0 100644
--- a/slurm/slurm.h.in
+++ b/slurm/slurm.h.in
@@ -1354,7 +1354,6 @@ typedef struct slurm_ctl_conf {
* considering node DOWN */
char *slurm_conf; /* pathname of slurm config file */
char *srun_epilog; /* srun epilog program */
- uint16_t srun_io_timeout; /* timeout for non-responsive tasks */
char *srun_prolog; /* srun prolog program */
char *state_save_location;/* pathname of slurmctld state save
* directory */
diff --git a/src/api/config_info.c b/src/api/config_info.c
index 31ab9fba999a043c6055348060063d11919e174b..89da0738f27ce1c19b08c5779348e40c7b0bf35e 100644
--- a/src/api/config_info.c
+++ b/src/api/config_info.c
@@ -452,8 +452,6 @@ void slurm_print_ctl_conf ( FILE* out,
fprintf(out, "SLURM_VERSION = %s\n", SLURM_VERSION);
fprintf(out, "SrunEpilog = %s\n",
slurm_ctl_conf_ptr->srun_epilog);
- fprintf(out, "SrunIOTimeout = %u sec\n",
- slurm_ctl_conf_ptr->srun_io_timeout);
fprintf(out, "SrunProlog = %s\n",
slurm_ctl_conf_ptr->srun_prolog);
fprintf(out, "StateSaveLocation = %s\n",
diff --git a/src/common/read_config.c b/src/common/read_config.c
index a76cc6e348a21966c1d369bdb2ef230355cfc206..1dd1e61646af8d2c9c36658650e821c432a4da4e 100644
--- a/src/common/read_config.c
+++ b/src/common/read_config.c
@@ -256,7 +256,6 @@ s_p_options_t slurm_conf_options[] = {
{"SlurmdSpoolDir", S_P_STRING},
{"SlurmdTimeout", S_P_UINT16},
{"SrunEpilog", S_P_STRING},
- {"SrunIOTimeout", S_P_UINT16},
{"SrunProlog", S_P_STRING},
{"StateSaveLocation", S_P_STRING},
{"SuspendExcNodes", S_P_STRING},
@@ -1489,7 +1488,6 @@ init_slurm_conf (slurm_ctl_conf_t *ctl_conf_ptr)
xfree (ctl_conf_ptr->slurmd_spooldir);
ctl_conf_ptr->slurmd_timeout = (uint16_t) NO_VAL;
xfree (ctl_conf_ptr->srun_prolog);
- ctl_conf_ptr->srun_io_timeout = 0;
xfree (ctl_conf_ptr->srun_epilog);
xfree (ctl_conf_ptr->state_save_location);
xfree (ctl_conf_ptr->suspend_exc_nodes);
@@ -2435,7 +2433,6 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
conf->slurmd_timeout = DEFAULT_SLURMD_TIMEOUT;
s_p_get_string(&conf->srun_prolog, "SrunProlog", hashtbl);
- s_p_get_uint16(&conf->srun_io_timeout, "SrunIOTimeout", hashtbl);
s_p_get_string(&conf->srun_epilog, "SrunEpilog", hashtbl);
if (!s_p_get_string(&conf->state_save_location,
diff --git a/src/common/slurm_protocol_api.c b/src/common/slurm_protocol_api.c
index 1a35092c989120375d7d8a7b3d3f3fa25aed8a61..1abb5a71496b3e0902106400301328fa02303e9d 100644
--- a/src/common/slurm_protocol_api.c
+++ b/src/common/slurm_protocol_api.c
@@ -1531,23 +1531,6 @@ char *slurm_get_select_type(void)
return select_type;
}
-/* slurm_get_srun_io_timeout
- * get default srun I/O task timeout value from slurmctld_conf object
- */
-uint16_t slurm_get_srun_io_timeout(void)
-{
- uint16_t srun_io_timeout = 0;
- slurm_ctl_conf_t *conf;
-
- if(slurmdbd_conf) {
- } else {
- conf = slurm_conf_lock();
- srun_io_timeout = conf->srun_io_timeout;
- slurm_conf_unlock();
- }
- return srun_io_timeout;
-}
-
/* slurm_get_switch_type
* get switch type from slurmctld_conf object
* RET char * - switch type, MUST be xfreed by caller
diff --git a/src/common/slurm_protocol_api.h b/src/common/slurm_protocol_api.h
index efd571728926ad02369aae5e2b252989804e3e42..744c1b98f5a01d4f9557a96264dfa406c78b5ab3 100644
--- a/src/common/slurm_protocol_api.h
+++ b/src/common/slurm_protocol_api.h
@@ -514,11 +514,6 @@ char *slurm_get_sched_type(void);
*/
char *slurm_get_select_type(void);
-/* slurm_get_srun_io_timeout
- * get default srun I/O task timeout value from slurmctld_conf object
- */
-uint16_t slurm_get_srun_io_timeout(void);
-
/* slurm_get_switch_type
* get switch type from slurmctld_conf object
* RET char * - switch type, MUST be xfreed by caller
diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index 1a7280a82dbcc9ea0967bd0e304c533d978a1978..d1ebd3a61ebfb2a72508dea9481037b4e24b07a4 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -3048,7 +3048,6 @@ _pack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t * build_ptr, Buf buffer)
pack16(build_ptr->slurmd_timeout, buffer);
packstr(build_ptr->srun_epilog, buffer);
- pack16(build_ptr->srun_io_timeout, buffer);
packstr(build_ptr->srun_prolog, buffer);
packstr(build_ptr->state_save_location, buffer);
packstr(build_ptr->suspend_exc_nodes, buffer);
@@ -3279,7 +3278,6 @@ _unpack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t **
safe_unpack16(&build_ptr->slurmd_timeout, buffer);
safe_unpackstr_xmalloc(&build_ptr->srun_epilog, &uint32_tmp, buffer);
- safe_unpack16(&build_ptr->srun_io_timeout, buffer);
safe_unpackstr_xmalloc(&build_ptr->srun_prolog, &uint32_tmp, buffer);
safe_unpackstr_xmalloc(&build_ptr->state_save_location,
&uint32_tmp, buffer);
diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c
index ff510c098111d123cc637c1945d6ac5705e98649..e285e387ef13b4ef38bb4130f00b207cb9861552 100644
--- a/src/slurmctld/proc_req.c
+++ b/src/slurmctld/proc_req.c
@@ -545,7 +545,6 @@ void _fill_ctld_conf(slurm_ctl_conf_t * conf_ptr)
conf_ptr->slurmd_user_name = xstrdup(conf->slurmd_user_name);
conf_ptr->slurm_conf = xstrdup(conf->slurm_conf);
conf_ptr->srun_prolog = xstrdup(conf->srun_prolog);
- conf_ptr->srun_io_timeout = conf->srun_io_timeout;
conf_ptr->srun_epilog = xstrdup(conf->srun_epilog);
conf_ptr->state_save_location = xstrdup(conf->state_save_location);
conf_ptr->suspend_exc_nodes = xstrdup(conf->suspend_exc_nodes);