From 9646aa43572e8186748f6d4e0aef7aeb7d3bbad2 Mon Sep 17 00:00:00 2001
From: Kamil Sambor <ksambor@redhat.com>
Date: Fri, 28 Feb 2020 09:14:19 +0100
Subject: [PATCH] Add monitor interval for ovn dbs

Add parameter for configuring the ovn dbs monitor interval. Under load,
this can create extra stress and since the timeout has already been
bumped. It makes sense to bump this interval to a higher value as a
trade off between detecting a failure and stressing the service.

Change-Id: I0572f02f1bb8e099ce7647bc2f2f9b095a9c390c
(cherry picked from commit 61c61c89ed6e9c7d8502a17e681b6648c9930c6e)
---
 manifests/profile/pacemaker/ovn_dbs_bundle.pp     | 15 +++++++++++++--
 .../monitor_interval_ovndbs-6af18ba7f4a17cc5.yaml |  4 ++++
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/monitor_interval_ovndbs-6af18ba7f4a17cc5.yaml

diff --git a/manifests/profile/pacemaker/ovn_dbs_bundle.pp b/manifests/profile/pacemaker/ovn_dbs_bundle.pp
index 028c8c7cf..2a3d03b76 100644
--- a/manifests/profile/pacemaker/ovn_dbs_bundle.pp
+++ b/manifests/profile/pacemaker/ovn_dbs_bundle.pp
@@ -111,6 +111,14 @@
 #   dict called: force_vip_nic_overrides[<vip/network name>] = 'dummy'
 #   Defaults to hiera('tripleo::pacemaker::force_nic', undef)
 #
+# [*monitor_interval_master*]
+#   (Optional) monitor interval for ovn dbs resource
+#   Defaults to 10
+#
+# [*monitor_interval_slave*]
+#   (Optional) monitor interval for ovn dbs resource
+#   Defaults to 30
+#
 
 class tripleo::profile::pacemaker::ovn_dbs_bundle (
   $ovn_dbs_docker_image     = undef,
@@ -134,6 +142,9 @@ class tripleo::profile::pacemaker::ovn_dbs_bundle (
   $listen_on_master_ip_only = 'yes',
   $force_ocf                = false,
   $force_nic                = hiera('tripleo::pacemaker::force_nic', undef),
+  $monitor_interval_master  = 10,
+  $monitor_interval_slave   = 30,
+
 ) {
 
   if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
@@ -287,8 +298,8 @@ nb_master_protocol=ssl sb_master_protocol=ssl"
       pacemaker::resource::ocf { "${ovndb_servers_resource_name}":
         ocf_agent_name  => "${ovndb_servers_ocf_name}",
         master_params   => '',
-        op_params       => "start timeout=200s stop timeout=200s monitor interval=10s role=Master timeout=${dbs_timeout}s \
-monitor interval=30s role=Slave timeout=${dbs_timeout}s",
+        op_params       => "start timeout=200s stop timeout=200s monitor interval=${monitor_interval_master}s role=Master timeout=${dbs_timeout}s \
+monitor interval=${monitor_interval_slave}s role=Slave timeout=${dbs_timeout}s",
         resource_params => $resource_map,
         tries           => $pcs_tries,
         location_rule   => $ovn_dbs_location_rule,
diff --git a/releasenotes/notes/monitor_interval_ovndbs-6af18ba7f4a17cc5.yaml b/releasenotes/notes/monitor_interval_ovndbs-6af18ba7f4a17cc5.yaml
new file mode 100644
index 000000000..3e7497f84
--- /dev/null
+++ b/releasenotes/notes/monitor_interval_ovndbs-6af18ba7f4a17cc5.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Add parameter for setting monitor interval for ovndbs (default is 30s)