diff options
author | Sunil Mushran <sunil.mushran@oracle.com> | 2011-07-24 13:33:54 -0400 |
---|---|---|
committer | Sunil Mushran <sunil.mushran@oracle.com> | 2011-07-24 13:33:54 -0400 |
commit | 6b27f62fc750d85bc6fc3718b3b38ec60edc2d74 (patch) | |
tree | 8046b9a0b55ceb282a3b1d9afd35a4c4fb8e1727 /fs/ocfs2/dlm | |
parent | 3ba169ccec1c5ad0f678e04fd29b990197fdfe79 (diff) |
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.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c index 200d9888ffee..92f2ead0fab6 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, | |||
2138 | goto leave; | 2138 | goto leave; |
2139 | } | 2139 | } |
2140 | 2140 | ||
2141 | if (!o2hb_check_local_node_heartbeating()) { | ||
2142 | mlog(ML_ERROR, "the local node has not been configured, or is " | ||
2143 | "not heartbeating\n"); | ||
2144 | ret = -EPROTO; | ||
2145 | goto leave; | ||
2146 | } | ||
2147 | |||
2148 | mlog(0, "register called for domain \"%s\"\n", domain); | 2141 | mlog(0, "register called for domain \"%s\"\n", domain); |
2149 | 2142 | ||
2150 | retry: | 2143 | retry: |