diff --git a/src/salloc/opt.c b/src/salloc/opt.c index ce50dffa3b0ed86f9c9d4a853f5e13af2d049739..867b6289b895a48083df512487c7f52c3ee67c8d 100644 --- a/src/salloc/opt.c +++ b/src/salloc/opt.c @@ -1042,6 +1042,17 @@ static bool _opt_verify(void) if ((opt.egid != (gid_t) -1) && (opt.egid != opt.gid)) opt.gid = opt.egid; + if (opt.immediate) { + char *sched_name = slurm_get_sched_type(); + if ((strcmp(sched_name, "sched/wiki") == 0) + || (strcmp(sched_name, "sched/wiki2") == 0)) { + info("WARNING: Ignoring the -I/--immediate option " + "(not supported by Moab)"); + opt.immediate = false; + } + xfree(sched_name); + } + return verified; } diff --git a/src/sbatch/opt.c b/src/sbatch/opt.c index 6f563cd69a6ce3b8bdde9770315faac25fa4df2d..15d2f0a8fb5baab90cf753daa6d5df25dceb0b31 100644 --- a/src/sbatch/opt.c +++ b/src/sbatch/opt.c @@ -1284,6 +1284,17 @@ static bool _opt_verify(void) if ((opt.egid != (gid_t) -1) && (opt.egid != opt.gid)) opt.gid = opt.egid; + if (opt.immediate) { + char *sched_name = slurm_get_sched_type(); + if ((strcmp(sched_name, "sched/wiki") == 0) + || (strcmp(sched_name, "sched/wiki2") == 0)) { + info("WARNING: Ignoring the -I/--immediate option " + "(not supported by Moab)"); + opt.immediate = false; + } + xfree(sched_name); + } + return verified; } diff --git a/src/srun/opt.c b/src/srun/opt.c index 58aef66a9345c76f552d289ec1aaaa2cb0923a78..02d76dca0ee2b447bd895d42b73b8d753cccf4d9 100644 --- a/src/srun/opt.c +++ b/src/srun/opt.c @@ -2308,6 +2308,17 @@ static bool _opt_verify(void) verified = false; } + if (opt.immediate) { + char *sched_name = slurm_get_sched_type(); + if ((strcmp(sched_name, "sched/wiki") == 0) + || (strcmp(sched_name, "sched/wiki2") == 0)) { + info("WARNING: Ignoring the -I/--immediate option " + "(not supported by Moab)"); + opt.immediate = false; + } + xfree(sched_name); + } + return verified; }