ood_core 0.23.0 → 0.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 379d230153e94bdbeca027f601afc89a525b328d8e200cc1a6a18754b3370b88
-  data.tar.gz: 5544e85c81b6e955a63144a056eee24d6bd5ec062de4d17a535d9df78eb5a817
+  metadata.gz: 9864509d310ba9c2fc6f896595f62e429be829107029a81e91251d10abfd16e7
+  data.tar.gz: 3f71fbe1c5502068d39f2cba7971e5055a1a64818248df3dab486761357a3c4c
 SHA512:
-  metadata.gz: 972cabe2a634f50b730e29d31a54e34c2784ea707fd562b867c8f8731e4d612bd39fd8bcacb84b49585a08131d4f9e3770195f2c1c6036fde52ff4e3d4f7124c
-  data.tar.gz: 4a0997de2400017ad8a921358b76341706cd4e58034c881dd8b9dfe63e9d9b7c559c42ed711a13051cd5168dde6703164714d22ee1e8ae2d7980fa33d2da3e4c
+  metadata.gz: 9ae243f303ccd6910a73009538e59c56a071b742f002182a14bc667006831e5993552bfc662363083db8144c34cd0f1310aff947d1db1f158c3c43f54a14be0f
+  data.tar.gz: 61581da1191e92f68fadf2735bb05570be7297ee5e0769f20dafb2d6dceda8a5d644ab2b582fd117f2d028a0db9c45d2015e930aaa8b70420c82d5c1a3e81e06

data/CHANGELOG.md

