From b24c30e5578c28f567c956d1f8cc0c6199ff181e Mon Sep 17 00:00:00 2001
From: isaac-hammes <isaac.hammes@puppet.com>
Date: Wed, 6 Sep 2023 12:37:08 -0700
Subject: [PATCH] test migrate

---
 lib/vmpooler/api/v3.rb       |  1 -
 lib/vmpooler/pool_manager.rb | 14 +++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/lib/vmpooler/api/v3.rb b/lib/vmpooler/api/v3.rb
index 30b5b7c..a90dfc4 100644
--- a/lib/vmpooler/api/v3.rb
+++ b/lib/vmpooler/api/v3.rb
@@ -176,7 +176,6 @@ module Vmpooler
 
       def return_vm_to_ready_state(template, vm)
         tracer.in_span("Vmpooler::API::V3.#{__method__}") do
-          backend.srem("vmpooler__migrating__#{template}", vm)
           backend.hdel("vmpooler__active__#{template}", vm)
           backend.hdel("vmpooler__vm__#{vm}", 'checkout', 'token:token', 'token:user')
           backend.smove("vmpooler__running__#{template}", "vmpooler__ready__#{template}", vm)
diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb
index 4f00347..d59e563 100644
--- a/lib/vmpooler/pool_manager.rb
+++ b/lib/vmpooler/pool_manager.rb
@@ -852,16 +852,12 @@ module Vmpooler
 
     def migrate_vm(vm_name, pool_name, provider)
       Thread.new do
-        begin
-          mutex = vm_mutex(vm_name)
-          mutex.synchronize do
-            @redis.with_metrics do |redis|
-              redis.srem("vmpooler__migrating__#{pool_name}", vm_name)
-            end
-            provider.migrate_vm(pool_name, vm_name)
+        mutex = vm_mutex(vm_name)
+        mutex.synchronize do
+          @redis.with_metrics do |redis|
+            redis.srem("vmpooler__migrating__#{pool_name}", vm_name)
           end
-        rescue StandardError => e
-          $logger.log('s', "[x] [#{pool_name}] '#{vm_name}' migration failed with an error: #{e}")
+          provider.migrate_vm(pool_name, vm_name)
         end
       end
     end