Skip to content

Commit

Permalink
Health check verify all clones
Browse files Browse the repository at this point in the history 
`pki-healthcheck` stop its activity in case a clone is not working and
report the error. If multiple clones are configured the check should go
ahead to verify the other clones.

With this fix all clones are verified during the health check.
  • Loading branch information
@fmarco76
fmarco76 committed Aug 3, 2023
1 parent 79d2877 commit db3b7f4
Showing 1 changed file with 54 additions and 40 deletions.
94 changes: 54 additions & 40 deletions base/server/healthcheck/pki/server/healthcheck/clones/connectivity_and_data.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class ClonesConnectivyAndDataCheck(ClonesPlugin):
Assure master and clones within a pki instance are reachable
"""
def check_ca_clones(self):
host_error = []
for host in self.clone_cas:
cur_clone_msg = ' Host: ' + host.Hostname + ' Port: ' + host.SecurePort
# Reach out and get some certs, to serve as a data and connectivity check
Expand All @@ -40,11 +41,13 @@ def check_ca_clones(self):
raise BaseException('CA clone problem reading data.' + cur_clone_msg)
except BaseException as e:
logger.error("Internal server error %s", e)
raise BaseException('Internal error testing CA clone.' + cur_clone_msg)
host_error.append(
BaseException('Internal error testing CA clone.' + cur_clone_msg))

return
return host_error

def check_kra_clones(self):
host_error = []
for host in self.clone_kras:

url = 'https://' + host.Hostname + ':' + host.SecurePort
Expand All @@ -58,13 +61,15 @@ def check_kra_clones(self):
logger.info('KRA at %s is %s', url, status)

if status != 'running':
raise Exception('KRA at %s is %s' % (url, status))
raise BaseException('KRA at %s is %s' % (url, status))

except Exception as e:
except BaseException as e:
logger.error('Unable to reach KRA at %s: %s', url, e)
raise Exception('Unable to reach KRA at %s: %s' % (url, e))
host_error.append(BaseException('Unable to reach KRA at %s: %s' % (url, e)))
return host_error

def check_ocsp_clones(self):
host_error = []
for host in self.clone_ocsps:

url = 'https://' + host.Hostname + ':' + host.SecurePort
Expand All @@ -78,13 +83,15 @@ def check_ocsp_clones(self):
logger.info('OCSP at %s is %s', url, status)

if status != 'running':
raise Exception('OCSP at %s is %s' % (url, status))
raise BaseException('OCSP at %s is %s' % (url, status))

except Exception as e:
except BaseException as e:
logger.error('Unable to reach OCSP at %s: %s', url, e)
raise Exception('Unable to reach OCSP at %s: %s' % (url, e))
host_error.append(BaseException('Unable to reach OCSP at %s: %s' % (url, e)))
return host_error

def check_tks_clones(self):
host_error = []
for host in self.clone_tkss:

url = 'https://' + host.Hostname + ':' + host.SecurePort
Expand All @@ -98,13 +105,15 @@ def check_tks_clones(self):
logger.info('TKS at %s is %s', url, status)

if status != 'running':
raise Exception('TKS at %s is %s' % (url, status))
raise BaseException('TKS at %s is %s' % (url, status))

except Exception as e:
except BaseException as e:
logger.error('Unable to reach TKS at %s: %s', url, e)
raise Exception('Unable to reach TKS at %s: %s' % (url, e))
host_error.append(BaseException('Unable to reach TKS at %s: %s' % (url, e)))
return host_error

def check_tps_clones(self):
host_error = []
for host in self.clone_tpss:

url = 'https://' + host.Hostname + ':' + host.SecurePort
Expand All @@ -118,11 +127,12 @@ def check_tps_clones(self):
logger.info('TPS at %s is %s', url, status)

if status != 'running':
raise Exception('TPS at %s is %s' % (url, status))
raise BaseException('TPS at %s is %s' % (url, status))

except Exception as e:
except BaseException as e:
logger.error('Unable to reach TPS at %s: %s', url, e)
raise Exception('Unable to reach TPS at %s: %s' % (url, e))
host_error.append(BaseException('Unable to reach TPS at %s: %s' % (url, e)))
return host_error

@duration
def check(self):
Expand All @@ -147,51 +157,55 @@ def check(self):
logger.info('About to check the subsystem clones')

hard_msg = ' Clones tested successfully, or not present.'
try:
self.check_ca_clones()
host_error = self.check_ca_clones()
if not host_error:
yield Result(self, constants.SUCCESS,
instance_name=self.instance.name,
status='CA' + hard_msg)
else:
for err in host_error:
yield Result(self, constants.ERROR,
status='ERROR: %s' % self.instance.name + ' : ' + str(err))

except BaseException as e:
yield Result(self, constants.ERROR,
status='ERROR: %s' % self.instance.name + ' : ' + str(e))

try:
self.check_kra_clones()
host_error = self.check_kra_clones()
if not host_error:
yield Result(self, constants.SUCCESS,
instance_name=self.instance.name,
status='KRA' + hard_msg)
except BaseException as e:
yield Result(self, constants.ERROR,
status='ERROR: %s' % self.instance.name + ' : ' + str(e))
else:
for err in host_error:
yield Result(self, constants.ERROR,
status='ERROR: %s' % self.instance.name + ' : ' + str(err))

try:
self.check_ocsp_clones()
host_error = self.check_ocsp_clones()
if not host_error:
yield Result(self, constants.SUCCESS,
instance_name=self.instance.name,
status='OCSP' + hard_msg)
except BaseException as e:
yield Result(self, constants.ERROR,
status='ERROR: %s' % self.instance.name + ' : ' + str(e))
else:
for err in host_error:
yield Result(self, constants.ERROR,
status='ERROR: %s' % self.instance.name + ' : ' + str(err))

try:
self.check_tks_clones()
host_error = self.check_tks_clones()
if not host_error:
yield Result(self, constants.SUCCESS,
instance_name=self.instance.name,
status='TKS' + hard_msg)
except BaseException as e:
yield Result(self, constants.ERROR,
status='ERROR: %s' % self.instance.name + ' : ' + str(e))
else:
for err in host_error:
yield Result(self, constants.ERROR,
status='ERROR: %s' % self.instance.name + ' : ' + str(err))

try:
self.check_tps_clones()
host_error = self.check_tps_clones()
if not host_error:
yield Result(self, constants.SUCCESS,
instance_name=self.instance.name,
status="TPS Clones tested successfully, or not present.")
except BaseException as e:
yield Result(self, constants.ERROR,
status='ERROR: %s' % self.instance.name + ' : ' + str(e))
else:
for err in host_error:
yield Result(self, constants.ERROR,
status='ERROR: %s' % self.instance.name + ' : ' + str(err))
else:
yield Result(self, constants.SUCCESS,
instance_name=self.instance.name,
Expand Down

0 comments on commit db3b7f4

Please sign in to comment.