ood_core 0.0.4 → 0.0.5

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

@@ -455,6 +455,13 @@ module OodCore
           # Parse hash describing Slurm job status
           def parse_job_info(v)
             allocated_nodes = parse_nodes(v[:node_list])
+            if allocated_nodes.empty?
+              if v[:scheduled_nodes] && v[:scheduled_nodes] != "(null)"
+                allocated_nodes = parse_nodes(v[:scheduled_nodes])
+              else
+                allocated_nodes = [ { name: nil } ] * v[:nodes].to_i
+              end
+            end
             Info.new(
               id: v[:job_id],
               status: get_state(v[:state_compact]),
@@ -466,6 +473,7 @@ module OodCore
               procs: v[:cpus],
               queue_name: v[:partition],
               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]),

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

@@ -1,6 +1,6 @@
 require "ood_core/refinements/hash_extensions"
 
-gem "pbs", "~> 2.0"
+gem "pbs", "~> 2.1"
 require "pbs"
 
 module OodCore
@@ -27,6 +27,7 @@ module OodCore
       # An adapter object that describes the communication with a Torque resource
       # manager for job management.
       class Torque < Adapter
+        using Refinements::ArrayExtensions
         using Refinements::HashExtensions
 
         # Mapping of state characters for PBS
@@ -133,6 +134,24 @@ module OodCore
           raise JobAdapterError, e.message
         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)
+          owner = Array.wrap(owner).map(&:to_s)
+          @pbs.select_jobs(
+            attribs: [
+              { name: "User_List", value: owner.join(","), op: :eq }
+            ]
+          ).map do |k, v|
+            parse_job_info(k, v)
+          end
+        rescue PBS::Error => e
+          raise JobAdapterError, e.message
+        end
+
         # Retrieve job info from the resource manager
         # @param id [#to_s] the id of the job
         # @raise [JobAdapterError] if something goes wrong getting job info
@@ -238,6 +257,16 @@ module OodCore
           def parse_job_info(k, v)
             /^(?<job_owner>[\w-]+)@/ =~ v[:Job_Owner]
             allocated_nodes = parse_nodes(v[:exec_host] || "")
+            procs = allocated_nodes.inject(0) { |sum, x| sum + x[:procs] }
+            if allocated_nodes.empty?
+              allocated_nodes = [ { name: nil } ] * v.fetch(:Resource_List, {})[:nodect].to_i
+              # Only cover the simplest of cases where there is a single
+              # `ppn=##` and ignore otherwise
+              ppn_list = v.fetch(:Resource_List, {})[:nodes].to_s.scan(/ppn=(\d+)/)
+              if ppn_list.size == 1
+                procs = allocated_nodes.size * ppn_list.first.first.to_i
+              end
+            end
             Info.new(
               id: k,
               status: STATE_MAP.fetch(v[:job_state], :undetermined),
@@ -246,9 +275,10 @@ module OodCore
               job_name: v[:Job_Name],
               job_owner: job_owner,
               accounting_id: v[:Account_Name],
-              procs: allocated_nodes.inject(0) { |sum, x| sum + x[:procs] },
+              procs: procs,
               queue_name: v[:queue],
               wallclock_time: duration_in_seconds(v.fetch(:resources_used, {})[:walltime]),
+              wallclock_limit: duration_in_seconds(v.fetch(:Resource_List, {})[:walltime]),
               cpu_time: duration_in_seconds(v.fetch(:resources_used, {})[:cput]),
               submission_time: v[:ctime],
               dispatch_time: v[:start_time],

data/lib/ood_core/job/info.rb

@@ -44,6 +44,10 @@ module OodCore
       # @return [Fixnum, nil] wallclock time
       attr_reader :wallclock_time
 
+      # The total wall clock time limit in seconds
+      # @return [Fixnum, nil] wallclock time limit
+      attr_reader :wallclock_limit
+
       # The accumulated CPU time in seconds
       # @return [Fixnum, nil] cpu time
       attr_reader :cpu_time
@@ -71,6 +75,7 @@ module OodCore
       # @param procs [#to_i, nil] allocated total number of procs
       # @param queue_name [#to_s, nil] queue name
       # @param wallclock_time [#to_i, nil] wallclock time
+      # @param wallclock_limit [#to_i, nil] wallclock time limit
       # @param cpu_time [#to_i, nil] cpu time
       # @param submission_time [#to_i, nil] submission time
       # @param dispatch_time [#to_i, nil] dispatch time
@@ -78,8 +83,8 @@ module OodCore
       def initialize(id:, status:, allocated_nodes: [], submit_host: nil,
                      job_name: nil, job_owner: nil, accounting_id: nil,
                      procs: nil, queue_name: nil, wallclock_time: nil,
-                     cpu_time: nil, submission_time: nil, dispatch_time: nil,
-                     native: nil, **_)
+                     wallclock_limit: nil, cpu_time: nil, submission_time: nil,
+                     dispatch_time: nil, native: nil, **_)
         @id              = id.to_s
         @status          = Status.new(state: status.to_sym)
         @allocated_nodes = allocated_nodes.map { |n| NodeInfo.new(n.to_h) }
