ood_core 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b683439945311b9ec37061a7b52e318fce62c1b8
-  data.tar.gz: 84fed35c58484b25c42031c90e2ba00941ff23b9
+SHA256:
+  metadata.gz: 948be1edf24a4e534669547d92b6ad56cc229183442a27705941bd959085a09a
+  data.tar.gz: 700a6c5073641233ac36553350d4ab451e0b01d73f885bc7bd2695b81479b6fa
 SHA512:
-  metadata.gz: 21a3e7219b482d0174afabbd5d9c56a966efcf30525e8cba7dafd0703aa39596df0c80cab3c81c23dd38d754390c897115f5db70da19df7e408eac1a05c699eb
-  data.tar.gz: 7e3dc186e839286882fbf2e74e93ad00cf58c2036fc077b2e30c4df797f54962042bdeeea881649242dfaf179ee5252e7c1e6b165ee35a518e9b98b81bf2c531
+  metadata.gz: fcc1aa968fe78132164a5ba3ab6e6165f1f64b950ca1e3862b00020aec9915c1458e52897005a0057b6ca4d9205c3b463f8f9b421e85f9da75778fe27734b371
+  data.tar.gz: 74af322ccb4e8f50c350d190bacc65440fb3ab79791a4cb03f5d081131a0d72ad186f43b647621d57053f4da717a59cd9efae9f8cb7c6c377b34ec4563faf100

data/.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2.2
+  - 2.4.1
 before_install: gem install bundler -v 1.7.8
 notifications:
   email:

data/CHANGELOG.md

@@ -6,6 +6,20 @@ 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.7.0] - 2018-12-26
+### Added
+- Addition of an optional live system test of a configurable job adapter
+
+### Fixed
+- Fix Torque adapter crash by fixing scope resolution on Attrl and Attropl
+- Fix SGE adapter crash in `OodCore::Job::Adapters::Sge::Batch#get_info_enqueued_job` when libdrmma is not available (DRMMA constant not defined)
+
+### Changed
+- Always set `SGE_ROOT` env var, for both SGE commands via popen and when using libdrmaa
+- Use libdrmaa only when libdrmaa is set in the cluster config
+
+
 ## [0.6.0] - 2018-12-19
 ### Added
 - Added ability to override the default password length
@@ -139,7 +153,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.6.0...HEAD
+[Unreleased]: https://github.com/OSC/ood_core/compare/v0.7.0...HEAD
+[0.7.0]: https://github.com/OSC/ood_core/compare/v0.6.0...v0.7.0
 [0.6.0]: https://github.com/OSC/ood_core/compare/v0.5.1...v0.6.0
 [0.5.1]: https://github.com/OSC/ood_core/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/OSC/ood_core/compare/v0.4.0...v0.5.0

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, :sge_root, :helper
+  attr_reader :bin, :bin_overrides, :conf, :cluster, :helper
   
   require "ood_core/job/adapters/sge/qstat_xml_j_r_listener"
   require "ood_core/job/adapters/sge/qstat_xml_r_listener"
@@ -23,6 +23,7 @@ class OodCore::Job::Adapters::Sge::Batch
   require "ood_core/job/adapters/helper"
   require 'time'
 
+
   class Error < StandardError; end
 
   # @param opts [#to_h] the options defining this adapter
@@ -34,10 +35,18 @@ class OodCore::Job::Adapters::Sge::Batch
     @cluster          = config.fetch(:cluster, nil)
     @conf             = Pathname.new(config.fetch(:conf, nil))
     @bin              = Pathname.new(config.fetch(:bin, nil))
-    @sge_root         = config.key?(:sge_root) && config[:sge_root] ? Pathname.new(config[:sge_root]) : nil
+    @sge_root         = Pathname.new(config[:sge_root] || ENV['SGE_ROOT'] || "/var/lib/gridengine")
     @bin_overrides    = config.fetch(:bin_overrides, {})
 
-    load_drmaa(config[:libdrmaa_path]) if sge_root
+    # FIXME: hack as this affects env of the process!
+    ENV['SGE_ROOT'] = @sge_root.to_s
+
+    if config[:libdrmaa_path]
+      load_drmaa(config[:libdrmaa_path])
+      @can_use_drmaa    = true
+    else
+      @can_use_drmaa    = false
+    end
 
     @helper = OodCore::Job::Adapters::Sge::Helper.new
   end
@@ -62,7 +71,7 @@ class OodCore::Job::Adapters::Sge::Batch
 
   # Get OodCore::Job::Info for a job_id that may still be in the queue
   # 
-  # If @sge_root is nil or libdrmaa is not loaded then we cannot use DRMAA. Using
+  # If libdrmaa is not loaded then we cannot use DRMAA. Using
   # DRMAA provides better job status and should always be chosen if it is possible.
   # 
   # When qstat is called in XML mode for a job id that is not in the queue invalid XML
