From 51d050413e54f22e4f9f292659b0b7ade211885a Mon Sep 17 00:00:00 2001 From: Adam Grare Date: Mon, 26 Jun 2023 11:38:58 -0400 Subject: [PATCH] Merge pull request #497 from jrafanie/fix_join_with_duration Convert the duration to a float (cherry picked from commit 1371d53a794a3c0aaea3a2614d37245a424d7e63) --- .../kubernetes/container_manager/refresh_worker/watch_thread.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/manageiq/providers/kubernetes/container_manager/refresh_worker/watch_thread.rb b/app/models/manageiq/providers/kubernetes/container_manager/refresh_worker/watch_thread.rb index d3bcc228a2..6d46546f1e 100644 --- a/app/models/manageiq/providers/kubernetes/container_manager/refresh_worker/watch_thread.rb +++ b/app/models/manageiq/providers/kubernetes/container_manager/refresh_worker/watch_thread.rb @@ -31,7 +31,7 @@ def stop!(join_limit = 10.seconds) finish.make_true watch&.finish rescue nil - thread&.join(join_limit) + thread&.join(join_limit.to_f) end protected