From 469f8ba59eb369267a9d404291ce7794f996d9f4 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 16 Oct 2017 13:46:38 +0300 Subject: [PATCH] ipa-replica-manage: implicitly ignore initial time skew in force-sync When performing force synchronization, implicitly ignore initial time skew (if any) and restore it afterwards. This also changes semantics of force-sync by waiting until the end of the initial replication. Fixes https://pagure.io/freeipa/issue/7211 Reviewed-By: Rob Crittenden --- install/tools/ipa-replica-manage | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage index f802201b7f93facb1e78463aa02eab66a1ae23ea..c00d8ca3a0fa8228c5aa782a270991f14ee16974 100755 --- a/install/tools/ipa-replica-manage +++ b/install/tools/ipa-replica-manage @@ -1231,8 +1231,14 @@ def force_sync(realm, thishost, fromhost, dirman_passwd, nolookup=False): repl = replication.ReplicationManager(realm, thishost, dirman_passwd) repl.force_sync(repl.conn, fromhost) else: + ds = dsinstance.DsInstance(realm_name=realm) + ds.ldapi = os.getegid() == 0 + ds.replica_manage_time_skew(prevent=False) repl = replication.ReplicationManager(realm, fromhost, dirman_passwd) repl.force_sync(repl.conn, thishost) + agreement = repl.get_replication_agreement(thishost) + repl.wait_for_repl_init(repl.conn, agreement.dn) + ds.replica_manage_time_skew(prevent=True) def show_DNA_ranges(hostname, master, realm, dirman_passwd, nextrange=False, nolookup=False): -- 2.9.5