@@ -74,30 +83,35 @@ class OodCore::Job::Adapters::Sge::Batch
   def get_info_enqueued_job(job_id)
     job_info = OodCore::Job::Info.new(id: job_id.to_s, status: :completed)
     argv = ['qstat', '-r', '-xml', '-j', job_id.to_s]
-    
+
     begin
       results = call(*argv)
       listener = QstatXmlJRListener.new
       REXML::Parsers::StreamParser.new(results, listener).parse
 
       job_hash = listener.parsed_job
-      job_hash[:status] = get_status_from_drmma(job_id) if can_use_drmaa?
-        
+
+      if can_use_drmaa?
+        begin
+          job_hash[:status] = get_status_from_drmma(job_id)
+        rescue DRMAA::DRMAAInvalidArgumentError => e
+          raise Error, e.message
+        end
+      end
+
       job_info = OodCore::Job::Info.new(**job_hash)
     rescue REXML::ParseException => e
       # If the error is something other than a job not being found by qstat re-raise the error
       unless results =~ /unknown_jobs/
         raise e, "REXML::ParseException error and command '#{argv.join(' ')}' produced results that didn't contain string 'unknown_jobs'. ParseException: #{e.message}"
       end
-    rescue DRMAA::DRMAAInvalidArgumentError => e
-      raise Error, e.message
     end
 
     job_info
   end
 
   def can_use_drmaa?
-    sge_root && Object.const_defined?('DRMAA')
+    @can_use_drmaa
   end
 
   # Call qhold
@@ -197,7 +211,6 @@ class OodCore::Job::Adapters::Sge::Batch
 
   # Get the job status using DRMAA
   def get_status_from_drmma(job_id)
-    ENV['SGE_ROOT'] = sge_root.to_s
     translate_drmaa_state(DRMAA::SessionSingleton.instance.job_ps(job_id.to_s))
   end
-end
+end

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

@@ -1,8 +1,8 @@
 require 'open3'
 
 class OodCore::Job::Adapters::Torque
-    # Object used for simplified communication with a batch server
-    class Batch
+  # Object used for simplified communication with a batch server
+  class Batch
     # The host of the Torque batch server
     # @example OSC's Oakley batch server
     #   my_conn.host #=> "oak-batch.osc.edu"
@@ -99,7 +99,7 @@ class OodCore::Job::Adapters::Torque
     # @return [Hash] status info for batch server
     def get_status(filters: [])
       connect do |cid|
-        filters = Attrl.from_list filters
+        filters = FFI::Attrl.from_list filters
         batch_status = FFI.pbs_statserver cid, filters, nil
         batch_status.to_h.tap { FFI.pbs_statfree batch_status }
       end
@@ -125,7 +125,7 @@ class OodCore::Job::Adapters::Torque
     # @return [Hash] hash of details for the queues
     def get_queues(id: '', filters: [])
       connect do |cid|
-        filters = Attrl.from_list(filters)
+        filters = FFI::Attrl.from_list(filters)
         batch_status = FFI.pbs_statque cid, id.to_s, filters, nil
         batch_status.to_h.tap { FFI.pbs_statfree batch_status }
       end
@@ -168,7 +168,7 @@ class OodCore::Job::Adapters::Torque
     # @return [Hash] hash of details for nodes
     def get_nodes(id: '', filters: [])
       connect do |cid|
-        filters = Attrl.from_list(filters)
+        filters = FFI::Attrl.from_list(filters)
         batch_status = FFI.pbs_statnode cid, id.to_s, filters, nil
         batch_status.to_h.tap { FFI.pbs_statfree batch_status }
       end
@@ -213,7 +213,7 @@ class OodCore::Job::Adapters::Torque
     #
     def select_jobs(attribs: [])
       connect do |cid|
-        attribs = Attropl.from_list(attribs.map(&:to_h))
+        attribs = FFI::Attropl.from_list(attribs.map(&:to_h))
         batch_status = FFI.pbs_selstat cid, attribs, nil
         batch_status.to_h.tap { FFI.pbs_statfree batch_status }
       end
@@ -377,7 +377,7 @@ class OodCore::Job::Adapters::Torque
         end
 
         connect do |cid|
-          attropl = Attropl.from_list attribs
+          attropl = FFI::Attropl.from_list attribs
           FFI.pbs_submit cid, attropl, script, queue, nil
         end
       end

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

@@ -1,7 +1,8 @@
 require 'ffi'
 
+# An interface to the C-library of Torque
 class OodCore::Job::Adapters::Torque::FFI
-  # An interface to the C-library of Torque
+
   extend ::FFI::Library
 
   # @!attribute [rw] self.pbs_errno

data/lib/ood_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jeremy Nicklas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2018-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Open OnDemand core library