Fixes #38169 - Fix operatingsystem race condition with concurrent reg…

…istrations
theforeman · Jan 31, 2025 · 6c6953a · 6c6953a
1 parent 74ddd88
commit 6c6953a
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/services/katello/rhsm_fact_parser.rb b/app/services/katello/rhsm_fact_parser.rb
@@ -73,7 +73,13 @@ def operatingsystem
           os_attributes[:name] = "CentOS"
         end
 
-        ::Operatingsystem.find_or_create_by(os_attributes)
+        os = ::Operatingsystem.find_by(os_attributes)
+        if os.blank?
+          created = ::Operatingsystem.create_or_find_by(os_attributes)
+          created.errors.any? ? ::Operatingsystem.find_by(os_attributes) : created
+        else
+          os
+        end
       end
     end