summaryrefslogtreecommitdiff
path: root/fs/ocfs2/dlm
diff options
context:
space:
mode:
authorSunil Mushran <sunil.mushran@oracle.com>2011-07-24 10:33:54 -0700
committerSunil Mushran <sunil.mushran@oracle.com>2011-07-24 10:33:54 -0700
commit6b27f62fc750d85bc6fc3718b3b38ec60edc2d74 (patch)
tree8046b9a0b55ceb282a3b1d9afd35a4c4fb8e1727 /fs/ocfs2/dlm
parent3ba169ccec1c5ad0f678e04fd29b990197fdfe79 (diff)
downloadlinux-3.10-6b27f62fc750d85bc6fc3718b3b38ec60edc2d74.tar.gz
linux-3.10-6b27f62fc750d85bc6fc3718b3b38ec60edc2d74.tar.bz2
linux-3.10-6b27f62fc750d85bc6fc3718b3b38ec60edc2d74.zip
ocfs2/cluster: Cluster up now includes network connections too
The cluster up check only checks to see if the node is heartbeating or not. If yes it continues assuming that the node is connected to all the nodes. But if that is not the case, the cluster join aborts with a stack of errors that are not easy to comprehend. This patch adds the network connect check upfront and prints the nodes that the node is not yet connected to, before aborting. Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Diffstat (limited to 'fs/ocfs2/dlm')
-rw-r--r--fs/ocfs2/dlm/dlmdomain.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index 200d9888ffe..92f2ead0fab 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -2138,13 +2138,6 @@ struct dlm_ctxt * dlm_register_domain(const char *domain,
goto leave;
}
- if (!o2hb_check_local_node_heartbeating()) {
- mlog(ML_ERROR, "the local node has not been configured, or is "
- "not heartbeating\n");
- ret = -EPROTO;
- goto leave;
- }
-
mlog(0, "register called for domain \"%s\"\n", domain);
retry: