Make SystemdService never give up on resources
Change-Id: Icd202be7cf55f8bd883d102c81881ed15a0e5191 Closes-Bug: #1859044
This commit is contained in:
parent
4baae7a0f2
commit
ef1f8503f4
|
@ -717,7 +717,9 @@ class SystemdService(ResourceDescriptor):
|
||||||
self.service_name.replace('-', '_'),
|
self.service_name.replace('-', '_'),
|
||||||
self.systemd_service_name.replace('-', '_'))
|
self.systemd_service_name.replace('-', '_'))
|
||||||
res_type = 'systemd:{}'.format(self.systemd_service_name)
|
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)
|
crm.systemd_services(self.systemd_service_name)
|
||||||
if self.clone:
|
if self.clone:
|
||||||
clone_key = 'cl_{}'.format(res_key)
|
clone_key = 'cl_{}'.format(res_key)
|
||||||
|
|
|
@ -430,7 +430,8 @@ class TestHAClusterCommonSystemdService(unittest.TestCase):
|
||||||
'systemd:apache2')
|
'systemd:apache2')
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
crm['resource_params']['res_apache_apache2'],
|
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['systemd_services'], ('apache2',))
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
crm['clones']['cl_res_apache_apache2'],
|
crm['clones']['cl_res_apache_apache2'],
|
||||||
|
@ -445,6 +446,7 @@ class TestHAClusterCommonSystemdService(unittest.TestCase):
|
||||||
'systemd:apache2')
|
'systemd:apache2')
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
crm['resource_params']['res_apache_apache2'],
|
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['systemd_services'], ('apache2',))
|
||||||
self.assertFalse(crm['clones'].get('cl_res_apache_apache2'))
|
self.assertFalse(crm['clones'].get('cl_res_apache_apache2'))
|
||||||
|
|
|
@ -532,7 +532,10 @@ class TestHAClusterRequires(unittest.TestCase):
|
||||||
'res_mysql_telnetd': 'systemd:telnetd'},
|
'res_mysql_telnetd': 'systemd:telnetd'},
|
||||||
'delete_resources': [],
|
'delete_resources': [],
|
||||||
'resource_params': {
|
'resource_params': {
|
||||||
'res_mysql_telnetd': ' op monitor interval="5s"'},
|
'res_mysql_telnetd':
|
||||||
|
(' meta migration-threshold="INFINITY" '
|
||||||
|
'failure-timeout="5s"'
|
||||||
|
' op monitor interval="5s"')},
|
||||||
'groups': {},
|
'groups': {},
|
||||||
'ms': {},
|
'ms': {},
|
||||||
'orders': {},
|
'orders': {},
|
||||||
|
|
Loading…
Reference in New Issue