IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove the option stop_certmonger from stop_tracking_*

Browse Source 
This option was inconsistent between invocations and there is
no need to stop certmonger after stopping tracking. It was also
apparently causing dbus timeout errors, probably due to the amount
of work that certmonger does at startup.

https://pagure.io/freeipa/issue/8506
https://pagure.io/freeipa/issue/8533

Signed-off-by: Rob Crittenden <rcritten@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Rob Crittenden 2021-02-10 15:49:12 -05:00 committed by Alexander Bokovoy
parent 137b39cf93
commit 71047f68b5
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipaserver/install/ca.py
View File

@ -425,7 +425,7 @@ def install_step_1(standalone, replica_config, options, custodia):
def uninstall(): def uninstall():
ca_instance = cainstance.CAInstance(api.env.realm) ca_instance = cainstance.CAInstance(api.env.realm)
ca_instance.stop_tracking_certificates(stop_certmonger=False) ca_instance.stop_tracking_certificates()
ipautil.remove_file(paths.RA_AGENT_PEM) ipautil.remove_file(paths.RA_AGENT_PEM)
ipautil.remove_file(paths.RA_AGENT_KEY) ipautil.remove_file(paths.RA_AGENT_KEY)
if ca_instance.is_configured(): if ca_instance.is_configured():

7
ipaserver/install/cainstance.py
View File

@ -1075,13 +1075,13 @@ class CAInstance(DogtagInstance):
logger.error( logger.error(
"certmonger failed to start tracking certificate: %s", e) "certmonger failed to start tracking certificate: %s", e)
def stop_tracking_certificates(self, stop_certmonger=True): def stop_tracking_certificates(self):
""" """
Stop tracking our certificates. Called on uninstall. Also called Stop tracking our certificates. Called on uninstall. Also called
during upgrade to fix discrepancies. during upgrade to fix discrepancies.
""" """
super(CAInstance, self).stop_tracking_certificates(False) super(CAInstance, self).stop_tracking_certificates()
# stop tracking lightweight CA signing certs # stop tracking lightweight CA signing certs
for request_id in certmonger.get_requests_for_dir(self.nss_db): for request_id in certmonger.get_requests_for_dir(self.nss_db):
@ -1095,9 +1095,6 @@ class CAInstance(DogtagInstance):
logger.error( logger.error(
"certmonger failed to stop tracking certificate: %s", e) "certmonger failed to stop tracking certificate: %s", e)
if stop_certmonger:
services.knownservices.certmonger.stop()
def is_renewal_master(self, fqdn=None): def is_renewal_master(self, fqdn=None):
if fqdn is None: if fqdn is None:
fqdn = api.env.host fqdn = api.env.host

5
ipaserver/install/dogtaginstance.py
View File

@ -453,7 +453,7 @@ class DogtagInstance(service.Service):
logger.error( logger.error(
"certmonger failed to start tracking certificate: %s", e) "certmonger failed to start tracking certificate: %s", e)
def stop_tracking_certificates(self, stop_certmonger=True): def stop_tracking_certificates(self):
""" """
Stop tracking our certificates. Called on uninstall. Also called Stop tracking our certificates. Called on uninstall. Also called
during upgrade to fix discrepancies. during upgrade to fix discrepancies.
@ -477,9 +477,6 @@ class DogtagInstance(service.Service):
logger.error( logger.error(
"certmonger failed to stop tracking certificate: %s", e) "certmonger failed to stop tracking certificate: %s", e)
if stop_certmonger:
cmonger.stop()
def update_cert_cs_cfg(self, directive, cert): def update_cert_cs_cfg(self, directive, cert):
""" """
When renewing a Dogtag subsystem certificate the configuration file When renewing a Dogtag subsystem certificate the configuration file

6
ipaserver/install/server/upgrade.py
View File

@ -648,9 +648,9 @@ def certificate_renewal_update(ca, kra, ds, http):
# Ok, now we need to stop tracking, then we can start tracking them # Ok, now we need to stop tracking, then we can start tracking them
# again with new configuration: # again with new configuration:
ca.stop_tracking_certificates(stop_certmonger=False) ca.stop_tracking_certificates()
if kra.is_installed(): if kra.is_installed():
kra.stop_tracking_certificates(stop_certmonger=False) kra.stop_tracking_certificates()
ds.stop_tracking_certificates(serverid) ds.stop_tracking_certificates(serverid)
http.stop_tracking_certificates() http.stop_tracking_certificates()
@ -920,7 +920,7 @@ def uninstall_dogtag_9(ds, http):
ca = dogtaginstance.DogtagInstance( ca = dogtaginstance.DogtagInstance(
api.env.realm, "CA", "certificate server", api.env.realm, "CA", "certificate server",
nss_db=paths.VAR_LIB_PKI_CA_ALIAS_DIR) nss_db=paths.VAR_LIB_PKI_CA_ALIAS_DIR)
ca.stop_tracking_certificates(False) ca.stop_tracking_certificates()
if serverid is not None: if serverid is not None:
# drop the trailing / off the config_dirname so the directory # drop the trailing / off the config_dirname so the directory