Merge pull request #4541 from grondo/issue#4540

shell: inherit FLUX_F58_FORCE_ASCII from job environment

Author: mergify[bot]

src/shell/shell.c

@@ -1288,6 +1288,25 @@ static int shell_register_event_context (flux_shell_t *shell)
     return 0;
 }
 
+/*  Export a static list of environment variables from the job environment
+ *   to the current shell environment. This is important for variables like
+ *   FLUX_F58_FORCE_ASCII which should influence some shell behavior.
+ */
+static int shell_export_environment_from_job (flux_shell_t *shell)
+{
+    const char *vars[] = {
+        "FLUX_F58_FORCE_ASCII",
+        NULL,
+    };
+
+    for (int i = 0; vars[i] != NULL; i++) {
+        const char *val = flux_shell_getenv (shell, vars[i]);
+        if (val && setenv (vars[i], val, 1) < 0)
+            return shell_log_errno ("setenv (%s)", vars[i]);
+    }
+    return 0;
+}
+
 int main (int argc, char *argv[])
 {
     flux_shell_t shell;
@@ -1325,6 +1344,9 @@ int main (int argc, char *argv[])
     if (!(shell.info = shell_info_create (&shell)))
         exit (1);
 
+    if (shell_export_environment_from_job (&shell) < 0)
+        exit (1);
+
     if (shell_register_event_context (&shell) < 0)
         shell_die (1, "failed to add standard shell event context");
 

t/t2602-job-shell.t

@@ -377,4 +377,13 @@ test_expect_success 'job-shell: -o nosetpgrp works' '
 	flux mini run -n2 -o nosetpgrp \
 	    flux python -c "import os,sys; sys.exit(os.getpid() == os.getpgrp())"
 '
+
+# Check that job shell inherits FLUX_F58_FORCE_ASCII.
+# If not, then output filename will not match jobid returned by submit,
+#  since one will be in UTF-8 and the other in ascii.
+test_expect_success 'job-shell: shell inherits FLUX_F58_FORCE_ASCII from job' '
+	FLUX_F58_FORCE_ASCII=t \
+		id=$(flux mini submit --wait --output={{id}}.out hostname) &&
+	test -f ${id}.out
+'
 test_done