vmpooler-provider-vsphere 3.3.1 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3993f61e1f93d1b0d899b9004551d873ca88eb2975c5d3286f892cf75e6299fb
-  data.tar.gz: bb24ee80ded8c8f7ae95d4b29539b24115d0d507b26cb8f2bc6d165211c1711b
+  metadata.gz: 9346926feaba4ff83c3a01469b879241d70d441e7b736dc50001e833925c5e99
+  data.tar.gz: b3130b8655080da52ab06c05608c52b0971b9fa9004f7b5fce9d6ac706acccb0
 SHA512:
-  metadata.gz: b11026cd5e1ea73065d6389c069bf98fc7622efa9e68fdd0d1e7beca533d32d3a7e7928b4780635e544b7ac0131f7e99a0835a6e0c141411308a4c794dcad147
-  data.tar.gz: dde0222e755ddd8ffe9fc132f32677472e8ae33630b39cc3a8a6644ea613fc6e00984ce9b1e28b983cf0ab67e51fb6fb41761754df3081d57acec35f03307a3b
+  metadata.gz: aee88c0ad11aeee8f52ae618ea665b279712ed69fb938c6e8c933951f1c86419b2d6a6662b7b76fe10e58ffc1d00e8b9bd7efc2b4b1c3c0fd05230e5a401e15c
+  data.tar.gz: 9d839e48ad53a8608c86f35f6ab4788cef341f18aaa0cae2d341007d60ce15ad732fa17773420ace69736ec48fc553dc04748f2f6c249fb942c6f6b98d2319df

data/lib/vmpooler/providers/vsphere.rb

@@ -68,14 +68,14 @@ module Vmpooler
           try = 0 if try.nil?
           max_tries = 3
           @redis.with_metrics do |redis|
-            redis.multi
-            redis.srem("vmpooler__completed__#{pool}", vm_name)
-            redis.hdel("vmpooler__active__#{pool}", vm_name)
-            redis.hset("vmpooler__vm__#{vm_name}", 'destroy', Time.now)
-
-            # Auto-expire metadata key
-            redis.expire("vmpooler__vm__#{vm_name}", (data_ttl * 60 * 60))
-            redis.exec
+            redis.multi do |transaction|
+              transaction.srem("vmpooler__completed__#{pool}", vm_name)
+              transaction.hdel("vmpooler__active__#{pool}", vm_name)
+              transaction.hset("vmpooler__vm__#{vm_name}", 'destroy', Time.now)
+
+              # Auto-expire metadata key
+              transaction.expire("vmpooler__vm__#{vm_name}", (data_ttl * 60 * 60))
+            end
           end
 
           start = Time.now
@@ -599,7 +599,7 @@ module Vmpooler
           boottime = vm_object.runtime.bootTime if vm_object.runtime&.bootTime
           powerstate = vm_object.runtime.powerState if vm_object.runtime&.powerState
 
-          ip_maxloop = 120
+          ip_maxloop = 240
           ip_loop_delay = 1
           ip_loop_count = 1
           ip = nil
@@ -1137,10 +1137,10 @@ module Vmpooler
           target_host_object = find_host_by_dnsname(connection, target_host_name)
           finish = migrate_vm_and_record_timing(pool_name, vm_name, vm_hash, target_host_object, target_host_name)
           @redis.with_metrics do |redis|
-            redis.multi
-            redis.hset("vmpooler__vm__#{vm_name}", 'host', target_host_name)
-            redis.hset("vmpooler__vm__#{vm_name}", 'migrated', true)
-            redis.exec
+            redis.multi do |transaction|
+              transaction.hset("vmpooler__vm__#{vm_name}", 'host', target_host_name)
+              transaction.hset("vmpooler__vm__#{vm_name}", 'migrated', true)
+            end
           end
           logger.log('s', "[>] [#{pool_name}] '#{vm_name}' migrated from #{vm_hash['host_name']} to #{target_host_name} in #{finish} seconds")
         ensure
@@ -1158,10 +1158,10 @@ module Vmpooler
           metrics.increment("migrate_to.#{dest_host_name}")
           @redis.with_metrics do |redis|
             checkout_to_migration = format('%<time>.2f', time: Time.now - Time.parse(redis.hget("vmpooler__vm__#{vm_name}", 'checkout')))
-            redis.multi
-            redis.hset("vmpooler__vm__#{vm_name}", 'migration_time', finish)
-            redis.hset("vmpooler__vm__#{vm_name}", 'checkout_to_migration', checkout_to_migration)
-            redis.exec
+            redis.multi do |transaction|
+              transaction.hset("vmpooler__vm__#{vm_name}", 'migration_time', finish)
+              transaction.hset("vmpooler__vm__#{vm_name}", 'checkout_to_migration', checkout_to_migration)
+            end
           end
           finish
         end

data/lib/vmpooler-provider-vsphere/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VmpoolerProviderVsphere
-  VERSION = '3.3.1'
+  VERSION = '3.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler-provider-vsphere
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.3
 platform: ruby
 authors:
 - Puppet
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-22 00:00:00.000000000 Z
+date: 2023-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement