ood_core 0.10.0 → 0.12.0

data/lib/ood_core/job/adapters/linux_host/templates/script_wrapper.erb.sh

@@ -1,5 +1,19 @@
 #!/bin/bash
-hostname
+SSH_HOSTS=(<%= ssh_hosts.join(' ').to_s %>)
+hostnames=`hostname -A`
+for host in ${SSH_HOSTS[@]}
+do
+    if [[ " ${hostnames[@]} " =~ " ${host} " ]]; then
+        hostname=$host
+    fi
+done
+
+if [ -z "$hostname" ]; then
+    printf >&2 "ERROR: Can't start job on [${hostnames[@]}] because it does not match any hostname configured \nin ssh_hosts [${SSH_HOSTS[@]}]. The output of 'hostname -A' must match an entry in ssh_hosts \nfrom the cluster configuration."
+    exit 1
+fi
+
+echo $hostname
 
 # Put the script into a temp file on localhost
 <% if debug %>

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

@@ -14,6 +14,7 @@ module OodCore
       # @option config [#to_s] :serverdir ('') Path to lsf client etc dir
       # @option config [#to_s] :cluster ('') name of cluster, if in multi-cluster mode
       # @option config [#to_h] :bin_overrides ({}) Optional overrides to LSF client executables
+      # @option config [#to_s] :submit_host ('') Host to submit commands to
       def self.build_lsf(config)
         batch = Adapters::Lsf::Batch.new(config.to_h.symbolize_keys)
         Adapters::Lsf.new(batch: batch)
@@ -167,6 +168,10 @@ module OodCore
           raise JobAdapterError, e.message
         end
 
+        def directive_prefix
+          '#BSUB'
+        end
+
         private
           # Determine state from LSF state code
           def get_state(st)

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

@@ -2,21 +2,22 @@
 #
 # @api private
 class OodCore::Job::Adapters::Lsf::Batch
-  attr_reader :bindir, :libdir, :envdir, :serverdir, :cluster, :bin_overrides
+  attr_reader :bindir, :libdir, :envdir, :serverdir, :cluster, :bin_overrides, :submit_host, :strict_host_checking
 
   # The root exception class that all LSF-specific exceptions inherit
   # from
   class Error < StandardError; end
 
   # @param bin [#to_s] path to LSF installation binaries
-  def initialize(bindir: "", envdir: "", libdir: "", serverdir: "", cluster: "", bin_overrides: {}, **_)
+  def initialize(bindir: "", envdir: "", libdir: "", serverdir: "", cluster: "", bin_overrides: {}, submit_host: "", strict_host_checking: true, **_)
     @bindir = Pathname.new(bindir.to_s)
-
     @envdir = Pathname.new(envdir.to_s)
     @libdir = Pathname.new(libdir.to_s)
     @serverdir = Pathname.new(serverdir.to_s)
     @cluster = cluster.to_s
     @bin_overrides = bin_overrides
+    @submit_host = submit_host.to_s
+    @strict_host_checking = strict_host_checking
   end
 
   def default_env
@@ -143,6 +144,7 @@ class OodCore::Job::Adapters::Lsf::Batch
       cmd = OodCore::Job::Adapters::Helper.bin_path(cmd, bindir, bin_overrides)
       args = cluster_args + args
       env = default_env.merge(env.to_h)
+      cmd, args = OodCore::Job::Adapters::Helper.ssh_wrap(submit_host, cmd, args, strict_host_checking, env)
       o, e, s = Open3.capture3(env, cmd, *(args.map(&:to_s)), stdin_data: stdin.to_s)
       s.success? ? o : raise(Error, e)
     end

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

@@ -78,34 +78,40 @@ class OodCore::Job::Adapters::Lsf::Helper
   def batch_submit_args(script, after: [], afterok: [], afternotok: [], afterany: [])
     args = []
 
-    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?
-    args += ["-H"] if script.submit_as_hold
-    args += (script.rerunnable ? ["-r"] : ["-rn"]) unless script.rerunnable.nil?
-    args += ["-b", script.start_time.localtime.strftime("%Y:%m:%d:%H:%M")] unless script.start_time.nil?
-    args += ["-W", (script.wall_time / 60).to_i] unless script.wall_time.nil?
-    args += ["-L", script.shell_path.to_s] unless script.shell_path.nil?
+    args.concat ["-P", script.accounting_id] unless script.accounting_id.nil?
+    args.concat ["-cwd", script.workdir.to_s] unless script.workdir.nil?
+    args.concat ["-J", script.job_name] unless script.job_name.nil?
+    args[-1].concat "[#{script.job_array_request}]" unless script.job_array_request.nil?
+
+    args.concat ["-q", script.queue_name] unless script.queue_name.nil?
+    args.concat ["-U", script.reservation_id] unless script.reservation_id.nil?
+    args.concat ["-sp", script.priority] unless script.priority.nil?
+    args.concat ["-H"] if script.submit_as_hold
+    args.concat (script.rerunnable ? ["-r"] : ["-rn"]) unless script.rerunnable.nil?
+    args.concat ["-b", script.start_time.localtime.strftime("%Y:%m:%d:%H:%M")] unless script.start_time.nil?
+    args.concat ["-W", (script.wall_time / 60).to_i] unless script.wall_time.nil?
+    args.concat ["-L", script.shell_path.to_s] unless script.shell_path.nil?
+
+    # environment
+    env = script.job_environment || {}
+    # To preserve pre-existing behavior we only act when true or false, when nil we do nothing
+    if script.copy_environment?
+      args.concat ["-env", (["all"] + env.keys).join(",")]
+    elsif script.copy_environment? == false
+      args.concat ["-env", (["none"] + env.keys).join(",")]
+    end
 
     # input and output files
-    args += ["-i", script.input_path] unless script.input_path.nil?
-    args += ["-o", script.output_path] unless script.output_path.nil?
-    args += ["-e", script.error_path] unless script.error_path.nil?
+    args.concat ["-i", script.input_path] unless script.input_path.nil?
+    args.concat ["-o", script.output_path] unless script.output_path.nil?
+    args.concat ["-e", script.error_path] unless script.error_path.nil?
 
     # email
-    args += ["-B"] if script.email_on_started
-    args += ["-N"] if script.email_on_terminated
-    args += ["-u", script.email.join(",")] unless script.email.nil? || script.email.empty?
+    args.concat ["-B"] if script.email_on_started
+    args.concat ["-N"] if script.email_on_terminated
+    args.concat ["-u", script.email.join(",")] unless script.email.nil? || script.email.empty?
 
-    args += script.native unless script.native.nil?
-
-    # environment
-    env = script.job_environment || {}
+    args.concat script.native unless script.native.nil?
 
     {args: args, env: env}
   end

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

@@ -10,17 +10,21 @@ module OodCore
       # Build the PBS Pro adapter from a configuration
       # @param config [#to_h] the configuration for job adapter
       # @option config [Object] :host (nil) The batch server host
+      # @option config [Object] :submit_host ("") The login node where the job is submitted
+      # @option config [Object] :strict_host_checking (true) Whether to use strict host checking when ssh to submit_host
       # @option config [Object] :exec (nil) Path to PBS Pro executables
       # @option config [Object] :qstat_factor (nil) Deciding factor on how to
       #   call qstat for a user
       # @option config [#to_h] :bin_overrides ({}) Optional overrides to PBS Pro client executables
       def self.build_pbspro(config)
         c = config.to_h.compact.symbolize_keys
-        host = c.fetch(:host, nil)
-        pbs_exec = c.fetch(:exec, nil)
-        qstat_factor = c.fetch(:qstat_factor, nil)
-        bin_overrides = c.fetch(:bin_overrides, {})
-        pbspro = Adapters::PBSPro::Batch.new(host: host, pbs_exec: pbs_exec, bin_overrides: bin_overrides)
+        host                 = c.fetch(:host, nil)
+        submit_host          = c.fetch(:submit_host, "")
+        strict_host_checking = c.fetch(:strict_host_checking, true)
+        pbs_exec             = c.fetch(:exec, nil)
+        qstat_factor         = c.fetch(:qstat_factor, nil)
+        bin_overrides         = c.fetch(:bin_overrides, {})
+        pbspro = Adapters::PBSPro::Batch.new(host: host, submit_host: submit_host, strict_host_checking: strict_host_checking, pbs_exec: pbs_exec, bin_overrides: bin_overrides)
         Adapters::PBSPro.new(pbspro: pbspro, qstat_factor: qstat_factor)
       end
     end
@@ -41,6 +45,18 @@ module OodCore
           # @return [String, nil] the batch server host
           attr_reader :host
 
+          # The login node to submit the job via ssh
+          # @example
+          #   my_batch.submit_host #=> "my_batch.server.edu"
+          # @return [String, nil] the login node
+          attr_reader :submit_host
+
+          # Whether to use strict host checking when ssh to submit_host
+          # @example
+          #   my_batch.strict_host_checking #=> "false"
+          # @return [Bool, true] the login node; true if not present
+          attr_reader :strict_host_checking
+
           # The path containing the PBS executables
           # @example
           #   my_batch.pbs_exec.to_s #=> "/usr/local/pbspro/10.0.0
@@ -58,11 +74,15 @@ module OodCore
           class Error < StandardError; end
 
           # @param host [#to_s, nil] the batch server host
+          # @param submit_host [#to_s, nil] the login node to ssh to
+          # @param strict_host_checking [bool, true] wheter to use strict host checking when ssh to submit_host
           # @param exec [#to_s, nil] path to pbs executables
-          def initialize(host: nil, pbs_exec: nil, bin_overrides: {})
-            @host = host && host.to_s
-            @pbs_exec = pbs_exec && Pathname.new(pbs_exec.to_s)
-            @bin_overrides = bin_overrides
+          def initialize(host: nil, submit_host: "", strict_host_checking: true, pbs_exec: nil, bin_overrides: {})
+            @host                 = host && host.to_s
+            @submit_host          = submit_host && submit_host.to_s
+            @strict_host_checking = strict_host_checking
+            @pbs_exec             = pbs_exec && Pathname.new(pbs_exec.to_s)
+            @bin_overrides        = bin_overrides
           end
 
           # Get a list of hashes detailing each of the jobs on the batch server
@@ -87,7 +107,7 @@ module OodCore
           # @return [Array<Hash>] list of details for jobs
           def get_jobs(id: "")
             args = ["-f", "-t"]   # display all information
-            args += [id.to_s] unless id.to_s.empty?
+            args.concat [id.to_s] unless id.to_s.empty?
             lines = call("qstat", *args).gsub("\n\t", "").split("\n").map(&:strip)
 
             jobs = []
@@ -159,12 +179,12 @@ module OodCore
               cmd = cmd.to_s
               bindir = (!!pbs_exec) ? pbs_exec.join("bin").to_s : ''
               cmd = OodCore::Job::Adapters::Helper.bin_path(cmd, bindir, bin_overrides)
-              args = args.map(&:to_s)
               env = env.to_h.each_with_object({}) { |(k, v), h| h[k.to_s] = v.to_s }
               env["PBS_DEFAULT"] = host.to_s if host
               env["PBS_EXEC"]    = pbs_exec.to_s if pbs_exec
+              cmd, args = OodCore::Job::Adapters::Helper.ssh_wrap(submit_host, cmd, args, strict_host_checking)
               chdir ||= "."
-              o, e, s = Open3.capture3(env, cmd, *args, stdin_data: stdin.to_s, chdir: chdir.to_s)
+              o, e, s = Open3.capture3(env, cmd, *(args.map(&:to_s)), stdin_data: stdin.to_s, chdir: chdir.to_s)
               s.success? ? o : raise(Error, e)
             end
         end
@@ -227,28 +247,28 @@ module OodCore
           # Set qsub options
           args = []
           # ignore args, can't use these if submitting from STDIN
-          args += ["-h"] if script.submit_as_hold
-          args += ["-r", script.rerunnable ? "y" : "n"] unless script.rerunnable.nil?
-          args += ["-M", script.email.join(",")] unless script.email.nil?
+          args.concat ["-h"] if script.submit_as_hold
+          args.concat ["-r", script.rerunnable ? "y" : "n"] unless script.rerunnable.nil?
+          args.concat ["-M", script.email.join(",")] unless script.email.nil?
           if script.email_on_started && script.email_on_terminated
-            args += ["-m", "be"]
+            args.concat ["-m", "be"]
           elsif script.email_on_started
-            args += ["-m", "b"]
+            args.concat ["-m", "b"]
           elsif script.email_on_terminated
-            args += ["-m", "e"]
+            args.concat ["-m", "e"]
           end
-          args += ["-N", script.job_name] unless script.job_name.nil?
-          args += ["-S", script.shell_path] unless script.shell_path.nil?
+          args.concat ["-N", script.job_name] unless script.job_name.nil?
+          args.concat ["-S", script.shell_path] unless script.shell_path.nil?
           # ignore input_path (not defined in PBS Pro)
-          args += ["-o", script.output_path] unless script.output_path.nil?
-          args += ["-e", script.error_path] unless script.error_path.nil?
+          args.concat ["-o", script.output_path] unless script.output_path.nil?
+          args.concat ["-e", script.error_path] unless script.error_path.nil?
           # Reservations are actually just queues in PBS Pro
-          args += ["-q", script.reservation_id] if !script.reservation_id.nil? && script.queue_name.nil?
-          args += ["-q", script.queue_name] unless script.queue_name.nil?
-          args += ["-p", script.priority] unless script.priority.nil?
-          args += ["-a", script.start_time.localtime.strftime("%C%y%m%d%H%M.%S")] unless script.start_time.nil?
-          args += ["-A", script.accounting_id] unless script.accounting_id.nil?
-          args += ["-l", "walltime=#{seconds_to_duration(script.wall_time)}"] unless script.wall_time.nil?
+          args.concat ["-q", script.reservation_id] if !script.reservation_id.nil? && script.queue_name.nil?
+          args.concat ["-q", script.queue_name] unless script.queue_name.nil?
+          args.concat ["-p", script.priority] unless script.priority.nil?
+          args.concat ["-a", script.start_time.localtime.strftime("%C%y%m%d%H%M.%S")] unless script.start_time.nil?
+          args.concat ["-A", script.accounting_id] unless script.accounting_id.nil?
+          args.concat ["-l", "walltime=#{seconds_to_duration(script.wall_time)}"] unless script.wall_time.nil?
 
           # Set dependencies
           depend = []
@@ -256,20 +276,21 @@ module OodCore
           depend << "afterok:#{afterok.join(":")}"       unless afterok.empty?
           depend << "afternotok:#{afternotok.join(":")}" unless afternotok.empty?
           depend << "afterany:#{afterany.join(":")}"     unless afterany.empty?
-          args += ["-W", "depend=#{depend.join(",")}"]   unless depend.empty?
+          args.concat ["-W", "depend=#{depend.join(",")}"]   unless depend.empty?
 
           # Set environment variables
           envvars = script.job_environment.to_h
-          args += ["-v", envvars.map{|k,v| "#{k}=#{v}"}.join(",")] unless envvars.empty?
+          args.concat ["-v", envvars.map{|k,v| "#{k}=#{v}"}.join(",")] unless envvars.empty?
+          args.concat ["-V"] if script.copy_environment?
 
           # If error_path is not specified we join stdout & stderr (as this
           # mimics what the other resource managers do)
-          args += ["-j", "oe"] if script.error_path.nil?
+          args.concat ["-j", "oe"] if script.error_path.nil?
 
-          args += ["-J", script.job_array_request] unless script.job_array_request.nil?
+          args.concat ["-J", script.job_array_request] unless script.job_array_request.nil?
 
           # Set native options
-          args += script.native if script.native
+          args.concat script.native if script.native
 
           # Submit job
           @pbspro.submit_string(script.content, args: args, chdir: script.workdir)
@@ -397,6 +418,10 @@ module OodCore
           raise JobAdapterError, e.message unless /Unknown Job Id/ =~ e.message || /Job has finished/ =~ e.message
         end
 
+        def directive_prefix
+          '#PBS'
+        end
+
         private
           # Convert duration to seconds
           def duration_in_seconds(time)

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

@@ -157,6 +157,10 @@ module OodCore
         rescue Batch::Error => e
           raise JobAdapterError, e.message
         end
+
+        def directive_prefix
+          '#$'
+        end
       end
     end
   end

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

@@ -15,7 +15,7 @@ end
 class OodCore::Job::Adapters::Sge::Batch
   using OodCore::Refinements::HashExtensions
 
-  attr_reader :bin, :bin_overrides, :conf, :cluster, :helper
+  attr_reader :bin, :bin_overrides, :conf, :cluster, :helper, :submit_host, :strict_host_checking
   
   require "ood_core/job/adapters/sge/qstat_xml_j_r_listener"
   require "ood_core/job/adapters/sge/qstat_xml_r_listener"
@@ -33,10 +33,11 @@ class OodCore::Job::Adapters::Sge::Batch
   # @see Factory.build_sge
   def initialize(config)
     @cluster          = config.fetch(:cluster, nil)
-    @conf             = Pathname.new(config.fetch(:conf, nil))
-    @bin              = Pathname.new(config.fetch(:bin, nil))
+    @bin              = Pathname.new(config.fetch(:bin, nil).to_s)
     @sge_root         = Pathname.new(config[:sge_root] || ENV['SGE_ROOT'] || "/var/lib/gridengine")
     @bin_overrides    = config.fetch(:bin_overrides, {})
+    @submit_host      = config.fetch(:submit_host, "")
+    @strict_host_checking = config.fetch(:strict_host_checking, true)
 
     # FIXME: hack as this affects env of the process!
     ENV['SGE_ROOT'] = @sge_root.to_s
@@ -63,7 +64,7 @@ class OodCore::Job::Adapters::Sge::Batch
   def get_all(owner: nil)
     listener = QstatXmlRListener.new
     argv = ['qstat', '-r', '-xml']
-    argv += ['-u', owner] unless owner.nil?
+    argv.concat ['-u', owner] unless owner.nil?
     REXML::Parsers::StreamParser.new(call(*argv), listener).parse
 
     listener.parsed_jobs.map{
@@ -167,11 +168,10 @@ class OodCore::Job::Adapters::Sge::Batch
   # Call a forked SGE command for a given batch server
   def call(cmd, *args, env: {}, stdin: "", chdir: nil)
     cmd = OodCore::Job::Adapters::Helper.bin_path(cmd, bin, bin_overrides)
-    args = args.map(&:to_s)
-
     env = env.to_h.each_with_object({}) { |(k, v), h| h[k.to_s] = v.to_s }
+    cmd, args = OodCore::Job::Adapters::Helper.ssh_wrap(submit_host, cmd, args, strict_host_checking, env)
     chdir ||= "."
-    o, e, s = Open3.capture3(env, cmd, *args, stdin_data: stdin.to_s, chdir: chdir.to_s)
+    o, e, s = Open3.capture3(env, cmd, *(args.map(&:to_s)), stdin_data: stdin.to_s, chdir: chdir.to_s)
     s.success? ? o : raise(Error, e)
   end
 

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

@@ -17,37 +17,38 @@ class OodCore::Job::Adapters::Sge::Helper
     raise_error_on_unsupported_args(script, after: after, afterok: afterok, afternotok: afternotok, afterany: afterany)
 
     args = []
-    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.concat ['-h'] if script.submit_as_hold
+    args.concat ['-r', 'yes'] if script.rerunnable
+    script.job_environment.each_pair {|k, v| args.concat ['-v', "#{k.to_s}=#{v.to_s}"]} unless script.job_environment.nil?
+    args.concat ["-V"] if script.copy_environment?
 
     if script.workdir
-      args += ['-wd', script.workdir]
+      args.concat ['-wd', script.workdir]
     elsif ! script_contains_wd_directive?(script.content)
-      args += ['-cwd']
+      args.concat ['-cwd']
     end
 
     on_event_email = []
     on_event_email << 'b' if script.email_on_started  # beginning
     on_event_email << 'ea' if script.email_on_terminated  # end, aborted
 
-    args += ['-M', script.email.first, '-m', on_event_email.join] if script.email && ! on_event_email.empty?
+    args.concat ['-M', script.email.first, '-m', on_event_email.join] if script.email && ! on_event_email.empty?
 
     afterok  = Array(afterok).map(&:to_s)
-    args += ['-hold_jid_ad', afterok.join(',')] unless afterok.empty?
+    args.concat ['-hold_jid_ad', afterok.join(',')] unless afterok.empty?
 
     # ignoring email_on_started
-    args += ['-N', script.job_name] unless script.job_name.nil?
-    args += ['-e', script.error_path] unless script.error_path.nil?
-    args += ['-o', script.output_path] unless script.output_path.nil?
-    args += ['-ar', script.reservation_id] unless script.reservation_id.nil?
-    args += ['-q', script.queue_name] unless script.queue_name.nil?
-    args += ['-p', script.priority] unless script.priority.nil?
-    args += ['-a', script.start_time.strftime('%C%y%m%d%H%M.%S')] unless script.start_time.nil?
-    args += ['-l', "h_rt=" + seconds_to_duration(script.wall_time)] unless script.wall_time.nil?
-    args += ['-P', script.accounting_id] unless script.accounting_id.nil?
-    args += ['-t', script.job_array_request] unless script.job_array_request.nil?
-    args += Array.wrap(script.native) if script.native
+    args.concat ['-N', script.job_name] unless script.job_name.nil?
+    args.concat ['-e', script.error_path] unless script.error_path.nil?
+    args.concat ['-o', script.output_path] unless script.output_path.nil?
+    args.concat ['-ar', script.reservation_id] unless script.reservation_id.nil?
+    args.concat ['-q', script.queue_name] unless script.queue_name.nil?
+    args.concat ['-p', script.priority] unless script.priority.nil?
+    args.concat ['-a', script.start_time.strftime('%C%y%m%d%H%M.%S')] unless script.start_time.nil?
+    args.concat ['-l', "h_rt=" + seconds_to_duration(script.wall_time)] unless script.wall_time.nil?
+    args.concat ['-P', script.accounting_id] unless script.accounting_id.nil?
+    args.concat ['-t', script.job_array_request] unless script.job_array_request.nil?
+    args.concat Array.wrap(script.native) if script.native
 
     args
   end

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

@@ -27,29 +27,44 @@ class QstatXmlJRListener
     @parsed_job = {
       :tasks => [],
       :status => :queued,
-      :procs => 1,  # un-knowable from SGE qstat output
-      :native => {}  # TODO: improve native attribute reporting
+      :procs => 1,
+      :native => {
+        :ST_name => ''
+      } 
     }
     @current_text = nil
     @current_request = nil
+    @processing_JB_stdout_path_list = false
 
     @processing_job_array_spec = false
+    @adding_slots = false
+
     @job_array_spec = {
       start: nil,
       stop: nil,
       step: 1,  # Step can have a default of 1
     }
     @running_tasks = []
+    @native_tags = ['JB_job_number', 'JB_job_name', 'JB_version', 'JB_project', 'JB_exec_file', 'JB_script_file', 'JB_script_size', 'JB_submission_time', 'JB_execution_time', 'JB_deadline', 'JB_owner', 'JB_uid', 'JB_group', 'JB_gid', 'JB_account', 'JB_cwd', 'JB_notify', 'JB_type', 'JB_reserve', 'JB_priority', 'JB_jobshare', 'JB_verify', 'JB_checkpoint_attr', 'JB_checkpoint_interval', 'JB_restart']
   end
 
   def tag_start(name, attrs)
     case name
     when 'task_id_range'
       toggle_processing_array_spec
+    when 'JB_pe_range'
+      toggle_adding_slots
+    when 'JB_stdout_path_list'
+      @processing_JB_stdout_path_list = true
     end
   end
 
   def tag_end(name)
+    #Add to native hash if in native_tags
+    if (@native_tags.include?(name))
+      @parsed_job[:native][:"#{name}"] = @current_text
+    end
+
     case name
     when 'JB_ja_tasks'
       end_JB_ja_tasks
@@ -78,13 +93,20 @@ class QstatXmlJRListener
     when 'djob_info'
       finalize_parsed_job
     when 'RN_min'
-      set_job_array_piece(:start)
+      set_job_array_piece(:start) if @processing_job_array_spec
+      set_slots if @adding_slots
     when 'RN_max'
-      set_job_array_piece(:stop)
+      set_job_array_piece(:stop) if @processing_job_array_spec
     when 'RN_step'
-      set_job_array_piece(:step)
+      set_job_array_piece(:step) if @processing_job_array_spec
     when 'task_id_range'
       toggle_processing_array_spec
+    when 'JB_pe_range'
+      toggle_adding_slots
+    when 'PN_path' 
+      end_PN_path
+    when 'ST_name'
+      end_ST_name
     end
   end
 
@@ -111,7 +133,7 @@ class QstatXmlJRListener
   end
 
   def end_JB_submission_time
-    @parsed_job[:submission_time] = @current_text.to_i
+    @parsed_job[:submission_time] = ms_to_seconds(@current_text.to_i)
   end
 
   def end_JB_ja_tasks
@@ -120,7 +142,7 @@ class QstatXmlJRListener
 
   def end_JAT_start_time
     @parsed_job[:status] = :running
-    @parsed_job[:dispatch_time] = @current_text.to_i
+    @parsed_job[:dispatch_time] = ms_to_seconds(@current_text.to_i)
     @parsed_job[:wallclock_time] = Time.now.to_i - @parsed_job[:dispatch_time]
   end
 
@@ -146,6 +168,15 @@ class QstatXmlJRListener
     @running_tasks << @current_text
   end
 
+  def end_PN_path
+    @parsed_job[:native][:PN_path] = @current_text if @processing_JB_stdout_path_list
+    @processing_JB_stdout_path_list = false
+  end
+
+  def end_ST_name
+    @parsed_job[:native][:ST_name] = @parsed_job[:native][:ST_name] + @current_text + ' '
+  end
+
   def set_job_array_piece(key)
     @job_array_spec[key] = @current_text if @processing_job_array_spec
   end
@@ -186,5 +217,20 @@ class QstatXmlJRListener
   def toggle_processing_array_spec
     @processing_job_array_spec = ! @processing_job_array_spec
   end
-end
 
+  def toggle_adding_slots
+    @adding_slots = ! @adding_slots
+  end
+
+  def set_slots
+    @parsed_job[:procs] = @current_text.to_i
+  end
+
+  private
+
+  # Some Grid Engines (like UGE) use milliseconds were others use
+  # seconds past the epoch.
+  def ms_to_seconds(raw)
+    raw.digits.length >= 13 ? raw / 1000 : raw
+  end
+end