ood_core 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 8a526602e6c6b59b6d943d299dc4e442cfd354a768669b4bc03a9423e12cf418
-  data.tar.gz: 5220c4b20c1de287afdcad2eece623952c58aea735c1786f9956912563277e85
+SHA1:
+  metadata.gz: ac5caf10cd563acf0e8ef6a4b7d421b5718dc097
+  data.tar.gz: c9e401652e388868a2d583751ef94d50ccb2f22a
 SHA512:
-  metadata.gz: f63f8aff330f033ef8fe0dad0d07629e3704463441f1a910920f37a86d48a4cab059182403b9cb6f1bd6a300213b1cff45315b43354fa0d2a9aaaba2f7bc54c8
-  data.tar.gz: d77d8d5130a3f20ac9e54667b10de5a476322c38491f63abe58e0ab192d23b22fc764481254abaf9def825a4ee6707646f1b3c264ed9a5ec4fa76add0f34295a
+  metadata.gz: db745be6e2bcc4a7c4bfcd31d0a47c50bb948be84d24c2bc5f45c7bab6bbf46e22d82ed86120087ce6c0e6d554d323acef53b4adde3ffc7eb801216cc419f986
+  data.tar.gz: '096513b3c128b32c81b19784ef56164ef74e158dbd72d37b47d51063cd6b89daac03a00abf632421cf4e3687390930b5bb3c3771b5eb7290c91fb54a2757bf21'

data/CHANGELOG.md

@@ -6,6 +6,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [0.9.0] - 2019-05-04
+### Added
+- Job array support for LSF and PBSPro
+- Slurm adapter uses `squeue` owner filter (`-u`) for `info_where_owner`
+
+### Fixed
+- Grid Engine adapter now starts scripts in the current directory like all other adapters
+- Fixed issue where Slurm comment field might break job info parsing
+- Fixed possible crash when comparing two clusters if the id of one of the clusters is nil
+- Fixed bug with the live system test that impacted non-Torque systems
+- Fixed bug with Slurm adapter when submit time is not available
+
 ## [0.8.0] - 2019-01-29
 ### Added
 - info_all_each and info_where_owner_each super class methods
@@ -165,7 +177,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial release!
 
-[Unreleased]: https://github.com/OSC/ood_core/compare/v0.8.0...HEAD
+[Unreleased]: https://github.com/OSC/ood_core/compare/v0.9.0...HEAD
+[0.9.0]: https://github.com/OSC/ood_core/compare/v0.8.0...v0.9.0
 [0.8.0]: https://github.com/OSC/ood_core/compare/v0.7.1...v0.8.0
 [0.7.1]: https://github.com/OSC/ood_core/compare/v0.7.0...v0.7.1
 [0.7.0]: https://github.com/OSC/ood_core/compare/v0.6.0...v0.7.0

data/lib/ood_core/cluster.rb

@@ -136,7 +136,7 @@ module OodCore
     # @param other [#to_sym] object to compare against
     # @return [Boolean] whether objects are equivalent
     def ==(other)
-      id == other.to_sym
+      id == other.to_s.to_sym
     end
 
     # Convert object to symbol

data/lib/ood_core/job/adapters/lsf.rb

@@ -90,16 +90,8 @@ module OodCore
         # @return [Info] information describing submitted job
         # @see Adapter#info
         def info(id)
-          # TODO: handle job arrays
-          job = batch.get_job(id: id)
-          if job
-            info_for_batch_hash(job)
-          else
-            Info.new(
-              id: id,
-              status: :completed
-            )
-          end
+          info_ary = batch.get_job(id: id).map{|v| info_for_batch_hash(v)}
+          handle_job_array(info_ary, id)
         rescue Batch::Error => e
           raise JobAdapterError, e.message
         end
@@ -131,19 +123,13 @@ module OodCore
           raise JobAdapterError, e.message
         end
 
-        def supports_job_arrays?
-          false
-        end
-
         # Retrieve job status from resource manager
         # @param id [#to_s] the id of the job
         # @raise [JobAdapterError] if something goes wrong getting job status
         # @return [Status] status of job
         # @see Adapter#status
         def status(id)
-          job = batch.get_job(id: id)
-          state = job ? get_state(job[:status]) : :completed
-          Status.new(state: state)
+          info(id).status
         rescue Batch::Error => e
           raise JobAdapterError, e.message
         end
@@ -196,8 +182,11 @@ module OodCore
             dispatch_time = helper.parse_past_time(v[:start_time], ignore_errors: true)
             finish_time = helper.parse_past_time(v[:finish_time], ignore_errors: true)
 
+            # Detect job array index from name
+            array_index = /(\[\d+\])$/.match(v[:name])
+
             Info.new(
-              id: v[:id],
+              id: (array_index) ? "#{v[:id]}#{array_index[1]}" : v[:id],
               status: get_state(v[:status]),
               allocated_nodes: nodes,
               submit_host: v[:from_host],
@@ -214,6 +203,40 @@ module OodCore
               native: v
             )
           end
+
+          def handle_job_array(info_ary, id)
+            return Info.new(id: id, status: :completed) if info_ary.nil? || info_ary.empty?
+            return info_ary.first if info_ary.size == 1
+
+            parent_task_hash = build_proxy_parent(info_ary.first, id)
+
+            info_ary.map do |task_info|
+              parent_task_hash[:tasks] << {:id => task_info.id, :status => task_info.status}
+            end
+
+            parent_task_hash[:status] = parent_task_hash[:tasks].map{|task| task[:status]}.max
+
+            Info.new(**parent_task_hash)
+          end
+
+          # Proxy the first element as the parent hash delete non-shared attributes
+          def build_proxy_parent(info, id)
+            info.to_h.merge({
+              :tasks => [],
+              :id => id
+            }).delete_if{
+              |key, _| [
+                :allocated_nodes, :dispatch_time,
+                :cpu_time, :wallclock_time, :status
+              ].include?(key)
+            }.tap{
+              # Remove the child array index from the :job_name
+
+              # Note that a true representation of the parent should have the
+              # full array spec in the name. Worth attempting to reconstruct?
+              |h| h[:job_name] = h[:job_name].gsub(/\[[^\]]+\]/, '')
+            }
+          end
       end
     end
   end

data/lib/ood_core/job/adapters/lsf/batch.rb

@@ -43,10 +43,10 @@ class OodCore::Job::Adapters::Lsf::Batch
   # Get hash detailing the specified job
   # @param id [#to_s] the id of the job to check
   # @raise [Error] if `bjobs` command exited unsuccessfully
-  # @return [Hash] details of specified job
+  # @return [Array<Hash>] details of specified job
   def get_job(id:)
     args = %W( -a -w -W #{id.to_s} )
-    parse_bjobs_output(call("bjobs", *args)).first
+    parse_bjobs_output(call("bjobs", *args))
   end
 
   # status fields available from bjobs

data/lib/ood_core/job/adapters/lsf/helper.rb

@@ -81,6 +81,8 @@ class OodCore::Job::Adapters::Lsf::Helper
     args += ["-P", script.accounting_id] unless script.accounting_id.nil?
     args += ["-cwd", script.workdir.to_s] unless script.workdir.nil?
     args += ["-J", script.job_name] unless script.job_name.nil?
+    args[-1] += "[#{script.job_array_request}]" unless script.job_array_request.nil?
+
     args += ["-q", script.queue_name] unless script.queue_name.nil?
     args += ["-U", script.reservation_id] unless script.reservation_id.nil?
     args += ["-sp", script.priority] unless script.priority.nil?

data/lib/ood_core/job/adapters/pbspro.rb

@@ -86,8 +86,7 @@ module OodCore
           # @raise [Error] if `qstat` command exited unsuccessfully
           # @return [Array<Hash>] list of details for jobs
           def get_jobs(id: "")
-            args = ["-f"]   # display all information
-            args += ["-t"]  # list subjobs
+            args = ["-f", "-t"]   # display all information
             args += [id.to_s] unless id.to_s.empty?
             lines = call("qstat", *args).gsub("\n\t", "").split("\n").map(&:strip)
 
@@ -101,7 +100,8 @@ module OodCore
                 k2 ? ( hsh[k1] ||= {} and hsh[k1][k2] = value ) : ( hsh[k1] = value )
               end
             end
-            jobs.reject { |j| /\[\]/ =~ j[:job_id] } # drop main job array jobs
+
+            jobs
           end
 
           # Select batch jobs from the batch server
@@ -181,8 +181,8 @@ module OodCore
           'U' => :suspended,      # cycle-harvesting job is suspended due to keyboard activity
           'E' => :running,        # job is exiting after having run
           'F' => :completed,      # job is finished
-          'X' => :completed       # subjob has completed execution or has been deleted
-          # ignore B as it signifies a job array
+          'X' => :completed,      # subjob has completed execution or has been deleted
+          'B' => :running         # job array has at least one child running
         }
 
         # What percentage of jobs a user owns out of all jobs, used to decide
@@ -266,6 +266,8 @@ module OodCore
           # mimics what the other resource managers do)
           args += ["-j", "oe"] if script.error_path.nil?
 
+          args += ["-J", script.job_array_request] unless script.job_array_request.nil?
+
           # Set native options
           args += script.native if script.native
 
@@ -303,13 +305,21 @@ module OodCore
         if usr_jobs.size > (qstat_factor * all_jobs.size)
           super
         else
-          usr_jobs.map { |id| info(id) }
-        end
-      end
+          begin
+            user_job_infos = []
+            usr_jobs.each do |id|
+              job = info(id)
+              user_job_infos << job
 
-        def supports_job_arrays?
-          false
+              job.tasks.each {|task| user_job_infos << job.build_child_info(task)}
+            end
+
+            user_job_infos
+          rescue Batch::Error => e
+            raise JobAdapterError, e.message
+          end
         end
+      end
 
         # Retrieve job info from the resource manager
         # @param id [#to_s] the id of the job
@@ -318,9 +328,18 @@ module OodCore
         # @see Adapter#info
         def info(id)
           id = id.to_s
-          @pbspro.get_jobs(id: id).map do |v|
+
+          job_infos = @pbspro.get_jobs(id: id).map do |v|
             parse_job_info(v)
-          end.first || Info.new(id: id, status: :completed)
+          end
+
+          if job_infos.empty?
+            Info.new(id: id, status: :completed)
+          elsif job_infos.length == 1
+            job_infos.first
+          else
+            process_job_array(id, job_infos)
+          end
         rescue Batch::Error => e
           # set completed status if can't find job id
           if /Unknown Job Id/ =~ e.message || /Job has finished/ =~ e.message
@@ -434,6 +453,23 @@ module OodCore
               native: v
             )
           end
+
+          # Combine the array parent with the states of its children
+          def process_job_array(id, jobs)
+            parent_job = jobs.select { |j| /\[\]/ =~ j.id }.first
+            parent = (parent_job) ? parent_job.to_h : {:id => id, :status => :undetermined}
+
+            # create task hashes from children
+            parent[:tasks] = jobs.reject { |j| /\[\]/ =~ j.id }.map do |j|
+              {
+                :id => j.id,
+                :status => j.status.to_sym,
+                :wallclock_time => j.wallclock_time
+              }
+            end
+
+            Info.new(**parent)
+          end
       end
     end
   end

data/lib/ood_core/job/adapters/sge/batch.rb

@@ -95,7 +95,12 @@ class OodCore::Job::Adapters::Sge::Batch
 
       job_hash = listener.parsed_job
 
-      update_job_hash_status!(job_hash)
+      if job_hash[:id]
+        update_job_hash_status!(job_hash)
+      else
+        job_hash[:id] = job_id
+        job_hash[:status] = :completed
+      end
 
       job_info = OodCore::Job::Info.new(**job_hash)
     rescue REXML::ParseException => e
@@ -115,8 +120,8 @@ class OodCore::Job::Adapters::Sge::Batch
     if get_status_from_drmaa?(job_hash)
       begin
         job_hash[:status] = get_status_from_drmma(job_hash[:id])
-      rescue DRMAA::DRMAAInvalidArgumentError => e
-        raise Error, e.message
+      rescue DRMAA::DRMAAException => e
+        # log DRMAA error?
       end
     end
   end
@@ -156,8 +161,7 @@ class OodCore::Job::Adapters::Sge::Batch
   # @param job_id [#to_s]
   # @return job_id [String]
   def submit(content, args)
-      cmd = ['qsub'] + args
-      @helper.parse_job_id_from_qsub(call(*cmd, :stdin => content))
+      @helper.parse_job_id_from_qsub(call('qsub', *args, :stdin => content))
   end
 
   # Call a forked SGE command for a given batch server

data/lib/ood_core/job/adapters/sge/helper.rb

@@ -20,7 +20,12 @@ class OodCore::Job::Adapters::Sge::Helper
     args += ['-h'] if script.submit_as_hold
     args += ['-r', 'yes'] if script.rerunnable
     script.job_environment.each_pair {|k, v| args += ['-v', "#{k.to_s}=#{v.to_s}"]} unless script.job_environment.nil?
-    args += ['-wd', script.workdir] unless script.workdir.nil?
+
+    if script.workdir
+      args += ['-wd', script.workdir]
+    elsif ! script_contains_wd_directive?(script.content)
+      args += ['-cwd']
+    end
 
     on_event_email = []
     on_event_email << 'b' if script.email_on_started  # beginning
@@ -47,6 +52,38 @@ class OodCore::Job::Adapters::Sge::Helper
     args
   end
 
+  # @brief      Detect whether script content contains either -cwd or -wd
+  #
+  # @param      content  The script content
+  # 
+  # Examples:
+  #     #$-wd /home/ood/ondemand  # should match
+  #     #$  -wd /home/ood/ondemand  # should match
+  #     #$  -cwd /home/ood/ondemand  # should match
+  #     #$ -j yes -wd /home/ood/ondemand  # should match
+  #     #$ -j yes -o this-wd /home/ood/ondemand  # should NOT match
+  #       #$ -t 1-10:5 -wd /home/ood/ondemand  # should NOT match
+  #
+  # @return     [bool]
+  #
+  def script_contains_wd_directive?(content)
+    content.slice(
+      # Only search within the script's first 1024 characters in case the user is
+      # putting lots of non-line delimited data into their scripts.
+      0, 1024
+    ).split(
+      "\n"
+    ).any? {
+      |line|
+      # String must start with #$
+      # Match may be:
+      #   Immediate -c?wd
+      #   Eventual space or tab followed by -c?wd
+      # String may end with multiple characters
+      /^#\$(?:-c?wd|.*[ \t]+-c?wd).*$/ =~ line
+    }
+  end
+
   # Raise exceptions when adapter is asked to perform an action that SGE does not support
   # @raise [Error] when an incompatible action is requested
   def raise_error_on_unsupported_args(script, after:, afterok:, afternotok:, afterany:)

data/lib/ood_core/job/adapters/slurm.rb

@@ -1,5 +1,6 @@
 require "time"
 require "ood_core/refinements/hash_extensions"
+require "ood_core/refinements/array_extensions"
 require "ood_core/job/adapters/helper"
 
 module OodCore
@@ -29,10 +30,14 @@ module OodCore
       # resource manager for job management.
       class Slurm < Adapter
         using Refinements::HashExtensions
+        using Refinements::ArrayExtensions
 
         # Object used for simplified communication with a Slurm batch server
         # @api private
         class Batch
+          UNIT_SEPARATOR = "\x1F"
+          RECORD_SEPARATOR = "\x1E"
+
           # The cluster of the Slurm batch server
           # @example CHPC's kingspeak cluster
           #   my_batch.cluster #=> "kingspeak"
@@ -89,22 +94,66 @@ module OodCore
           #   #  ...
           #   #]
           # @param id [#to_s] the id of the job
-          # @param filters [Array<Symbol>] list of attributes to filter on
+          # @param owner [String] the owner(s) of the job
+          # @param attrs [Array<Symbol>, nil] list of attributes request when calling squeue
           # @raise [Error] if `squeue` command exited unsuccessfully
           # @return [Array<Hash>] list of details for jobs
-          def get_jobs(id: "", filters: [])
-            delim = "\x1F"     # don't use "|" because FEATURES uses this
-            options = filters.empty? ? fields : fields.slice(*filters)
-            args  = ["--all", "--states=all", "--noconvert"]
-            args += ["-o", "#{options.values.join(delim)}"]
-            args += ["-j", id.to_s] unless id.to_s.empty?
-            lines = call("squeue", *args).split("\n").map(&:strip)
+          def get_jobs(id: "", owner: nil, attrs: nil)
+            fields = squeue_fields(attrs)
+            args = squeue_args(id: id, owner: owner, options: fields.values)
+
+            #TODO: switch mock of Open3 to be the squeue mock script
+            # then you can use that for performance metrics
+            StringIO.open(call("squeue", *args)) do |output|
+              advance_past_squeue_header!(output)
+
+              jobs = []
+              output.each_line(RECORD_SEPARATOR) do |line|
+                # TODO: once you can do performance metrics you can test zip against some other tools
+                # or just small optimizations
+                # for example, fields is ALREADY A HASH and we are setting the VALUES to
+                # "line.strip.split(unit_separator)" array
+                #
+                # i.e. store keys in an array, do Hash[[keys, values].transpose]
+                #
+                # or
+                #
+                # job = {}
+                # keys.each_with_index { |key, index| [key] = values[index] }
+                # jobs << job
+                #
+                # assuming keys and values are same length! if not we have an error!
+                values = line.chomp(RECORD_SEPARATOR).strip.split(UNIT_SEPARATOR)
+                jobs << Hash[fields.keys.zip(values)] unless values.empty?
+              end
+              jobs
+            end
+          end
 
-            lines.drop(cluster ? 2 : 1).map do |line|
-              Hash[options.keys.zip(line.split(delim))]
+          def squeue_fields(attrs)
+            if attrs.nil?
+              all_squeue_fields
+            else
+              all_squeue_fields.slice(*squeue_attrs_for_info_attrs(Array.wrap(attrs) + squeue_required_fields))
             end
           end
 
+          def squeue_required_fields
+            #TODO: does this need to include ::array_job_task_id?
+            #TODO: does it matter that order of the output can vary depending on the arguments and if "squeue_required_fields" are included?
+            # previously the order was "fields.keys"; i don't think it does
+            [:job_id, :state_compact]
+          end
+
+          #TODO: write some barebones test for this? like 2 options and id or no id
+          def squeue_args(id: "", owner: nil, options: [])
+            args  = ["--all", "--states=all", "--noconvert"]
+            args += ["-o", "#{RECORD_SEPARATOR}#{options.join(UNIT_SEPARATOR)}"]
+            args += ["-u", owner.to_s] unless owner.to_s.empty?
+            args += ["-j", id.to_s] unless id.to_s.empty?
+            args
+          end
+
           # Put a specified job on hold
           # @example Put job "1234" on hold
           #   my_batch.hold_job("1234")
@@ -147,7 +196,82 @@ module OodCore
             call("sbatch", *args, env: env, stdin: str.to_s).strip.split(";").first
           end
 
+          # Fields requested from a formatted `squeue` call
+          # Note that the order of these fields is important
+          def all_squeue_fields
+            {
+              account: "%a",
+              job_id: "%A",
+              exec_host: "%B",
+              min_cpus: "%c",
+              cpus: "%C",
+              min_tmp_disk: "%d",
+              nodes: "%D",
+              end_time: "%e",
+              dependency: "%E",
+              features: "%f",
+              array_job_id: "%F",
+              group_name: "%g",
+              group_id: "%G",
+              over_subscribe: "%h",
+              sockets_per_node: "%H",
+              array_job_task_id: "%i",
+              cores_per_socket: "%I",
+              job_name: "%j",
+              threads_per_core: "%J",
+              comment: "%k",
+              array_task_id: "%K",
+              time_limit: "%l",
+              time_left: "%L",
+              min_memory: "%m",
+              time_used: "%M",
+              req_node: "%n",
+              node_list: "%N",
+              command: "%o",
+              contiguous: "%O",
+              qos: "%q",
+              partition: "%P",
+              priority: "%Q",
+              reason: "%r",
+              start_time: "%S",
+              state_compact: "%t",
+              state: "%T",
+              user: "%u",
+              user_id: "%U",
+              reservation: "%v",
+              submit_time: "%V",
+              wckey: "%w",
+              licenses: "%W",
+              excluded_nodes: "%x",
+              core_specialization: "%X",
+              nice: "%y",
+              scheduled_nodes: "%Y",
+              sockets_cores_threads: "%z",
+              work_dir: "%Z",
+              gres: "%b",  # must come at the end to fix a bug with Slurm 18
+            }
+          end
+
           private
