From 16eff399ad65a4e1d6c429cd343c79185a03f11b Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Mon, 23 Nov 2020 09:27:52 +0800
Subject: [PATCH] Allow db sync timeouts to be configurable

As Openstack projects continue to have longer database migration
chains, the Puppet default timeout of 300 seconds for an execution
is becoming too short a duration on some hardware, leading to timeouts.
As projects continue to add more migration scripts without pruning
the base, timeouts will continue to become more frequent unless
this time can be expanded.

Change-Id: Ia353f278db9426d29617d6c274fef0c8b71c53e1
Closes-Bug: #1904962
---
 manifests/db/sync.pp                                   | 10 ++++++++--
 .../notes/add_db_sync_timeout-a7c5fa2a436d982a.yaml    |  3 +++
 spec/classes/ec2api_db_sync_spec.rb                    |  1 +
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/add_db_sync_timeout-a7c5fa2a436d982a.yaml

diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index 2a4b6cf..a0114f8 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -12,9 +12,14 @@
 #   (Optional) Run db_sync by this system group.
 #   Default to ec2api
 #
+# [*db_sync_timeout*]
+#   (Optional) Timeout for the execution of the db_sync
+#   Defaults to 300
+#
 class ec2api::db::sync (
-  $system_user  = 'ec2api',
-  $system_group = 'ec2api',
+  $system_user     = 'ec2api',
+  $system_group    = 'ec2api',
+  $db_sync_timeout = 300,
 ) {
 
   include ec2api::deps
@@ -27,6 +32,7 @@ class ec2api::db::sync (
     refreshonly => true,
     try_sleep   => 5,
     tries       => 10,
+    timeout     => $db_sync_timeout,
     logoutput   => on_failure,
     subscribe   => [
       Anchor['ec2api::install::end'],
diff --git a/releasenotes/notes/add_db_sync_timeout-a7c5fa2a436d982a.yaml b/releasenotes/notes/add_db_sync_timeout-a7c5fa2a436d982a.yaml
new file mode 100644
index 0000000..233445f
--- /dev/null
+++ b/releasenotes/notes/add_db_sync_timeout-a7c5fa2a436d982a.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Adds db_sync_timeout parameter to db sync.
diff --git a/spec/classes/ec2api_db_sync_spec.rb b/spec/classes/ec2api_db_sync_spec.rb
index b4fed5e..2f67868 100644
--- a/spec/classes/ec2api_db_sync_spec.rb
+++ b/spec/classes/ec2api_db_sync_spec.rb
@@ -15,6 +15,7 @@ describe 'ec2api::db::sync' do
           :refreshonly => true,
           :try_sleep   => 5,
           :tries       => 10,
+          :timeout     => 300,
           :logoutput   => 'on_failure',
           :subscribe   => [
             'Anchor[ec2api::install::end]',