vmpooler 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 421d86151ba2c7a9bcc2310e3596b43f27a0280df1b7cb0c042dd12a63c80086
-  data.tar.gz: 7f8e2dea7fc3f4089995fc65022e98e48771f5a40cbbd30b51ddf162fad7b3f7
+  metadata.gz: f340d7d1e189ff9355d4f4a8761a94bf29bef02c543a9b9f25730566a1cd4b57
+  data.tar.gz: d813584a92242703df14aee245e4aed1baea27ed21af09bdf3204daf4d4a20e2
 SHA512:
-  metadata.gz: 4722f36453f515e66cf69d2c9c19cd472dd289e012514b2823e6ccf2febbdc525d78969e4a24777779b2fd9dbf5c0f8137421e6fe0bdf95f726effead80cd114
-  data.tar.gz: 979d40b555d547d6ebec64efeb57af5cdb68eb90fbc6f759cf6a1bbfef074e66404b9e238ad410bd938cef611ae006e430aad86c754a50e3901d9c659081c733
+  metadata.gz: 9c12dc7726e6f80ca0fe4671f9a93e7c55686c0dbe5ec8e2fcd102e43b10fd9ac8fca2c7a7b0e744203e5531cf3b002fbb0024862d5a64263d6686c3ca87324a
+  data.tar.gz: 734e095b88977d1ff9e35bf2def3a92c736e3d02385889c680a192439b19bf28264093cdbd59bfca4c7d0cb669bab4768e0e59425319f950ef8f119afde7e92e

data/lib/vmpooler/api/v3.rb

@@ -283,11 +283,9 @@ module Vmpooler
       def update_user_metrics(operation, vmname)
         tracer.in_span("Vmpooler::API::V3.#{__method__}") do |span|
           begin
-            backend.multi
-            backend.hget("vmpooler__vm__#{vmname}", 'tag:jenkins_build_url')
-            backend.hget("vmpooler__vm__#{vmname}", 'token:user')
-            backend.hget("vmpooler__vm__#{vmname}", 'template')
-            jenkins_build_url, user, poolname = backend.exec
+            jenkins_build_url = backend.hget("vmpooler__vm__#{vmname}", 'tag:jenkins_build_url')
+            user = backend.hget("vmpooler__vm__#{vmname}", 'token:user')
+            poolname = backend.hget("vmpooler__vm__#{vmname}", 'template')
             poolname = poolname.gsub('.', '_')
 
             if user

data/lib/vmpooler/pool_manager.rb

@@ -129,6 +129,8 @@ module Vmpooler
       already_timed_out = time_since_clone > timeout
       timing_out_soon = time_since_clone > timeout_notification && !redis.hget("vmpooler__vm__#{vm}", 'timeout_notification')
 
+      return true if !already_timed_out && !timing_out_soon
+
       if already_timed_out
         unless exists
           remove_nonexistent_vm(vm, pool, redis)
@@ -142,7 +144,8 @@ module Vmpooler
       nonexist_warning = if already_timed_out
                            "[!] [#{pool}] '#{vm}' marked as 'failed' after #{timeout} minutes with error: #{open_socket_error}"
                          elsif timing_out_soon
-                           "[!] [#{pool}] '#{vm}' no longer exists when attempting to send notification of impending failure"
+                           time_remaining = timeout - timeout_notification
+                           "[!] [#{pool}] '#{vm}' will be marked as 'failed' in #{time_remaining} minutes with error: #{open_socket_error}"
                          else
                            "[!] [#{pool}] '#{vm}' This error is wholly unexpected"
                          end

data/lib/vmpooler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vmpooler
-  VERSION = '3.5.0'
+  VERSION = '3.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Puppet
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-23 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +141,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.24.2
   name: opentelemetry-resource_detectors
   prerelease: false
   type: :runtime
@@ -149,7 +149,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.24.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: