Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

default_qsub_arguments -V not working #781

Merged
merged 1 commit into from Sep 13, 2018
Merged

default_qsub_arguments -V not working #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 36 additions & 8 deletions src/cmds/qsub.c
View file
Open in desktop
Expand Up @@ -160,6 +160,7 @@
#define QSUB_DMN_TIMEOUT_LONG 60 /* timeout for qsub background process */
#define QSUB_DMN_TIMEOUT_SHORT 5

#define DMN_REFUSE_EXIT 7 /* return code when daemon can't serve a job and exits */

#ifdef NAS /* localmod 005 */
extern void set_attr_resc(struct attrl **attrib, char *attrib_name, char *attrib_resc, char *attrib_value);
Expand Down Expand Up @@ -231,6 +232,11 @@ static char *pbs_hostvar = NULL; /* buffer containing ",PBS_O_HOST=" and host na
static int pbs_o_hostsize = sizeof(",PBS_O_HOST=") + 1; /* size of prefix for hostvar */
static char *display; /* environment variable DISPLAY */

/*
* Flag to check if current process is the background process.
* This variable is set only once and is read-only afterwards.
*/
static int is_background = 0;
static int no_background = 0; /* flag to disable backgrounding */
static char roptarg = 'y'; /* whether the job is rerunnable */
static char *v_value = NULL; /* expanded variable list from v opt */
Expand Down Expand Up @@ -4904,7 +4910,8 @@ do_connect(char *server_out, char *retmsg)
* @return int
* @retval 0 - Success
* @retval 1/-1/pbs_errno - Failure, retmsg paramter is set
*
* @retval DMN_REFUSE_EXIT - If daemon can't submit the job
*
*/
static int
do_submit(char *retmsg)
Expand All @@ -4915,7 +4922,7 @@ do_submit(char *retmsg)
char *errmsg;
int retries;

if (dfltqsubargs != NULL) {
if (dfltqsubargs != NULL) {
/*
* Setting options from the server defaults will not overwrite
* options set from the job script. CMDLINE-2 means
Expand All @@ -4932,6 +4939,16 @@ do_submit(char *retmsg)
return (rc);
}

/*
* get environment variable if -V option is set. Return the code
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you repharse it as "get the variable environ which points to an array of pointers to strings of the user environment if -V option is set....".

* DMN_REFUSE_EXIT if -V option is detected in background qsub.
*/
if (V_opt) {
if (is_background)
return DMN_REFUSE_EXIT;
qsub_envlist = env_array_to_varlist(environ);
}

/* set_job_env must be done here to pick up -v, -V options passed by default_qsub_arguments */
if (!set_job_env(basic_envlist, qsub_envlist)) {
#ifndef WIN32
Expand Down Expand Up @@ -5898,6 +5915,10 @@ do_daemon_stuff(void)
free(cred_buf);
cred_buf = NULL;
}

/* Exit the daemon if it can't submit the job */
if (rc == DMN_REFUSE_EXIT)
goto out;
#if defined(PBS_PASS_CREDENTIALS)
memset(passwd_buf, 0, PBS_MAXPWLEN);
#endif
Expand Down Expand Up @@ -5966,6 +5987,8 @@ fork_and_stay(void)
/* set single threaded mode */
pbs_client_thread_set_single_threaded_mode();

/* set when background qsub is running */
is_background = 1;
do_daemon_stuff();
/*
* Control should never reach here.
Expand Down Expand Up @@ -6064,16 +6087,21 @@ daemon_submit(int *daemon_up, int *do_regular_submit)

/* read back response from background daemon */
if ((recv_string(&sock, retmsg) != 0) ||
dorecv(&sock, (char *) &rc, sizeof(int)) != 0) {
(dorecv(&sock, (char *) &rc, sizeof(int)) != 0) ||
rc == DMN_REFUSE_EXIT) {

/*
* Something bad happened, either background submitted
* and failed to send us response, or it failed before
* submitting.
* submitting. If background qsub detects -V option, then
* submit the job through foreground.
*/
rc = -1;
sprintf(retmsg, "Failed to recv data from background qsub\n");
/* Error message will be printed in caller */
if (rc != DMN_REFUSE_EXIT) {
rc = -1;
sprintf(retmsg, "Failed to recv data from background qsub\n");
/* Error message will be printed in caller */
} else
*do_regular_submit = 1;
}
}
/* going down, no need to free stuff */
Expand Down Expand Up @@ -6107,7 +6135,7 @@ regular_submit(int daemon_up)
rc = -1;
}
#ifndef WIN32
if ((rc == 0) && !(Interact_opt != FALSE || block_opt) && (daemon_up == 0) && (no_background == 0))
if ((rc == 0) && !(Interact_opt != FALSE || block_opt) && (daemon_up == 0) && (no_background == 0) && !V_opt)
fork_and_stay();
#endif
return rc;
Expand Down
50 changes: 50 additions & 0 deletions test/tests/functional/pbs_passing_environment_variable.py
View file
Open in desktop
Expand Up @@ -105,3 +105,53 @@ def test_passing_shell_function(self):
self.assertEqual(job_output, match,
msg="Environment variable foo content does "
"not match original")

def test_option_V_dfltqsubargs(self):
"""
Test exporting environment variable when -V is enabled
in default_qsub_arguments.
"""
os.environ["SET_IN_SUBMISSION"] = "true"
self.server.manager(MGR_CMD_SET, SERVER,
{'default_qsub_arguments': '-V'})
j = Job(self.du.get_current_user())
jid = self.server.submit(j)
self.server.expect(JOB, {'Variable_List': (MATCH_RE,
'SET_IN_SUBMISSION=true')},
id=jid)

def test_option_V_cmdline(self):
"""
Test exporting environment variable when -V is passed
through command line.
"""
os.environ["SET_IN_SUBMISSION"] = "true"
self.ATTR_V = 'Full_Variable_List'
api_to_cli.setdefault(self.ATTR_V, 'V')
a = {self.ATTR_V: None}
j = Job(self.du.get_current_user(), attrs=a)
jid = self.server.submit(j)
self.server.expect(JOB, {'Variable_List': (MATCH_RE,
'SET_IN_SUBMISSION=true')},
id=jid)

def test_option_V_dfltqsubargs_qsub_daemon(self):
"""
Test whether the changed value of the exported
environment variable is reflected if the submitted job
goes to qsub daemon.
"""
self.server.manager(MGR_CMD_SET, SERVER,
{'default_qsub_arguments': '-V'})
os.environ["SET_IN_SUBMISSION"] = "true"
j = Job(self.du.get_current_user())
jid = self.server.submit(j)
os.environ["SET_IN_SUBMISSION"] = "false"
j1 = Job(self.du.get_current_user())
jid1 = self.server.submit(j1)
self.server.expect(JOB, {'Variable_List': (MATCH_RE,
'SET_IN_SUBMISSION=true')},
id=jid)
self.server.expect(JOB, {'Variable_List': (MATCH_RE,
'SET_IN_SUBMISSION=false')},
id=jid1)