@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.23.2] - 02-02-2023
+
+### Fixed
+
+- The linux host adapter should correctly extract the full apptainer pid in [794](https://github.com/OSC/ood_core/pull/794).
+
+
+## [0.23.1] - 02-01-2023
+
+### Fixed
+
+- `QueueInfo` objects also upcase accounts when applicable in [792](https://github.com/OSC/ood_core/pull/792).
+
+### Added
+
+- `queue_name` has the alias `queue` in [790](https://github.com/OSC/ood_core/pull/790).
+
 ## [0.23.0] - 01-17-2023
 
 ### Added
@@ -469,7 +486,9 @@ Functionally the same as [0.17.3] but with some CI updates.
 ### Added
 - Initial release!
 
-[Unreleased]: https://github.com/OSC/ood_core/compare/v0.23.0...HEAD
+[Unreleased]: https://github.com/OSC/ood_core/compare/v0.23.2...HEAD
+[0.23.2]: https://github.com/OSC/ood_core/compare/v0.23.1...v0.23.2
+[0.23.1]: https://github.com/OSC/ood_core/compare/v0.23.0...v0.23.1
 [0.23.0]: https://github.com/OSC/ood_core/compare/v0.22.0...v0.23.0
 [0.22.0]: https://github.com/OSC/ood_core/compare/v0.21.0...v0.22.0
 [0.21.0]: https://github.com/OSC/ood_core/compare/v0.20.2...v0.21.0

data/lib/ood_core/data_formatter.rb

@@ -0,0 +1,14 @@
+module OodCore
+  module DataFormatter
+    # Determine whether to upcase account strings when returning adapter#accounts
+    def upcase_accounts?
+      env_var = ENV['OOD_UPCASE_ACCOUNTS']
+
+      if env_var.nil? || env_var.to_s.downcase == 'false'
+        false
+      else
+        true
+      end
+    end
+  end
+end

data/lib/ood_core/job/account_info.rb

@@ -3,6 +3,8 @@ module OodCore
 
     class AccountInfo
 
+      include OodCore::DataFormatter
+
       # The name of the account.
       attr_reader :name
       alias to_s name
@@ -19,7 +21,7 @@ module OodCore
 
       def initialize(**opts)
         orig_name = opts.fetch(:name, 'unknown')
-        @name = OodCore::Job::Adapters::Helper.upcase_accounts? ? orig_name.upcase : orig_name
+        @name = upcase_accounts? ? orig_name.upcase : orig_name
         @qos = opts.fetch(:qos, [])
         @cluster = opts.fetch(:cluster, nil)
         @queue = opts.fetch(:queue, nil)

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

@@ -31,17 +31,6 @@ module OodCore
 
           return 'ssh', args + [cmd] + cmd_args
         end
-
-        # Determine whether to upcase account strings when returning adapter#accounts
-        def self.upcase_accounts?
-          env_var = ENV['OOD_UPCASE_ACCOUNTS']
-
-          if env_var.nil? || env_var.to_s.downcase == 'false'
-            false
-          else
-            true
-          end
-        end
       end
     end
   end

data/lib/ood_core/job/adapters/linux_host/launcher.rb

@@ -73,7 +73,7 @@ class OodCore::Job::Adapters::LinuxHost::Launcher
     # Get the tmux pane PID for the target session
     pane_pid=$(tmux list-panes -aF '\#{session_name} \#{pane_pid}' | grep '#{session_name}' | cut -f 2 -d ' ')
     # Find the Singularity sinit PID child of the pane process
-    pane_sinit_pid=$(pstree -p -l "$pane_pid" | egrep -o 'sinit[(][[:digit:]]*|shim-init[(][[:digit:]]|appinit[(][[:digit:]]' | grep -o '[[:digit:]]*')
+    pane_sinit_pid=$(pstree -p -l "$pane_pid" | egrep -o 'sinit[(][[:digit:]]*|shim-init[(][[:digit:]]|appinit[(][[:digit:]]*' | grep -o '[[:digit:]]*')
     # Kill sinit which stops both Singularity-based processes and the tmux session
     kill "$pane_sinit_pid"
     SCRIPT

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

@@ -186,13 +186,13 @@ module OodCore
             [].tap do |accts|
               call('sacctmgr', *args).each_line do |line|
                 acct, cluster, queue, qos = line.split('|')
-                next if acct.nil?
+                next if acct.nil? || acct.chomp.empty?
 
                 args = {
                   name: acct,
                   qos: qos.to_s.chomp.split(','),
                   cluster: cluster,
-                  queue: queue.empty? ? nil : queue
+                  queue: queue.to_s.empty? ? nil : queue
                 }
                 info = OodCore::Job::AccountInfo.new(**args) unless acct.nil?
                 accts << info unless acct.nil?

data/lib/ood_core/job/queue_info.rb

@@ -2,6 +2,9 @@
 
 # QueueInfo is information about a given queue on a scheduler.
 class OodCore::Job::QueueInfo
+
+  include OodCore::DataFormatter
+
   # The name of the queue.
   attr_reader :name
   alias to_s name
@@ -20,8 +23,17 @@ class OodCore::Job::QueueInfo
   def initialize(**opts)
     @name = opts.fetch(:name, 'unknown')
     @qos = opts.fetch(:qos, [])
-    @allow_accounts = opts.fetch(:allow_accounts, nil)
-    @deny_accounts = opts.fetch(:deny_accounts, [])
+
+    allow_accounts = opts.fetch(:allow_accounts, nil)
+    @allow_accounts = if allow_accounts.nil?
+                        nil
+                      else
+                        allow_accounts.compact.map { |acct| upcase_accounts? ? acct.to_s.upcase : acct }
+                      end
+
+    @deny_accounts = opts.fetch(:deny_accounts, []).compact.map do |acct|
+      upcase_accounts? ? acct.to_s.upcase : acct
+    end
   end
 
   def to_h

data/lib/ood_core/job/script.rb

@@ -77,6 +77,7 @@ module OodCore
       # Name of the queue the job should be submitted to
       # @return [String, nil] queue name
       attr_reader :queue_name
+      alias queue queue_name
 
       # The scheduling priority for the job
       # @return [Integer, nil] scheduling priority

data/lib/ood_core/version.rb

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

data/lib/ood_core.rb

@@ -3,6 +3,7 @@ require "ood_core/errors"
 require "ood_core/cluster"
 require "ood_core/clusters"
 require "ood_core/invalid_cluster"
+require "ood_core/data_formatter"
 
 # The main namespace for ood_core
 module OodCore

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.23.2
 platform: ruby
 authors:
 - Eric Franz
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support
@@ -176,6 +176,7 @@ files:
 - lib/ood_core/batch_connect/templates/vnc_container.rb
 - lib/ood_core/cluster.rb
 - lib/ood_core/clusters.rb
+- lib/ood_core/data_formatter.rb
 - lib/ood_core/errors.rb
 - lib/ood_core/invalid_cluster.rb
 - lib/ood_core/job/account_info.rb