On 02.06.2016 09:41, Martin Basti wrote:


On 31.05.2016 14:10, Martin Basti wrote:


On 31.05.2016 14:08, Martin Babinsky wrote:
On 05/31/2016 01:57 PM, Martin Basti wrote:


On 31.05.2016 12:44, Martin Babinsky wrote:
On 05/28/2016 01:17 PM, Martin Basti wrote:
https://fedorahosted.org/freeipa/ticket/4995

Patches attached




Hi,

PATCH 0488: LGTM

PATCH 0489:

@@ -996,10 +997,10 @@ def check_deleted_segments(hostname, masters,
topo_errors, starting_host):
         i = 0
         while True:
             left = api.Command.topologysegment_find(
-                suffix_name, iparepltoposegmentleftnode=hostname,
sizelimit=0
+                suffix_name, iparepltoposegmentleftnode=hostname,
sizelimit=0,
             )['result']
             right = api.Command.topologysegment_find(
-                suffix_name, iparepltoposegmentrightnode=hostname,
sizelimit=0
+                suffix_name, iparepltoposegmentrightnode=hostname,
sizelimit=0,
             )['result']

it seems that you added 'no_members=True' there and then removed it
because reasons. Please revert the this part to the original code so
that it does not stick out.


Better (the right one) patches attached.

ACK

master:
* 91572afc60f590f0d81ad18234189a0b48144bf5 Make option --no-members public in CLI * 5f42b42bd4557a669ab5cfcf1af6596f1a2535f1 Performance: Find commands: do not process members by default


We found and issue, I used flag 'no_cli' instead of 'no_option'

fixed and pushed under oneliner rule

master:
* 5c58751d72de27eae2181f2c0e620df03f8dbc82 Fix: replace incorrect no_cli with no_option flag




I found another one-liner issue, there was extra no_members=False in topologysuffix_find in replication.py, which caused error in ipa-replica-manage

Pushed to master: f077fab23fe9dc8a71562d1ba3c0d603d2957d3b

From 84208709bc294e88c493c948b5f606eb575e94de Mon Sep 17 00:00:00 2001
From: Martin Basti <mba...@redhat.com>
Date: Thu, 2 Jun 2016 13:15:33 +0200
Subject: [PATCH] Fix: topologysuffix_find doesn't have no_members option

Remove no_members=False from because topologysuffix_attribute doesn't
have no_members option, and this causes errors in replication.py

https://fedorahosted.org/freeipa/ticket/4995
---
 ipaserver/install/replication.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py
index c58cce228128613223840599e00b9f6c14f0835f..53b3d5cf64ca48535f703e73a13a40c709a1b2d4 100644
--- a/ipaserver/install/replication.py
+++ b/ipaserver/install/replication.py
@@ -1782,7 +1782,7 @@ def get_orphaned_suffixes(masters):
     master
     """
     all_suffixes = api.Command.topologysuffix_find(
-        sizelimit=0, no_members=False)['result']
+        sizelimit=0)['result']
     all_suffix_names = set(s['cn'][0] for s in all_suffixes)
     managed_suffixes = set(map_masters_to_suffixes(masters))
 
-- 
2.5.5

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to