From c13a788dd99a515a8bc5fc52b653fead39662eb8 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Fri, 16 Mar 2018 11:21:20 +0800
Subject: [PATCH] Added retries for db_sync

If db sync fails, it is never retried leading to errors. So, this
patch adds retries for db_sync to avoid sync fails.

Change-Id: I784ca2fc0a9a906633ad60d1338c4b4b73c376c7
Closes-Bug: #1628580
---
 manifests/db/create_schema.pp                 | 2 ++
 manifests/db/upgrade.pp                       | 2 ++
 spec/classes/watcher_db_create_schema_spec.rb | 4 ++++
 spec/classes/watcher_db_upgrade_spec.rb       | 4 ++++
 4 files changed, 12 insertions(+)

diff --git a/manifests/db/create_schema.pp b/manifests/db/create_schema.pp
index c6ec99e..9cbc1b9 100644
--- a/manifests/db/create_schema.pp
+++ b/manifests/db/create_schema.pp
@@ -19,6 +19,8 @@ class watcher::db::create_schema(
     path        => '/usr/bin',
     user        => 'watcher',
     refreshonly => true,
+    try_sleep   => 5,
+    tries       => 10,
     logoutput   => on_failure,
     subscribe   => [
       Anchor['watcher::install::end'],
diff --git a/manifests/db/upgrade.pp b/manifests/db/upgrade.pp
index f3951e4..bf44171 100644
--- a/manifests/db/upgrade.pp
+++ b/manifests/db/upgrade.pp
@@ -20,6 +20,8 @@ class watcher::db::upgrade(
     path        => '/usr/bin',
     user        => 'watcher',
     refreshonly => true,
+    try_sleep   => 5,
+    tries       => 10,
     logoutput   => on_failure,
     subscribe   => [
       Anchor['watcher::install::end'],
diff --git a/spec/classes/watcher_db_create_schema_spec.rb b/spec/classes/watcher_db_create_schema_spec.rb
index 840fd1d..d274e5d 100644
--- a/spec/classes/watcher_db_create_schema_spec.rb
+++ b/spec/classes/watcher_db_create_schema_spec.rb
@@ -10,6 +10,8 @@ describe 'watcher::db::create_schema' do
         :path        => '/usr/bin',
         :user        => 'watcher',
         :refreshonly => 'true',
+        :try_sleep   => 5,
+        :tries       => 10,
         :logoutput   => 'on_failure',
         :subscribe   => [
           'Anchor[watcher::install::end]',
@@ -34,6 +36,8 @@ describe 'watcher::db::create_schema' do
           :path        => '/usr/bin',
           :user        => 'watcher',
           :refreshonly => 'true',
+          :try_sleep   => 5,
+          :tries       => 10,
           :logoutput   => 'on_failure',
           :subscribe   => [
             'Anchor[watcher::install::end]',
diff --git a/spec/classes/watcher_db_upgrade_spec.rb b/spec/classes/watcher_db_upgrade_spec.rb
index 05592e4..1075c76 100644
--- a/spec/classes/watcher_db_upgrade_spec.rb
+++ b/spec/classes/watcher_db_upgrade_spec.rb
@@ -10,6 +10,8 @@ describe 'watcher::db::upgrade' do
         :path        => '/usr/bin',
         :user        => 'watcher',
         :refreshonly => 'true',
+        :try_sleep   => 5,
+        :tries       => 10,
         :logoutput   => 'on_failure',
         :subscribe   => [
           'Anchor[watcher::install::end]',
@@ -34,6 +36,8 @@ describe 'watcher::db::upgrade' do
           :path        => '/usr/bin',
           :user        => 'watcher',
           :refreshonly => 'true',
+          :try_sleep   => 5,
+          :tries       => 10,
           :logoutput   => 'on_failure',
           :subscribe   => [
             'Anchor[watcher::install::end]',