sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

kcc: add labels to dot files

Browse Source 
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>
This commit is contained in:
Douglas Bagnall 2015-03-05 11:50:24 +13:00 committed by Andrew Bartlett
parent 1fc7e5ba60
commit 9dff16bd9c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/samba/kcc_utils.py
View File

@ -2366,7 +2366,7 @@ def write_dot_file(basename, edge_list, label=None, destdir=None):
f = NamedTemporaryFile(suffix='.dot', prefix=basename + '_', delete=False, dir=destdir) f = NamedTemporaryFile(suffix='.dot', prefix=basename + '_', delete=False, dir=destdir)
graphname = ''.join(x for x in basename if x.isalnum()) graphname = ''.join(x for x in basename if x.isalnum())
print >>f, 'graph %s {' % graphname print >>f, 'graph %s {' % graphname
print >>f, 'label="%s",' % (label or graphname) print >>f, 'label="%s";\nfontsize=20' % (label or graphname)
for a, b in edge_list: for a, b in edge_list:
print >>f, '"%s" -- "%s"' % (a, b) print >>f, '"%s" -- "%s"' % (a, b)
print >>f, '}' print >>f, '}'

5
source4/scripting/bin/samba_kcc
View File

@ -1688,7 +1688,7 @@ class KCC(object):
process_edge_set(graph, None, internal_edges) process_edge_set(graph, None, internal_edges)
write_dot_file('prekruskal', [(e.v1.site.site_dnstr, e.v2.site.site_dnstr) write_dot_file('prekruskal', [(e.v1.site.site_dnstr, e.v2.site.site_dnstr)
for e in internal_edges]) for e in internal_edges], label=label)
# Phase 2: Run Kruskal's on the internal edges # Phase 2: Run Kruskal's on the internal edges
output_edges, components = kruskal(graph, internal_edges) output_edges, components = kruskal(graph, internal_edges)
@ -1703,7 +1703,8 @@ class KCC(object):
else: else:
v.dist_to_red = v.repl_info.cost v.dist_to_red = v.repl_info.cost
write_dot_file('postkruskal', ((e.v1.site.site_dnstr, e.v2.site.site_dnstr) for e in internal_edges)) write_dot_file('postkruskal', ((e.v1.site.site_dnstr, e.v2.site.site_dnstr) for e in internal_edges),
label=label)
# count the components # count the components
return self.copy_output_edges(graph, output_edges), components return self.copy_output_edges(graph, output_edges), components