ood_core 0.30.1 → 0.30.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98cdd24e7d7a73ee1d0dff56b013fdc3a924197ae7dc168e0b7c940c134d99ab
-  data.tar.gz: b22aa4d3199bf0c7865d934aad23c5f5b9a358f19a6eebe77490076234e20461
+  metadata.gz: 6c188ef55a7fe689c68f86496f02753ef7c985fa371dce0674a85fe03c0a27b4
+  data.tar.gz: 0c52db6c183bb72280eebaf8df073d5cd4c4fcd27b4e3b8cf1683868ef0ce63e
 SHA512:
-  metadata.gz: bffd4cbfae260072fc1dfdbef4979932bafcf67946d57ffc9a4afd47e5f21eaf68cb9fecd88e3a1eb1989d5e5274145ddbd025a822e5fb378818c7160702b841
-  data.tar.gz: 893d3473c5bd0e87ed93ec5e0d131175bb92b78f381d732a14e62ecd4eeef2198db4d3f0574c7261dbd1c637bcc3494473df29f2bc4ceecdbfcf3142084ede1d
+  metadata.gz: bd8514abfa7da8ff2d66a13f65b50516c6123946ab8d5a53f792885bb692a86dcd1e82ea9e9e0d765b841e052804afeb6e02dbc4b4a84d06bc552e463feb2885
+  data.tar.gz: 22be9eb7a865c2504790298f4fb9658f91fcaba270bf68c614f30f77386333ecd9ba9f07dc8bf27345387f0581a2011fc5ee647ea3cd2f8fc21141ff8b63325d

data/lib/ood_core/job/adapters/coder/openstack_credentials.rb

@@ -97,6 +97,7 @@ class OpenStackCredentials < CredentialsInterface
       credentials_to_destroy.destroy
     rescue Excon::Error::Forbidden => e
       puts "Error destroying application credentials with id #{os_app_credentials['id']} #{e}"
+      raise JobAdapterError, e.message
     end
   end
 
@@ -115,4 +116,4 @@ class OpenStackCredentials < CredentialsInterface
   def find_os_application_credentials(connection, os_app_credentials)
     connection.application_credentials.find_by_id(os_app_credentials['id'], os_app_credentials['user_id'])
   end
-end
+end

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

@@ -79,10 +79,7 @@ module OodCore
         #   adapters can get by without populating the entire Info object
         # @return [Array<Info>] information describing submitted jobs
         def info_all(attrs: nil)
-        # TODO - implement info all for namespaces?
-          batch.method_missing(attrs: attrs)
-        rescue Batch::Error => e
-          raise JobAdapterError, e.message
+          raise NotImplementedError, 'subclass did not define #info_all'
         end
     
         # Whether the adapter supports job arrays
@@ -125,4 +122,4 @@ module OodCore
       end
     end
   end
-end
+end

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

@@ -121,19 +121,28 @@ module OodCore
           # Get a ClusterInfo object containing information about the given cluster
           # @return [ClusterInfo] object containing cluster details
           def get_cluster_info
-            node_cpu_info = call("sinfo", "-aho %A/%D/%C").strip.split('/')
+            node_cpu_info = call("sinfo", "-aho %F/%C").strip.split('/').map(&:to_i)
             gres_length = call("sinfo", "-o %G").lines.map(&:strip).map(&:length).max + 2
-            gres_lines = call("sinfo", "-ahNO ,nodehost,gres:#{gres_length},gresused:#{gres_length}")
-                         .lines.uniq.map(&:split)
-            ClusterInfo.new(active_nodes: node_cpu_info[0].to_i,
-                            total_nodes: node_cpu_info[2].to_i,
-                            active_processors: node_cpu_info[3].to_i,
-                            total_processors: node_cpu_info[6].to_i,
+            gres_lines = call("sinfo", "-ahNO", "nodehost,gres:#{gres_length},gresused:#{gres_length},statelong")
+                         .lines.uniq.reject { |line| line.match?(/maint|drain|down/i) }.map(&:split)
+
+            node_info = sinfo_headers.zip(node_cpu_info).to_h
+            ClusterInfo.new(active_nodes: node_info['nodes_allocated'],
+                            total_nodes: node_info['nodes_total'],
+                            active_processors: node_info['cpus_allocated'],
+                            total_processors: node_info['cpus_total'],
                             active_gpus: gres_lines.sum { |line| Slurm.gpus_from_gres(line[2]) },
                             total_gpus: gres_lines.sum { |line| Slurm.gpus_from_gres(line[1]) }
             )
           end
 
+          def sinfo_headers
+            [
+              'nodes_allocated', 'nodes_idle', 'nodes_other', 'nodes_total',
+              'cpus_allocated', 'cpus_idle', 'cpus_other', 'cpus_total'
+            ]
+          end
+
           # Get a list of hashes detailing each of the jobs on the batch server
           # @example Status info for all jobs
           #   my_batch.get_jobs

data/lib/ood_core/version.rb

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

data/ood_core.gemspec

@@ -33,5 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop", "~> 0.8"
   spec.add_development_dependency "climate_control", "~> 1.2.0"
   spec.add_development_dependency "minitest", "~> 5"
-  spec.add_development_dependency "mocha", "~> 2.4"
+  spec.add_development_dependency "mocha", "~> 3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.30.1
+  version: 0.30.2
 platform: ruby
 authors:
 - Eric Franz
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-12-03 00:00:00.000000000 Z
+date: 2026-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support
@@ -172,14 +172,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
 description: Open OnDemand core library that provides support for an HPC Center to
   globally define HPC services that web applications can then take advantage of.
 email: