From eed02c412aa354dd83f1722fd8ab6bbb5431a39c Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Mon, 14 Feb 2011 04:16:05 +0000
Subject: [PATCH] minor code tweaks to execute srun on emulated cray system
only
---
src/plugins/select/cray/basil_interface.c | 2 +-
src/plugins/select/cray/select_cray.c | 4 ++--
src/srun/srun.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/plugins/select/cray/basil_interface.c b/src/plugins/select/cray/basil_interface.c
index 819580d946a..1b46317ee82 100644
--- a/src/plugins/select/cray/basil_interface.c
+++ b/src/plugins/select/cray/basil_interface.c
@@ -7,7 +7,7 @@
#include "basil_interface.h"
#include "basil_alps.h"
-#define _DEBUG 1
+#define _DEBUG 0
int dim_size[3] = {0, 0, 0};
diff --git a/src/plugins/select/cray/select_cray.c b/src/plugins/select/cray/select_cray.c
index dfb02b78a2f..fa2324662a4 100644
--- a/src/plugins/select/cray/select_cray.c
+++ b/src/plugins/select/cray/select_cray.c
@@ -255,9 +255,9 @@ extern int select_p_job_ready(struct job_record *job_ptr)
* means that we need to confirm only if batch_flag is 0,
* and execute the other_job_ready() only in slurmctld.
*/
- if (!job_ptr->batch_flag)
+ if (!job_ptr->batch_flag && (job_ptr->job_state != (uint16_t)NO_VAL))
rc = do_basil_confirm(job_ptr);
- if (rc != SLURM_SUCCESS || job_ptr->job_state == (uint16_t)NO_VAL)
+ if (rc != SLURM_SUCCESS || (job_ptr->job_state == (uint16_t)NO_VAL))
return rc;
return other_job_ready(job_ptr);
}
diff --git a/src/srun/srun.c b/src/srun/srun.c
index 7343e6d7ee1..f92fb63ef1f 100644
--- a/src/srun/srun.c
+++ b/src/srun/srun.c
@@ -214,12 +214,12 @@ int srun(int ac, char **av)
* which are not designed to handle them */
if (xsignal_block(sig_array) < 0)
error("Unable to block signals");
-
+#ifndef HAVE_CRAY_EMULATION
if (is_cray_system() || is_cray_select_type()) {
error("operation not supported on Cray systems - use aprun(1)");
exit(error_exit);
}
-
+#endif
/* Initialize plugin stack, read options from plugins, etc.
*/
init_spank_env();
--
GitLab