Fixes #36772 - container gateway db timeout tuning

theforeman · Sep 22, 2023 · bd7321b · bd7321b
1 parent 146218e
commit bd7321b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/manifests/plugin/container_gateway.pp b/manifests/plugin/container_gateway.pp
@@ -6,6 +6,8 @@
 #
 # $sqlite_db_path::           Absolute path for the SQLite DB file to exist at
 #
+# $sqlite_timeout::           Database busy timeout in milliseconds
+#
 # === Advanced parameters:
 #
 # $enabled::                  enables/disables the pulp plugin
@@ -21,6 +23,7 @@
   Foreman_proxy::ListenOn $listen_on = 'https',
   Stdlib::HTTPUrl $pulp_endpoint = "https://${facts['networking']['fqdn']}",
   Stdlib::Absolutepath $sqlite_db_path = '/var/lib/foreman-proxy/smart_proxy_container_gateway.db',
+  Integer $sqlite_timeout = 30_000,
 ) {
   foreman_proxy::plugin::module { 'container_gateway':
     version   => $version,

diff --git a/spec/classes/foreman_proxy__plugin__container_gateway_spec.rb b/spec/classes/foreman_proxy__plugin__container_gateway_spec.rb
@@ -13,7 +13,8 @@
             '---',
             ':enabled: https',
             ":pulp_endpoint: https://#{facts[:fqdn]}",
-            ':sqlite_db_path: /var/lib/foreman-proxy/smart_proxy_container_gateway.db'
+            ':sqlite_db_path: /var/lib/foreman-proxy/smart_proxy_container_gateway.db',
+            ':sqlite_timeout: 30000'
           ])
         end
       end
@@ -22,14 +23,16 @@
         let :params do {
           :pulp_endpoint => 'https://test.example.com',
           :sqlite_db_path => '/dev/null.db',
+          :sqlite_timeout => 12_345,
         } end
 
         it 'container_gateway.yml should contain the correct configuration' do
           verify_exact_contents(catalogue, '/etc/foreman-proxy/settings.d/container_gateway.yml', [
             '---',
             ':enabled: https',
             ':pulp_endpoint: https://test.example.com',
-            ':sqlite_db_path: /dev/null.db'
+            ':sqlite_db_path: /dev/null.db',
+            ':sqlite_timeout: 12345'
           ])
         end
       end

diff --git a/templates/plugin/container_gateway.yml.erb b/templates/plugin/container_gateway.yml.erb
@@ -3,3 +3,4 @@
 :enabled: <%= @module_enabled %>
 :pulp_endpoint: <%= scope.lookupvar("foreman_proxy::plugin::container_gateway::pulp_endpoint") %>
 :sqlite_db_path: <%= scope.lookupvar("foreman_proxy::plugin::container_gateway::sqlite_db_path") %>
+:sqlite_timeout: <%= scope.lookupvar("foreman_proxy::plugin::container_gateway::sqlite_timeout") %>