@@ -90,6 +95,7 @@ module OodCore
         @procs           = procs           && procs.to_i
         @queue_name      = queue_name      && queue_name.to_s
         @wallclock_time  = wallclock_time  && wallclock_time.to_i
+        @wallclock_limit = wallclock_limit && wallclock_limit.to_i
         @cpu_time        = cpu_time        && cpu_time.to_i
         @submission_time = submission_time && Time.at(submission_time.to_i)
         @dispatch_time   = dispatch_time   && Time.at(dispatch_time.to_i)
@@ -110,6 +116,7 @@ module OodCore
           procs:           procs,
           queue_name:      queue_name,
           wallclock_time:  wallclock_time,
+          wallclock_limit: wallclock_limit,
           cpu_time:        cpu_time,
           submission_time: submission_time,
           dispatch_time:   dispatch_time,

data/lib/ood_core/refinements/hash_extensions.rb

@@ -19,6 +19,15 @@ module OodCore
           keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
           keys.each_with_object(self.class.new) { |k, hash| hash[k] = self[k] if has_key?(k) }
         end
+
+        # Return a hash with non `nil` values
+        # @example
+        #   { a: 1, b: nil, c: 3, d: nil }.compact
+        #   # => {:a=>1, :c=>3}
+        # @see https://apidock.com/rails/Hash/compact
+        def compact
+          self.select { |_, value| !value.nil? }
+        end
       end
     end
   end

data/lib/ood_core/version.rb

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

data/ood_core.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.2.0"
 
   spec.add_runtime_dependency "ood_support", "~> 0.0.2"
-  spec.add_development_dependency "pbs", "~> 2.0", ">= 2.0.3"
+  spec.add_development_dependency "pbs", "~> 2.1", ">= 2.1.0"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jeremy Nicklas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support
@@ -30,20 +30,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,10 @@ files:
 - lib/ood_core/acl/adapter.rb
 - lib/ood_core/acl/adapters/group.rb
 - lib/ood_core/acl/factory.rb
+- lib/ood_core/batch_connect/factory.rb
+- lib/ood_core/batch_connect/template.rb
+- lib/ood_core/batch_connect/templates/basic.rb
+- lib/ood_core/batch_connect/templates/vnc.rb
 - lib/ood_core/cluster.rb
 - lib/ood_core/clusters.rb
 - lib/ood_core/errors.rb
@@ -143,6 +147,7 @@ files:
 - lib/ood_core/job/adapters/lsf.rb
 - lib/ood_core/job/adapters/lsf/batch.rb
 - lib/ood_core/job/adapters/lsf/helper.rb
+- lib/ood_core/job/adapters/pbspro.rb
 - lib/ood_core/job/adapters/slurm.rb
 - lib/ood_core/job/adapters/torque.rb
 - lib/ood_core/job/factory.rb