use uid instead of user names so that jobqueues can work from within docker images

Author: stefdoerr

jobqueues/lsfqueue.py

@@ -335,16 +335,15 @@ def inprogress(self):
             Total running and queued workunits
         """
         import time
-        import getpass
 
         if self.queue is None:
             raise ValueError("The queue needs to be defined.")
         if self.jobname is None:
             raise ValueError("The jobname needs to be defined.")
-        user = getpass.getuser()
+        uid = os.getuid()
         l_total = 0
         for q in ensurelist(self.queue):
-            cmd = [self._qstatus, "-J", self.jobname, "-u", user, "-q", q]
+            cmd = [self._qstatus, "-J", self.jobname, "-u", uid, "-q", q]
             logger.debug(cmd)
 
             # This command randomly fails so I need to allow it to repeat or it crashes adaptive
@@ -372,21 +371,19 @@ def inprogress(self):
 
     def stop(self):
         """Cancels all currently running and queued jobs"""
-        import getpass
-
         if self.jobname is None:
             raise ValueError("The jobname needs to be defined.")
 
-        user = getpass.getuser()
+        uid = os.getuid()
 
         if self.queue is not None:
             for q in ensurelist(self.queue):
-                cmd = [self._qcancel, "-J", self.jobname, "-u", user, "-q", q]
+                cmd = [self._qcancel, "-J", self.jobname, "-u", uid, "-q", q]
                 logger.debug(cmd)
                 ret = check_output(cmd, stderr=DEVNULL)
                 logger.debug(ret.decode("ascii"))
         else:
-            cmd = [self._qcancel, "-J", self.jobname, "-u", user]
+            cmd = [self._qcancel, "-J", self.jobname, "-u", uid]
             logger.debug(cmd)
             ret = check_output(cmd, stderr=DEVNULL)
             logger.debug(ret.decode("ascii"))

jobqueues/slurmqueue.py

@@ -8,13 +8,10 @@
 import random
 import string
 from jobqueues.config import loadConfig
-import yaml
 from subprocess import check_output, CalledProcessError
 from protocolinterface import val
 from jobqueues.simqueue import SimQueue, QueueJobStatus, _inProgressStatus
 from jobqueues.util import ensurelist
-import getpass
-import unittest
 import logging
 
 logger = logging.getLogger(__name__)
@@ -227,7 +224,7 @@ def __init__(
             "user",
             "str",
             "The SLURM user submitting and managing jobs",
-            getpass.getuser(),
+            os.getuid(),
             val.String(),
         )
         self._arg(