summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2013-09-25 20:25:36 +0200
committerJan Pokorný <jpokorny@redhat.com>2013-09-25 20:25:36 +0200
commitd4c95ff1132fd67a9c00aaddc01ca5ba0964f7e0 (patch)
tree3c5462f96a852d811d6039714261258fdce3ac79
parent30ed1f0447557126dad0aa8ea298c9c9b7eea806 (diff)
downloadcluster-overview-d4c95ff1132fd67a9c00aaddc01ca5ba0964f7e0.zip
cluster-overview-d4c95ff1132fd67a9c00aaddc01ca5ba0964f7e0.tar.gz
cluster-overview-d4c95ff1132fd67a9c00aaddc01ca5ba0964f7e0.tar.xz
Fix bug with Exchange(modclusterd,modclusterd) edges inclusion
Reproducer of the bug: - clean all nodes - exchange edge between modclusterd instances remained unexpectedly Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
-rwxr-xr-xcluster-cman.py57
1 files changed, 28 insertions, 29 deletions
diff --git a/cluster-cman.py b/cluster-cman.py
index 695fc67..5f513e6 100755
--- a/cluster-cman.py
+++ b/cluster-cman.py
@@ -375,6 +375,34 @@ graph = lambda\
,CmanRGManager('node_a-rgmanager'
)]
)]
+ ,_edges=\
+ ["modclusterd peer-to-peer network"][:0] +\
+ [Exchange\
+ ('node_a-modclusterd'
+ ,'node_b-modclusterd'
+ ,label='port 16851\n(either direction)'
+ ,weight='1'
+ )
+ ,Exchange\
+ ('node_a-modclusterd'
+ ,'node_c-modclusterd'
+ ,label='port 16851\n(either direction)'
+ ,weight='1'
+ )
+ ,Exchange\
+ ('node_b-modclusterd'
+ ,'node_c-modclusterd'
+ ,label='port 16851\n(either direction)'
+ ,weight='1'
+ )
+ ,EdgeInvisible\
+ ('node_a-modclusterd'
+ ,'node_b-modclusterd'
+ )
+ ,EdgeInvisible\
+ ('node_b-modclusterd'
+ ,'node_c-modclusterd'
+ )]
)
,SubgraphStandard('cluster.services'
#
@@ -458,35 +486,6 @@ graph = lambda\
,label='Ethernet (ifmib)/\nFibre Channel\n(brocade,…)/…'
)]
)]
- #
- ,_edges=\
- ["modclusterd peer-to-peer network"][:0] +\
- [Exchange\
- ('node_a-modclusterd'
- ,'node_b-modclusterd'
- ,label='port 16851\n(either direction)'
- ,weight='1'
- )
- ,Exchange\
- ('node_a-modclusterd'
- ,'node_c-modclusterd'
- ,label='port 16851\n(either direction)'
- ,weight='1'
- )
- ,Exchange\
- ('node_b-modclusterd'
- ,'node_c-modclusterd'
- ,label='port 16851\n(either direction)'
- ,weight='1'
- )
- ,EdgeInvisible\
- ('node_a-modclusterd'
- ,'node_b-modclusterd'
- )
- ,EdgeInvisible\
- ('node_b-modclusterd'
- ,'node_c-modclusterd'
- )]
)]
,_edges=\
[