Specify jobids when getting all jobs from slurmdb.

- Add startime and endtime to job conditions

Author: giovtorres

pyslurm/pyslurm.pyx

@@ -5546,7 +5546,18 @@ cdef class slurmdb_jobs:
     def get(self, jobids=[], starttime=0, endtime=0):
         u"""Get Slurmdb information about some jobs.
 
-        :param jobids: Ids of the jobs to search. [] for any id
+        Input formats for start and end times:
+        *   today or tomorrow
+        *   midnight, noon, teatime (4PM)
+        *   HH:MM [AM|PM]
+        *   MMDDYY or MM/DD/YY or MM.DD.YY
+        *   YYYY-MM-DD[THH[:MM[:SS]]]
+        *   now + count [minutes | hours | days | weeks]
+        *
+        Invalid time input results in message to stderr and return value of
+        zero.
+
+        :param jobids: Ids of the jobs to search. Defaults to all jobs.
         :param starttime: Select jobs eligible after this timestamp
         :param endtime: Select jobs eligible before this timestamp
         :returns: Dictionary whose key is the JOBS ID
@@ -5558,11 +5569,32 @@ cdef class slurmdb_jobs:
         cdef:
             int i = 0
             int listNum = 0
-            dict J_dict = {}
             int apiError = 0
+            dict J_dict = {}
             slurm.List JOBSList
             slurm.ListIterator iters = NULL
 
+        if jobids:
+            self.job_cond.step_list = slurm.slurm_list_create(NULL)
+            for _jobid in jobids:
+                if isinstance(_jobid, int) or isinstance(_jobid, long):
+                    _jobid = str(_jobid).encode("UTF-8")
+                else:
+                    _jobid = _jobid.encode("UTF-8")
+                slurm.slurm_addto_step_list(self.job_cond.step_list, _jobid)
+
+        if starttime:
+            self.job_cond.usage_start = slurm.slurm_parse_time(starttime, 1)
+            errno = slurm.slurm_get_errno()
+            if errno == slurm.ESLURM_INVALID_TIME_VALUE:
+                raise ValueError(slurm.slurm_strerror(errno), errno)
+
+        if endtime:
+            self.job_cond.usage_end = slurm.slurm_parse_time(endtime, 1)
+            errno = slurm.slurm_get_errno()
+            if errno == slurm.ESLURM_INVALID_TIME_VALUE:
+                raise ValueError(slurm.slurm_strerror(errno), errno)
+
         JOBSList = slurm.slurmdb_jobs_get(self.db_conn, self.job_cond)
 
         if JOBSList is NULL:

pyslurm/slurm.pxd

@@ -116,6 +116,7 @@ cdef extern from 'slurm/slurm_errno.h' nogil:
     enum:
         ESLURM_ERROR_ON_DESC_TO_RECORD_COPY
         ESLURM_NODES_BUSY
+        ESLURM_INVALID_TIME_VALUE
 
     cdef extern char * slurm_strerror (int)
     cdef void slurm_seterrno (int)
@@ -2837,3 +2838,12 @@ cdef extern int slurm_env_array_overwrite(char ***array_ptr, const_char_ptr name
 cdef extern int slurm_env_array_overwrite_fmt(char ***array_ptr, const_char_ptr name, const_char_ptr value_fmt, ...)
 
 cdef extern char *slurm_get_checkpoint_dir()
+cdef extern void slurm_sprint_cpu_bind_type(char *string, cpu_bind_type_t cpu_bind_type)
+cdef extern void slurm_destroy_char(void *object)
+cdef extern int slurm_addto_step_list(List step_list, char *names)
+cdef extern time_t slurm_parse_time(char *time_str, int past)
+cdef extern int slurm_time_str2mins(const_char_ptr string)
+cdef extern int slurm_time_str2secs(const_char_ptr string)
+cdef extern void slurm_secs2time_str(time_t time, char *string, int size)
+cdef extern void slurm_mins2time_str(uint32_t time, char *string, int size)
+cdef extern char *slurm_mon_abbr(int mon)