vmpooler 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 421d86151ba2c7a9bcc2310e3596b43f27a0280df1b7cb0c042dd12a63c80086
-  data.tar.gz: 7f8e2dea7fc3f4089995fc65022e98e48771f5a40cbbd30b51ddf162fad7b3f7
+  metadata.gz: abc6c0e799944bad6d5f766f21a5fd55038daf2741604a79dbf1dd409a4c6f54
+  data.tar.gz: 6977e9af54319329a9a526e0dfea5d39b453c57f391a24782f64fbf70f3cc300
 SHA512:
-  metadata.gz: 4722f36453f515e66cf69d2c9c19cd472dd289e012514b2823e6ccf2febbdc525d78969e4a24777779b2fd9dbf5c0f8137421e6fe0bdf95f726effead80cd114
-  data.tar.gz: 979d40b555d547d6ebec64efeb57af5cdb68eb90fbc6f759cf6a1bbfef074e66404b9e238ad410bd938cef611ae006e430aad86c754a50e3901d9c659081c733
+  metadata.gz: 33c3cea211a61f072498adbeff5c2ea8b9862e9dee8cac3a38b0f2757492a8df7ed7b8150b7213777b597804c235ea61c12eaeeed5a3c0907053d2f5111746a6
+  data.tar.gz: 28785ede40fdc245732195a6beeea9e4bced0c0d85fc54d12bfe6b6e931c50dc1d81942bd540201bcc33ff07ae876114b82524b47567314fbf1e1883e96252a6

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)

data/lib/vmpooler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Puppet
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-23 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement