|
 |
7bbb43 |
From 7076fd22e744fd51dbcc0c4e4a4089884a3dae48 Mon Sep 17 00:00:00 2001
|
|
|
7bbb43 |
From: Christian Heimes <cheimes@redhat.com>
|
|
|
7bbb43 |
Date: Wed, 11 Apr 2018 13:34:41 +0200
|
|
|
7bbb43 |
Subject: [PATCH] Add nsds5ReplicaReleaseTimeout to replica config
|
|
|
7bbb43 |
|
|
|
7bbb43 |
The nsds5ReplicaReleaseTimeout setting prevents the monopolization of
|
|
|
7bbb43 |
replicas during initial or busy master-master replication. 389-DS
|
|
|
7bbb43 |
documentation suggets a timeout of 60 seconds to improve convergence of
|
|
|
7bbb43 |
replicas.
|
|
|
7bbb43 |
|
|
|
7bbb43 |
See: http://directory.fedoraproject.org/docs/389ds/design/repl-conv-design.html
|
|
|
7bbb43 |
Fixes: https://pagure.io/freeipa/issue/7488
|
|
|
7bbb43 |
Signed-off-by: Christian Heimes <cheimes@redhat.com>
|
|
|
7bbb43 |
Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
|
|
|
7bbb43 |
Reviewed-By: Fraser Tweedale <ftweedal@redhat.com>
|
|
|
7bbb43 |
Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
|
|
|
7bbb43 |
---
|
|
|
7bbb43 |
ipaserver/install/replication.py | 21 ++++++++++++++++-----
|
|
|
7bbb43 |
ipaserver/install/server/upgrade.py | 17 +++++++++++++++++
|
|
|
7bbb43 |
2 files changed, 33 insertions(+), 5 deletions(-)
|
|
|
7bbb43 |
|
|
|
7bbb43 |
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py
|
|
|
7bbb43 |
index 3cd871e5df44398fd994504a3807a5648af5e048..e0055b792ce5b51fd411a7ea1f4316bb017984ba 100644
|
|
|
7bbb43 |
--- a/ipaserver/install/replication.py
|
|
|
7bbb43 |
+++ b/ipaserver/install/replication.py
|
|
|
7bbb43 |
@@ -468,20 +468,30 @@ class ReplicationManager(object):
|
|
|
7bbb43 |
|
|
|
7bbb43 |
try:
|
|
|
7bbb43 |
entry = conn.get_entry(dn)
|
|
|
7bbb43 |
+ except errors.NotFound:
|
|
|
7bbb43 |
+ pass
|
|
|
7bbb43 |
+ else:
|
|
|
7bbb43 |
managers = {DN(m) for m in entry.get('nsDS5ReplicaBindDN', [])}
|
|
|
7bbb43 |
|
|
|
7bbb43 |
+ mods = []
|
|
|
7bbb43 |
if replica_binddn not in managers:
|
|
|
7bbb43 |
# Add the new replication manager
|
|
|
7bbb43 |
- mod = [(ldap.MOD_ADD, 'nsDS5ReplicaBindDN',
|
|
|
7bbb43 |
- replica_binddn)]
|
|
|
7bbb43 |
- conn.modify_s(dn, mod)
|
|
|
7bbb43 |
+ mods.append(
|
|
|
7bbb43 |
+ (ldap.MOD_ADD, 'nsDS5ReplicaBindDN', replica_binddn)
|
|
|
7bbb43 |
+ )
|
|
|
7bbb43 |
+ if 'nsds5replicareleasetimeout' not in entry:
|
|
|
7bbb43 |
+ # See https://pagure.io/freeipa/issue/7488
|
|
|
7bbb43 |
+ mods.append(
|
|
|
7bbb43 |
+ (ldap.MOD_ADD, 'nsds5replicareleasetimeout', ['60'])
|
|
|
7bbb43 |
+ )
|
|
|
7bbb43 |
+
|
|
|
7bbb43 |
+ if mods:
|
|
|
7bbb43 |
+ conn.modify_s(dn, mods)
|
|
|
7bbb43 |
|
|
|
7bbb43 |
self.set_replica_binddngroup(conn, entry)
|
|
|
7bbb43 |
|
|
|
7bbb43 |
# replication is already configured
|
|
|
7bbb43 |
return
|
|
|
7bbb43 |
- except errors.NotFound:
|
|
|
7bbb43 |
- pass
|
|
|
7bbb43 |
|
|
|
7bbb43 |
replica_type = self.get_replica_type()
|
|
|
7bbb43 |
|
|
|
7bbb43 |
@@ -496,6 +506,7 @@ class ReplicationManager(object):
|
|
|
7bbb43 |
nsds5replicabinddn=[replica_binddn],
|
|
|
7bbb43 |
nsds5replicabinddngroup=[self.repl_man_group_dn],
|
|
|
7bbb43 |
nsds5replicabinddngroupcheckinterval=["60"],
|
|
|
7bbb43 |
+ nsds5replicareleasetimeout=["60"],
|
|
|
7bbb43 |
nsds5replicalegacyconsumer=["off"],
|
|
|
7bbb43 |
)
|
|
|
7bbb43 |
conn.add_entry(entry)
|
|
|
7bbb43 |
diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py
|
|
|
7bbb43 |
index 62665d56ca0fb2c632f8ba135f8b6191a18b6aa1..62a75510ad331923f468c28908ea407789ec380c 100644
|
|
|
7bbb43 |
--- a/ipaserver/install/server/upgrade.py
|
|
|
7bbb43 |
+++ b/ipaserver/install/server/upgrade.py
|
|
|
7bbb43 |
@@ -1565,6 +1565,19 @@ def disable_httpd_system_trust(http):
|
|
|
7bbb43 |
db.add_cert(cert, nickname, trust_flags)
|
|
|
7bbb43 |
|
|
|
7bbb43 |
|
|
|
7bbb43 |
+def update_replica_config(db_suffix):
|
|
|
7bbb43 |
+ dn = DN(
|
|
|
7bbb43 |
+ ('cn', 'replica'), ('cn', db_suffix), ('cn', 'mapping tree'),
|
|
|
7bbb43 |
+ ('cn', 'config')
|
|
|
7bbb43 |
+ )
|
|
|
7bbb43 |
+ entry = api.Backend.ldap2.get_entry(dn)
|
|
|
7bbb43 |
+ if 'nsds5replicareleasetimeout' not in entry:
|
|
|
7bbb43 |
+ # See https://pagure.io/freeipa/issue/7488
|
|
|
7bbb43 |
+ root_logger.info("Adding nsds5replicaReleaseTimeout=60 to %s", dn)
|
|
|
7bbb43 |
+ entry['nsds5replicareleasetimeout'] = '60'
|
|
|
7bbb43 |
+ api.Backend.ldap2.update_entry(entry)
|
|
|
7bbb43 |
+
|
|
|
7bbb43 |
+
|
|
|
7bbb43 |
def upgrade_configuration():
|
|
|
7bbb43 |
"""
|
|
|
7bbb43 |
Execute configuration upgrade of the IPA services
|
|
|
7bbb43 |
@@ -1681,6 +1694,10 @@ def upgrade_configuration():
|
|
|
7bbb43 |
|
|
|
7bbb43 |
ds.configure_dirsrv_ccache()
|
|
|
7bbb43 |
|
|
|
7bbb43 |
+ update_replica_config(ipautil.realm_to_suffix(api.env.realm))
|
|
|
7bbb43 |
+ if ca.is_configured():
|
|
|
7bbb43 |
+ update_replica_config(DN(('o', 'ipaca')))
|
|
|
7bbb43 |
+
|
|
|
7bbb43 |
ntpinstance.ntp_ldap_enable(api.env.host, api.env.basedn, api.env.realm)
|
|
|
7bbb43 |
|
|
|
7bbb43 |
ds.stop(ds_serverid)
|
|
|
7bbb43 |
--
|
|
|
7bbb43 |
2.14.3
|
|
|
7bbb43 |
|