Make SystemdService never give up on resources

Change-Id: Icd202be7cf55f8bd883d102c81881ed15a0e5191 Closes-Bug: #1859044
charmed-kubernetes · Apr 7, 2020 · 302f107 · 302f107
1 parent f658638
commit 302f107
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/common.py b/common.py
@@ -717,7 +717,9 @@ def configure_resource(self, crm):
             self.service_name.replace('-', '_'),
             self.systemd_service_name.replace('-', '_'))
         res_type = 'systemd:{}'.format(self.systemd_service_name)
-        crm.primitive(res_key, res_type, op='monitor interval="5s"')
+        _meta = 'migration-threshold="INFINITY" failure-timeout="5s"'
+        crm.primitive(
+            res_key, res_type, op='monitor interval="5s"', meta=_meta)
         crm.systemd_services(self.systemd_service_name)
         if self.clone:
             clone_key = 'cl_{}'.format(res_key)

diff --git a/unit_tests/test_common.py b/unit_tests/test_common.py
@@ -430,7 +430,8 @@ def test_configure_resource(self):
             'systemd:apache2')
         self.assertEqual(
             crm['resource_params']['res_apache_apache2'],
-            ('  op monitor interval="5s"'))
+            ('  meta migration-threshold="INFINITY" failure-timeout="5s"'
+             '  op monitor interval="5s"'))
         self.assertEqual(crm['systemd_services'], ('apache2',))
         self.assertEqual(
             crm['clones']['cl_res_apache_apache2'],
@@ -445,6 +446,7 @@ def test_configure_resource_no_clone(self):
             'systemd:apache2')
         self.assertEqual(
             crm['resource_params']['res_apache_apache2'],
-            ('  op monitor interval="5s"'))
+            ('  meta migration-threshold="INFINITY" failure-timeout="5s"'
+             '  op monitor interval="5s"'))
         self.assertEqual(crm['systemd_services'], ('apache2',))
         self.assertFalse(crm['clones'].get('cl_res_apache_apache2'))
diff --git a/unit_tests/test_requires.py b/unit_tests/test_requires.py
@@ -532,7 +532,10 @@ def test_add_systemd_service(self):
                 'res_mysql_telnetd': 'systemd:telnetd'},
             'delete_resources': [],
             'resource_params': {
-                'res_mysql_telnetd': '  op monitor interval="5s"'},
+                'res_mysql_telnetd':
+                    ('  meta migration-threshold="INFINITY" '
+                     'failure-timeout="5s"'
+                     '  op monitor interval="5s"')},
             'groups': {},
             'ms': {},
             'orders': {},