diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2015-04-23 11:46:09 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2015-05-28 07:25:10 +0200 |
| commit | 77b47e1ce4068dc18470cd3fa8104c20622b4e82 (patch) | |
| tree | b9ce462a16b450f95c01368a8c5bdb4305fe10d4 | |
| parent | 03f45bf75f1ef33997c66f394e5063f8ddf15df5 (diff) | |
| download | samba-77b47e1ce4068dc18470cd3fa8104c20622b4e82.tar.gz samba-77b47e1ce4068dc18470cd3fa8104c20622b4e82.tar.bz2 samba-77b47e1ce4068dc18470cd3fa8104c20622b4e82.zip | |
KCC: Write out more DOT files and debug
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rwxr-xr-x | source4/scripting/bin/samba_kcc | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/source4/scripting/bin/samba_kcc b/source4/scripting/bin/samba_kcc index a83e1a1c7ca..063c00cc9c7 100755 --- a/source4/scripting/bin/samba_kcc +++ b/source4/scripting/bin/samba_kcc @@ -2078,6 +2078,7 @@ class KCC(object): r_list.append(l_of_x) r_list.sort(sort_replica_by_dsa_guid) + DEBUG_GREEN([x.rep_dsa_dnstr for x in r_list]) r_len = len(r_list) @@ -2113,6 +2114,12 @@ class KCC(object): if not r_list[0].is_partial() or r_list[r_len-1].is_partial(): graph_list[r_len-1].add_edge_from(r_list[0].rep_dsa_dnstr) + dot_edges = [] + for v1 in graph_list: + for v2 in v1.edge_from: + dot_edges.append((v2, v1.dsa_dnstr)) + write_dot_file('intrasite_pre_ntdscon', dot_edges, directed=True, label=nc_x.nc_dnstr) + # For each existing nTDSConnection object implying an edge # from rj of R to ri such that j != i, an edge from rj to ri # is not already in the graph, and the total edges directed @@ -2120,9 +2127,11 @@ class KCC(object): i = 0 while i < r_len: dsa = self.my_site.dsa_table[graph_list[i].dsa_dnstr] + DEBUG_RED(dsa.dsa_dnstr) graph_list[i].add_edges_from_connections(dsa) i = i + 1 - + DEBUG([x.rep_dsa_dnstr for x in r_list]) + DEBUG_YELLOW([x.dsa_dnstr for x in graph_list]) i = 0 while i < r_len: tnode = graph_list[i] @@ -2170,6 +2179,13 @@ class KCC(object): i = i + 1 + dot_edges = [] + for v1 in graph_list: + for v2 in v1.edge_from: + dot_edges.append((v2, v1.dsa_dnstr)) + write_dot_file('intrasite_post_ntdscon', dot_edges, directed=True, label=nc_x.nc_dnstr) + + def intrasite(self): """The head method for generating the intra-site KCC replica connection graph and attendant nTDSConnection objects |
