diff options
author | Wengang Wang <wen.gang.wang@oracle.com> | 2010-03-30 00:09:22 -0400 |
---|---|---|
committer | Joel Becker <joel.becker@oracle.com> | 2010-05-05 21:18:08 -0400 |
commit | a5196ec5ef80309fd390191c548ee1f2e8a327ee (patch) | |
tree | 5856168bc2708230107940ec73a6752fabd8fd7b /fs/ocfs2/dlm/dlmmaster.c | |
parent | 83f92318fa33cc084e14e64dc903e605f75884c1 (diff) |
ocfs2: print node # when tcp fails
Print the node number of a peer node if sending it a message failed.
Signed-off-by: Wengang Wang <wen.gang.wang@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2/dlm/dlmmaster.c')
-rw-r--r-- | fs/ocfs2/dlm/dlmmaster.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c index a659606dcb95..3114de2e74c7 100644 --- a/fs/ocfs2/dlm/dlmmaster.c +++ b/fs/ocfs2/dlm/dlmmaster.c | |||
@@ -1666,7 +1666,9 @@ again: | |||
1666 | tmpret = o2net_send_message(DLM_ASSERT_MASTER_MSG, dlm->key, | 1666 | tmpret = o2net_send_message(DLM_ASSERT_MASTER_MSG, dlm->key, |
1667 | &assert, sizeof(assert), to, &r); | 1667 | &assert, sizeof(assert), to, &r); |
1668 | if (tmpret < 0) { | 1668 | if (tmpret < 0) { |
1669 | mlog(0, "assert_master returned %d!\n", tmpret); | 1669 | mlog(ML_ERROR, "Error %d when sending message %u (key " |
1670 | "0x%x) to node %u\n", tmpret, | ||
1671 | DLM_ASSERT_MASTER_MSG, dlm->key, to); | ||
1670 | if (!dlm_is_host_down(tmpret)) { | 1672 | if (!dlm_is_host_down(tmpret)) { |
1671 | mlog(ML_ERROR, "unhandled error=%d!\n", tmpret); | 1673 | mlog(ML_ERROR, "unhandled error=%d!\n", tmpret); |
1672 | BUG(); | 1674 | BUG(); |
@@ -2207,7 +2209,9 @@ int dlm_drop_lockres_ref(struct dlm_ctxt *dlm, struct dlm_lock_resource *res) | |||
2207 | ret = o2net_send_message(DLM_DEREF_LOCKRES_MSG, dlm->key, | 2209 | ret = o2net_send_message(DLM_DEREF_LOCKRES_MSG, dlm->key, |
2208 | &deref, sizeof(deref), res->owner, &r); | 2210 | &deref, sizeof(deref), res->owner, &r); |
2209 | if (ret < 0) | 2211 | if (ret < 0) |
2210 | mlog_errno(ret); | 2212 | mlog(ML_ERROR, "Error %d when sending message %u (key 0x%x) to " |
2213 | "node %u\n", ret, DLM_DEREF_LOCKRES_MSG, dlm->key, | ||
2214 | res->owner); | ||
2211 | else if (r < 0) { | 2215 | else if (r < 0) { |
2212 | /* BAD. other node says I did not have a ref. */ | 2216 | /* BAD. other node says I did not have a ref. */ |
2213 | mlog(ML_ERROR,"while dropping ref on %s:%.*s " | 2217 | mlog(ML_ERROR,"while dropping ref on %s:%.*s " |
@@ -2977,7 +2981,9 @@ static int dlm_do_migrate_request(struct dlm_ctxt *dlm, | |||
2977 | &migrate, sizeof(migrate), nodenum, | 2981 | &migrate, sizeof(migrate), nodenum, |
2978 | &status); | 2982 | &status); |
2979 | if (ret < 0) { | 2983 | if (ret < 0) { |
2980 | mlog(0, "migrate_request returned %d!\n", ret); | 2984 | mlog(ML_ERROR, "Error %d when sending message %u (key " |
2985 | "0x%x) to node %u\n", ret, DLM_MIGRATE_REQUEST_MSG, | ||
2986 | dlm->key, nodenum); | ||
2981 | if (!dlm_is_host_down(ret)) { | 2987 | if (!dlm_is_host_down(ret)) { |
2982 | mlog(ML_ERROR, "unhandled error=%d!\n", ret); | 2988 | mlog(ML_ERROR, "unhandled error=%d!\n", ret); |
2983 | BUG(); | 2989 | BUG(); |