+            # Modify the StringIO instance by advancing past the squeue header
+            #
+            # The first two "records" should always be discarded. Consider the
+            # following squeue with -M output (invisible characters shown):
+            #
+            #   CLUSTER: slurm_cluster_name\n
+            #   \x1EJOBID\x1F\x1FSTATE\n
+            #   \x1E1\x1F\x1FR\n
+            #   \x1E2\x1F\x1FPD\n
+            #
+            # Splitting on the record separator first gives the Cluster header,
+            # and then the regular header. If -M or --cluster is not specified
+            # the effect is the same because the record separator is at the
+            # start of the format string, so the first "record" would simply be
+            # empty.
+            def advance_past_squeue_header!(squeue_output)
+              2.times { squeue_output.gets(RECORD_SEPARATOR) }
+            end
+
             # Call a forked Slurm command for a given cluster
             def call(cmd, *args, env: {}, stdin: "")
               cmd = OodCore::Job::Adapters::Helper.bin_path(cmd, bin, bin_overrides)
@@ -159,60 +283,25 @@ module OodCore
               s.success? ? o : raise(Error, e)
             end
 
-            # Fields requested from a formatted `squeue` call
-            # Note that the order of these fields is important
-            def fields
-              {
-                account: "%a",
-                job_id: "%A",
-                exec_host: "%B",
-                min_cpus: "%c",
-                cpus: "%C",
-                min_tmp_disk: "%d",
-                nodes: "%D",
-                end_time: "%e",
-                dependency: "%E",
-                features: "%f",
-                array_job_id: "%F",
-                group_name: "%g",
-                group_id: "%G",
-                over_subscribe: "%h",
-                sockets_per_node: "%H",
-                array_job_task_id: "%i",
-                cores_per_socket: "%I",
-                job_name: "%j",
-                threads_per_core: "%J",
-                comment: "%k",
-                array_task_id: "%K",
-                time_limit: "%l",
-                time_left: "%L",
-                min_memory: "%m",
-                time_used: "%M",
-                req_node: "%n",
-                node_list: "%N",
-                command: "%o",
-                contiguous: "%O",
-                qos: "%q",
-                partition: "%P",
-                priority: "%Q",
-                reason: "%r",
-                start_time: "%S",
-                state_compact: "%t",
-                state: "%T",
-                user: "%u",
-                user_id: "%U",
-                reservation: "%v",
-                submit_time: "%V",
-                wckey: "%w",
-                licenses: "%W",
-                excluded_nodes: "%x",
-                core_specialization: "%X",
-                nice: "%y",
-                scheduled_nodes: "%Y",
-                sockets_cores_threads: "%z",
-                work_dir: "%Z",
-                gres: "%b",  # must come at the end to fix a bug with Slurm 18
-              }
+            def squeue_attrs_for_info_attrs(attrs)
+              attrs.map { |a|
+                {
+                  id: :job_id,
+                  status: :state_compact,
+                  allocated_nodes: [:node_list, :scheduled_nodes],
+                  # submit_host: nil,
+                  job_name: :job_name,
+                  job_owner: :user,
+                  accounting_id: :account,
+                  procs: :cpus,
+                  queue_name: :partition,
+                  wallclock_time: :time_used,
+                  wallclock_limit: :time_limit,
+                  # cpu_time: nil,
+                  submission_time: :submit_time,
+                  dispatch_time: :start_time
+                }.fetch(a, a)
+              }.flatten
             end
         end
 
@@ -328,7 +417,7 @@ module OodCore
         # @return [Array<Info>] information describing submitted jobs
         # @see Adapter#info_all
         def info_all(attrs: nil)
-          @slurm.get_jobs.map do |v|
+          @slurm.get_jobs(attrs: attrs).map do |v|
             parse_job_info(v)
           end
         rescue Batch::Error => e
@@ -360,6 +449,20 @@ module OodCore
           end
         end
 
+        # Retrieve info for all jobs for a given owner or owners from the
+        # resource manager
+        # @param owner [#to_s, Array<#to_s>] the owner(s) of the jobs
+        # @raise [JobAdapterError] if something goes wrong getting job info
+        # @return [Array<Info>] information describing submitted jobs
+        def info_where_owner(owner, attrs: nil)
+          owner = Array.wrap(owner).map(&:to_s).join(',')
+          @slurm.get_jobs(owner: owner).map do |v|
+            parse_job_info(v)
+          end
+        rescue Batch::Error => e
+          raise JobAdapterError, e.message
+        end
+
         # Retrieve job status from resource manager
         # @param id [#to_s] the id of the job
         # @raise [JobAdapterError] if something goes wrong getting job status
@@ -369,7 +472,7 @@ module OodCore
           id = id.to_s
           jobs = @slurm.get_jobs(
             id: id,
-            filters: [:job_id, :array_job_task_id, :state_compact]
+            attrs: [:job_id, :array_job_task_id, :state_compact]
           )
           # A job id can return multiple jobs if it corresponds to a job array
           # id, so we need to find the job that corresponds to the given job id
@@ -478,6 +581,7 @@ module OodCore
                 allocated_nodes = [ { name: nil } ] * v[:nodes].to_i
               end
             end
+
             Info.new(
               id: v[:job_id],
               status: get_state(v[:state_compact]),
@@ -491,8 +595,8 @@ module OodCore
               wallclock_time: duration_in_seconds(v[:time_used]),
               wallclock_limit: duration_in_seconds(v[:time_limit]),
               cpu_time: nil,
-              submission_time: Time.parse(v[:submit_time]),
-              dispatch_time: v[:start_time] == "N/A" ? nil : Time.parse(v[:start_time]),
+              submission_time: v[:submit_time] ? Time.parse(v[:submit_time]) : nil,
+              dispatch_time: (v[:start_time].nil? || v[:start_time] == "N/A") ? nil : Time.parse(v[:start_time]),
               native: v
             )
           end
@@ -500,7 +604,7 @@ module OodCore
           def handle_job_array(info_ary, id)
             # If only one job was returned we return it
             return info_ary.first unless info_ary.length > 1
-            
+
             parent_task_hash = {:tasks => []}
 
             info_ary.map do |task_info|

data/lib/ood_core/job/info.rb

@@ -113,6 +113,21 @@ module OodCore
         @native          = native
       end
 
+      # Create a new Info for a child task
+      # @return [Info] merging the parent and the child task
+      def build_child_info(task)
+        parent_only_keys = [
+          :allocated_nodes,
+          :procs,
+          :cpu_time,
+          :dispatch_time,
+          :native,
+          :tasks
+        ]
+
+        new(**to_h.merge(task.to_h).delete_if{|k, v| parent_only_keys.include?(k)})
+      end
+
       # Convert object to hash
       # @return [Hash] object as hash
       def to_h

data/lib/ood_core/job/task.rb

@@ -1,18 +1,19 @@
 module OodCore
   module Job
     class Task
-      attr_reader :id
-      attr_reader :status
+      attr_reader :id, :status, :wallclock_time
 
-      def initialize(id:, status:, **_)
-        @task_id = id
+      def initialize(id:, status:, wallclock_time: nil, **_)
+        @id = id.to_s
         @status = OodCore::Job::Status.new(state: status)
+        @wallclock_time = wallclock_time && wallclock_time.to_i
       end
 
       def to_h
         {
           :id => id,
-          :status => status
+          :status => status,
+          :wallclock_time => wallclock_time
         }
       end
 

data/lib/ood_core/version.rb

@@ -1,4 +1,4 @@
 module OodCore
   # The current version of {OodCore}
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Eric Franz
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support
@@ -147,7 +147,6 @@ files:
 - lib/ood_core/cluster.rb
 - lib/ood_core/clusters.rb
 - lib/ood_core/errors.rb
-- lib/ood_core/job/._task_status.rb
 - lib/ood_core/job/adapter.rb
 - lib/ood_core/job/adapters/drmaa.rb
 - lib/ood_core/job/adapters/helper.rb
@@ -198,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Open OnDemand core library