ood_core 0.31.1 → 0.31.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2dab30b28f29c33b19e8cce3b5464805c09ba374336ac68fa27da684826fca6
-  data.tar.gz: f94e04cb03fa816f4fa54f72e43acdfac2e5a3ee301bd0de59624ed4367669f7
+  metadata.gz: 22a88595820178ebd312d5c90bf151737c34d3ce3aff58d8e1d0b617340f4800
+  data.tar.gz: 73edf9d90d8dcb97e39b698dca68065f8ff7844dc823ed77a3fd24a54ea83b3a
 SHA512:
-  metadata.gz: 627ea1414e51fe18601977b50ad1b6472e58904a4ec6571620bc4a7dfa382c952e6aee65e04243352e4ed7ef842365a559134c2155d27c47a77fda819385afe0
-  data.tar.gz: 535c8466bf1e18192b850ab6c0c116c7b36173923c918c9bccc23d4e751acc9178c7f16a189efa518e103ec57be2b72e6d68d8ab2d11ec55a5874a525fac0ac5
+  metadata.gz: 006ec6f820b5541f99f44b26cdbe310edeae8841751da62ee8f47aa9dc43162b6630d4286060fd43ac61baf6f5a115f803ca0f2f1ff4013bf3055a31d2507489
+  data.tar.gz: 5d0cab41a9d413c53ed5a5184e985c07ec263dff69372c2031d8aa77ae375f7809618a9d29e363380bbe8f633010997cb86f1c3b2de509411ee1c4280441410d

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

@@ -103,24 +103,6 @@ module OodCore
           info(id).status
         end
 
-        # This adapter does not implement hold and will always raise
-        #   an exception.
-        # @param id [#to_s] the id of the job
-        # @raise [JobAdapterError] always
-        # @return [void]
-        def hold(_)
-          raise NotImplementedError, "subclass did not define #hold"
-        end
-
-        # This adapter does not implement release and will always raise
-        #   an exception.
-        # @param id [#to_s] the id of the job
-        # @raise [JobAdapterError] always
-        # @return [void]
-        def release(_)
-          raise NotImplementedError, "subclass did not define #release"
-        end
-
         # Delete the submitted job
         # @param id [#to_s] the id of the job
         # @return [void]

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

@@ -175,7 +175,9 @@ module OodCore
                             dispatch_time: "JobCurrentStartDate",
                             sys_cpu_time: "RemoteSysCpu",
                             user_cpu_time: "RemoteUserCpu",
-                            wallclock_time: "RemoteWallClockTime"
+                            wallclock_time: "RemoteWallClockTime",
+                            wallclock_limit: "AllowedExecuteDuration",
+                            server_time: "ServerTime"
                         }
                     end
 
@@ -312,7 +314,7 @@ module OodCore
                 # @raise [JobAdapterError] if something goes wrong submitting a job
                 # @return [String] the job id returned after successfully submitting a
                 #   job
-                def submit(script)
+                def submit(script, after: [], afterok: [], afternotok: [], afterany: [])
                     args = []
                     args.concat ["-batch-name", "#{script.job_name}"] unless script.job_name.nil?
                     args.concat ["-name", "#{script.queue_name}"] unless script.queue_name.nil?
@@ -530,12 +532,44 @@ module OodCore
                         submission_time: Time.at(job[:submission_time].to_i),
                         dispatch_time: Time.at(job[:dispatch_time].to_i),
                         cpu_time: job[:sys_cpu_time].to_i + job[:user_cpu_time].to_i,
-                        wallclock_time: job[:wallclock_time].to_i,
+                        wallclock_time: wallclock_time(job),
+                        wallclock_limit: wallclock_limit(job),
                         native: job[:native],
 
                     )
                 end
 
+                # Compute the elapsed wall clock time for a job in seconds.
+                #
+                # RemoteWallClockTime only accumulates time from *completed* runs; it is
+                # not updated while a job is currently executing. So for a running job we
+                # add the time elapsed since it started running, otherwise the remaining
+                # time (wallclock_limit - wallclock_time) never counts down.
+                def wallclock_time(job)
+                    wallclock = job[:wallclock_time].to_i
+                    if get_state(job[:status]) == :running
+                        start = job[:dispatch_time].to_i
+                        if start > 0
+                            # Prefer the schedd's clock (ServerTime) to avoid skew between hosts
+                            now = job[:server_time].to_i
+                            now = Time.now.to_i if now <= 0
+                            current_run = now - start
+                            wallclock += current_run if current_run > 0
+                        end
+                    end
+                    wallclock
+                end
+
+                # Parse the wall clock time limit (AllowedExecuteDuration) in seconds.
+                #
+                # Returns nil when the attribute is undefined (job submitted without a
+                # wall time) so the remaining time is treated as unlimited rather than
+                # incorrectly computed against a zero limit.
+                def wallclock_limit(job)
+                    limit = job[:wallclock_limit].to_s
+                    limit.match?(/\A\d+\z/) ? limit.to_i : nil
+                end
+
                 # Parse group information into AccountInfo objects
                 # @param groups [Array<String>] list of group names
                 # @return [Array<AccountInfo>] list of AccountInfo objects

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

@@ -51,7 +51,7 @@ class OodCore::Job::Adapters::LinuxHost::Launcher
     @strict_host_checking = strict_host_checking
     @submit_host = submit_host
     @tmux_bin = tmux_bin
-    @username = Etc.getlogin
+    @username = Etc.getpwuid.name
   end
 
   # @param hostname [#to_s] The hostname to submit the work to

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

@@ -122,8 +122,7 @@ module OodCore
           # @return [ClusterInfo] object containing cluster details
           def get_cluster_info
             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},statelong")
+            gres_lines = call("sinfo", "-ahNO", "nodehost:100,gres:512,gresused:512,statelong")
                          .lines.uniq.reject { |line| line.match?(/maint|drain|down/i) }.map(&:split)
 
             node_info = sinfo_headers.zip(node_cpu_info).to_h

data/lib/ood_core/version.rb

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

data/ood_core.gemspec

@@ -26,7 +26,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "ffi", "~> 1.16.3"
   spec.add_runtime_dependency "fog-openstack", "~> 1.1.5"
   spec.add_runtime_dependency "rexml", "~> 3.2"
-  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_runtime_dependency "ostruct"
+  spec.add_runtime_dependency "base64"
+
   spec.add_development_dependency "rake", "~> 13.4.1"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry", "~> 0.10"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_core
 version: !ruby/object:Gem::Version
-  version: 0.31.1
+  version: 0.31.2
 platform: ruby
 authors:
 - Eric Franz
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-20 00:00:00.000000000 Z
+date: 2026-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ood_support
@@ -69,19 +69,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement