From abcc869f47f2a98c5865a6b508dc2e962f8540dd Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 27 Feb 2009 19:20:01 +0000
Subject: [PATCH] Add new allocator context to spank plugin framework PATCH 3/9
from Mark Grondona
---
slurm/spank.h | 3 +-
src/common/plugstack.c | 118 +++++++++++++++++++++----------
src/common/plugstack.h | 2 +
testsuite/expect/test7.11.prog.c | 5 ++
4 files changed, 89 insertions(+), 39 deletions(-)
diff --git a/slurm/spank.h b/slurm/spank.h
index b959356efcb..612b1dc7e5b 100644
--- a/slurm/spank.h
+++ b/slurm/spank.h
@@ -166,7 +166,8 @@ typedef enum spank_err spank_err_t;
enum spank_context {
S_CTX_ERROR, /* Error obtaining current context */
S_CTX_LOCAL, /* Local context (srun) */
- S_CTX_REMOTE /* Remote context (slurmd) */
+ S_CTX_REMOTE, /* Remote context (slurmd) */
+ S_CTX_ALLOCATOR /* Allocator context (sbatch/salloc) */
};
typedef enum spank_context spank_context_t;
diff --git a/src/common/plugstack.c b/src/common/plugstack.c
index a84d74613eb..cc2558df9e9 100644
--- a/src/common/plugstack.c
+++ b/src/common/plugstack.c
@@ -128,8 +128,9 @@ static List option_cache = NULL;
*/
enum spank_context_type {
S_TYPE_NONE,
- S_TYPE_LOCAL, /* LOCAL == srun */
- S_TYPE_REMOTE /* REMOTE == slurmd */
+ S_TYPE_LOCAL, /* LOCAL == srun */
+ S_TYPE_REMOTE, /* REMOTE == slurmd */
+ S_TYPE_ALLOCATOR /* ALLOCATOR == sbatch/salloc */
};
/*
@@ -272,7 +273,11 @@ static struct spank_plugin *_spank_plugin_create(char *path, int ac,
plugin->argv = av;
plugin->ops = ops;
- plugin->opts = plugin_get_sym(p, "spank_options");
+ /*
+ * Do not load static plugin options table in allocator context.
+ */
+ if (spank_ctx != S_TYPE_ALLOCATOR)
+ plugin->opts = plugin_get_sym(p, "spank_options");
return (plugin);
}
@@ -634,17 +639,14 @@ static int _do_call_stack(step_fn_t type, void * job, int taskid)
return (rc);
}
-int spank_init(slurmd_job_t * job)
+int _spank_init(enum spank_context_type context, slurmd_job_t * job)
{
slurm_ctl_conf_t *conf = slurm_conf_lock();
const char *path = conf->plugstack;
default_spank_path = conf->plugindir;
slurm_conf_unlock();
- if (job)
- spank_ctx = S_TYPE_REMOTE;
- else
- spank_ctx = S_TYPE_LOCAL;
+ spank_ctx = context;
if (_spank_stack_create(path, &spank_stack) < 0) {
/* No error if spank config doesn't exist */
@@ -668,6 +670,18 @@ int spank_init(slurmd_job_t * job)
return (0);
}
+int spank_init (slurmd_job_t * job)
+{
+ if (job)
+ return _spank_init (S_TYPE_REMOTE, job);
+ else
+ return _spank_init (S_TYPE_LOCAL, NULL);
+}
+
+int spank_init_allocator (void)
+{
+ return _spank_init (S_TYPE_ALLOCATOR, NULL);
+}
int spank_user(slurmd_job_t * job)
{
@@ -1254,23 +1268,49 @@ static int _valid_in_local_context (spank_item_t item)
return (rc);
}
-/*
- * Return 1 if spank_item_t is just getting version (valid anywhere)
- */
-static int _version_check (spank_item_t item)
+static int _valid_in_allocator_context (spank_item_t item)
{
- int rc = 0;
switch (item) {
- case S_SLURM_VERSION:
- case S_SLURM_VERSION_MAJOR:
- case S_SLURM_VERSION_MINOR:
- case S_SLURM_VERSION_MICRO:
- rc = 1;
- break;
- default:
- rc = 0;
+ case S_JOB_UID:
+ case S_JOB_GID:
+ return 1;
+ default:
+ return 0;
}
- return (rc);
+}
+
+static spank_err_t _check_spank_item_validity (spank_item_t item)
+{
+ /*
+ * Valid in all contexts:
+ */
+ switch (item) {
+ case S_SLURM_VERSION:
+ case S_SLURM_VERSION_MAJOR:
+ case S_SLURM_VERSION_MINOR:
+ case S_SLURM_VERSION_MICRO:
+ return ESPANK_SUCCESS;
+ default:
+ break; /* fallthru */
+ }
+
+ if (spank_ctx == S_TYPE_LOCAL) {
+ if (_valid_in_local_context (item))
+ return ESPANK_SUCCESS;
+ else
+ return ESPANK_NOT_REMOTE;
+ }
+ else if (spank_ctx == S_TYPE_ALLOCATOR) {
+ if (_valid_in_allocator_context (item))
+ return ESPANK_SUCCESS;
+ else if (_valid_in_local_context (item))
+ return ESPANK_BAD_ARG;
+ else
+ return ESPANK_NOT_REMOTE;
+ }
+
+ /* All items presumably valid in remote context */
+ return ESPANK_SUCCESS;
}
/*
@@ -1309,7 +1349,9 @@ spank_context_t spank_context (void)
return S_CTX_REMOTE;
case S_TYPE_LOCAL:
return S_CTX_LOCAL;
- case S_TYPE_NONE:
+ case S_TYPE_ALLOCATOR:
+ return S_CTX_ALLOCATOR;
+ default:
return S_CTX_ERROR;
}
@@ -1338,20 +1380,16 @@ spank_err_t spank_get_item(spank_t spank, spank_item_t item, ...)
if ((spank == NULL) || (spank->magic != SPANK_MAGIC))
return (ESPANK_BAD_ARG);
- if (!_version_check(item)) {
- /* Need job pointer to process other items */
- if ( (spank_ctx != S_TYPE_REMOTE)
- && (!_valid_in_local_context(item)))
- return (ESPANK_NOT_REMOTE);
-
- if (spank->job == NULL)
- return (ESPANK_BAD_ARG);
+ /*
+ * Check for validity of the given item in the current context
+ */
+ if ((rc = _check_spank_item_validity (item)) != ESPANK_SUCCESS)
+ return (rc);
- if (spank_ctx == S_TYPE_LOCAL)
- launcher_job = spank->job;
- else
- slurmd_job = spank->job;
- }
+ if (spank_ctx == S_TYPE_LOCAL)
+ launcher_job = spank->job;
+ else if (spank_ctx == S_TYPE_REMOTE)
+ slurmd_job = spank->job;
va_start(vargs, item);
switch (item) {
@@ -1359,15 +1397,19 @@ spank_err_t spank_get_item(spank_t spank, spank_item_t item, ...)
p2uid = va_arg(vargs, uid_t *);
if (spank_ctx == S_TYPE_LOCAL)
*p2uid = launcher_job->uid;
- else
+ else if (spank_ctx == S_TYPE_REMOTE)
*p2uid = slurmd_job->uid;
+ else
+ *p2uid = getuid();
break;
case S_JOB_GID:
p2gid = va_arg(vargs, gid_t *);
if (spank_ctx == S_TYPE_LOCAL)
*p2gid = launcher_job->gid;
- else
+ else if (spank_ctx == S_TYPE_REMOTE)
*p2gid = slurmd_job->gid;
+ else
+ *p2gid = getgid();
break;
case S_JOB_SUPPLEMENTARY_GIDS:
p2gids = va_arg(vargs, gid_t **);
diff --git a/src/common/plugstack.h b/src/common/plugstack.h
index 838d340262a..9ffb59b91e7 100644
--- a/src/common/plugstack.h
+++ b/src/common/plugstack.h
@@ -66,6 +66,8 @@ struct spank_launcher_job_info {
int spank_init (slurmd_job_t *job);
+int spank_init_allocator (void);
+
int spank_user (slurmd_job_t *job);
int spank_local_user (struct spank_launcher_job_info *job);
diff --git a/testsuite/expect/test7.11.prog.c b/testsuite/expect/test7.11.prog.c
index 5f50fdfaac1..099b25ccf86 100644
--- a/testsuite/expect/test7.11.prog.c
+++ b/testsuite/expect/test7.11.prog.c
@@ -74,6 +74,11 @@ static int _test_opt_process(int val, const char *optarg, int remote)
/* Called from both srun and slurmd */
int slurm_spank_init(spank_t sp, int ac, char **av)
{
+ spank_context_t context;
+
+ context = spank_context();
+ if ((context != S_CTX_LOCAL) && (context != S_CTX_REMOTE))
+ slurm_error("spank_context error");
if (spank_option_register(sp, spank_options_reg) != ESPANK_SUCCESS)
slurm_error("spank_option_register error");
if (spank_remote(sp) && (ac == 1))
--
GitLab