ocfs2: prints peer node number when sending tcp msg failed -v2
PATCH 1/1 ocfs2: prints peer node number when sending tcp msg failed -v2
This patch adds prints of the number of peer node to which sending tcp message failed. It helps debugging.
Signed-off-by Wengang Wang <[email protected]>
--- fs/ocfs2/dlm/dlmast.c | 4 +++- fs/ocfs2/dlm/dlmconvert.c | 4 +++- fs/ocfs2/dlm/dlmdomain.c | 17 +++++++++++------ fs/ocfs2/dlm/dlmlock.c | 4 +++- fs/ocfs2/dlm/dlmmaster.c | 14 +++++++++++--- fs/ocfs2/dlm/dlmrecovery.c | 41 ++++++++++++++++++++++++----------------- fs/ocfs2/dlm/dlmunlock.c | 3 ++- 7 files changed, 57 insertions(+), 30 deletions(-)
fs/ocfs2/dlm/dlmast.c +3 -1
@@ -453,7 +453,9 @@ int dlm_send_proxy_ast_msg(struct dlm_ctxt *dlm, struct dlm_lock_resource *res, ret =o2net_send_message_vec (DLM_PROXY_AST_MSG , dlm->key, vec, veclen, lock->ml.node, &status);if (ret <0 ) -mlog_errno (ret); +mlog (ML_ERROR ,"Error %d when sending message %u (key 0x%x) to " +"node %u\n" , ret,DLM_PROXY_AST_MSG , dlm->key, + lock->ml.node);else {if (status ==DLM_RECOVERING ) { mlog(ML_ERROR, "sent AST to node %u, it thinks this "
fs/ocfs2/dlm/dlmconvert.c +3 -1
@@ -391,7 +391,9 @@ static enum dlm_status dlm_send_remote_convert_request(struct dlm_ctxt *dlm, }else if (ret !=DLM_NORMAL && ret !=DLM_NOTQUEUED )dlm_error (ret); }else { -mlog_errno (tmpret); +mlog (ML_ERROR ,"Error %d when sending message %u (key 0x%x) to " +"node %u\n" , tmpret,DLM_CONVERT_LOCK_MSG , dlm->key, + res->owner);if (dlm_is_host_down (tmpret)) {/* instead of logging the same network error over * and over, sleep here and wait for the heartbeat
fs/ocfs2/dlm/dlmdomain.c +11 -6
@@ -565,7 +565,9 @@ static int dlm_send_one_domain_exit(struct dlm_ctxt *dlm, status =o2net_send_message (DLM_EXIT_DOMAIN_MSG , dlm->key, &leave_msg,sizeof (leave_msg), node,NULL ); - +if (status <0 ) +mlog (ML_ERROR ,"Error %d when sending message %u (key 0x%x) to " +"node %u\n" , status,DLM_EXIT_DOMAIN_MSG , dlm->key, node);mlog (0 ,"status return %d from o2net_send_message\n" , status);return status;
@@ -962,7 +964,8 @@ static int dlm_send_one_join_cancel(struct dlm_ctxt *dlm, &cancel_msg,sizeof (cancel_msg), node, NULL);if (status <0 ) { -mlog_errno (status); +mlog (ML_ERROR ,"Error %d when sending message %u (key 0x%x) to " +"node %u\n" , status,DLM_CANCEL_JOIN_MSG ,DLM_MOD_KEY , node); goto bail; }
@@ -1029,10 +1032,10 @@ static int dlm_request_join(struct dlm_ctxt *dlm,byte_copymap (join_msg.node_map, dlm->live_nodes_map,O2NM_MAX_NODES ); status =o2net_send_message (DLM_QUERY_JOIN_MSG ,DLM_MOD_KEY , &join_msg, -sizeof (join_msg), node, - &join_resp); +sizeof (join_msg), node, &join_resp);if (status <0 && status != -ENOPROTOOPT ) { -mlog_errno (status); +mlog (ML_ERROR ,"Error %d when sending message %u (key 0x%x) to " +"node %u\n" , status,DLM_QUERY_JOIN_MSG ,DLM_MOD_KEY , node); goto bail; }dlm_query_join_wire_to_packet (join_resp, &packet);
@@ -1103,7 +1106,9 @@ static int dlm_send_one_join_assert(struct dlm_ctxt *dlm, &assert_msg,sizeof (assert_msg), node, NULL);if (status <0 ) -mlog_errno (status); +mlog (ML_ERROR ,"Error %d when sending message %u (key 0x%x) to " +"node %u\n" , status,DLM_ASSERT_JOINED_MSG ,DLM_MOD_KEY , + node);return status; }
fs/ocfs2/dlm/dlmlock.c +3 -1
@@ -329,7 +329,9 @@ static enum dlm_status dlm_send_remote_lock_request(struct dlm_ctxt *dlm,BUG (); } }else { -mlog_errno (tmpret); +mlog (ML_ERROR ,"Error %d when sending message %u (key 0x%x) to " +"node %u\n" , tmpret,DLM_CREATE_LOCK_MSG , dlm->key, + res->owner);if (dlm_is_host_down (tmpret)) { ret =DLM_RECOVERING ; mlog(0, "node %u died so returning DLM_RECOVERING "
fs/ocfs2/dlm/dlmmaster.c +11 -3
@@ -1309,6 +1309,8 @@ again: ret =o2net_send_message (DLM_MASTER_REQUEST_MSG , dlm->key, &request,sizeof (request), to, &response);if (ret <0 ) { +mlog (ML_ERROR ,"Error %d when sending message %u (key 0x%x) to " +"node %u\n" , ret,DLM_MASTER_REQUEST_MSG , dlm->key, to);if (ret == -ESRCH ) {/* should never happen */ mlog (ML_ERROR ,"TCP stack not ready!\n" );
@@ -1666,7 +1668,9 @@ again: tmpret =o2net_send_message (DLM_ASSERT_MASTER_MSG , dlm->key, &assert,sizeof (assert), to, &r);if (tmpret <0 ) { -mlog (0 ,"assert_master returned %d!\n" , tmpret); +mlog (ML_ERROR ,"Error %d when sending message %u (key " +"0x%x) to node %u\n" , tmpret,DLM_ASSERT_MASTER_MSG , + dlm->key, to);if (!dlm_is_host_down (tmpret)) {mlog (ML_ERROR ,"unhandled error=%d!\n" , tmpret);BUG ();
@@ -2207,7 +2211,9 @@ int dlm_drop_lockres_ref(struct dlm_ctxt *dlm, struct dlm_lock_resource *res) ret =o2net_send_message (DLM_DEREF_LOCKRES_MSG , dlm->key, &deref,sizeof (deref), res->owner, &r);if (ret <0 ) -mlog_errno (ret); +mlog (ML_ERROR ,"Error %d when sending message %u (key 0x%x) to " +"node %u\n" , ret,DLM_DEREF_LOCKRES_MSG , dlm->key, + res->owner);else if (r <0 ) {/* BAD. other node says I did not have a ref. */ mlog(ML_ERROR,"while dropping ref on %s:%.*s "
@@ -2977,7 +2983,9 @@ static int dlm_do_migrate_request(struct dlm_ctxt *dlm, &migrate,sizeof (migrate), nodenum, &status);if (ret <0 ) { -mlog (0 ,"migrate_request returned %d!\n" , ret); +mlog (ML_ERROR ,"Error %d when sending message %u (key " +"0x%x) to node %u\n" , ret,DLM_MIGRATE_REQUEST_MSG , + dlm->key, nodenum);if (!dlm_is_host_down (ret)) {mlog (ML_ERROR ,"unhandled error=%d!\n" , ret);BUG ();
fs/ocfs2/dlm/dlmrecovery.c +24 -17
85 lines not on this page · raw message
fs/ocfs2/dlm/dlmunlock.c +2 -1
@@ -355,7 +355,8 @@ static enum dlm_status dlm_send_remote_unlock_request(struct dlm_ctxt *dlm,mlog (0 ,"master was in-progress. retry\n" ); ret = status; }else { -mlog_errno (tmpret); +mlog (ML_ERROR ,"Error %d when sending message %u (key 0x%x) to " +"node %u\n" , tmpret,DLM_UNLOCK_LOCK_MSG , dlm->key, owner);if (dlm_is_host_down (tmpret)) {/* NOTE: this seems strange, but it is what we want. * when the master goes down during a cancel or
Signature · 1 line
1.6.6.1
PATCH 1/1 ocfs2: prints peer node number when sending tcp msg failed -v2
Comments inline.
fs/ocfs2/dlm/dlmmaster.c again: · line 1316
Quoted 13 lines · Wengang Wang
fs/ocfs2/dlm/dlmmaster.c +2
-0@@ -1309,6 +1309,8 @@ again: ret =o2net_send_message (DLM_MASTER_REQUEST_MSG , dlm->key, &request,sizeof (request), to, &response);if (ret <0 ) { +mlog (ML_ERROR ,"Error %d when sending message %u (key 0x%x) to " +"node %u\n" , ret,DLM_MASTER_REQUEST_MSG , dlm->key, to);if (ret == -ESRCH ) {/* should never happen */ mlog (ML_ERROR ,"TCP stack not ready!\n" );
Remove this one. The error messages below handle this.
Quoted 10 lines
fs/ocfs2/dlm/dlmmaster.c +0
-6@@ -2637,14 +2643,16 @@ retry:/* negative status is handled ok by caller here */ if (ret >=0 ) ret = status; -if (dlm_is_host_down (ret)) { -/* node is down. not involved in recovery -* so just keep going */ -mlog (0 ,"%s: node %u was down when sending " -"begin reco msg (%d)\n" , dlm->name, nodenum, ret); - ret =0 ;
fs/ocfs2/dlm/dlmmaster.c retry: · line 2655
Quoted 10 lines
fs/ocfs2/dlm/dlmmaster.c +9
-0+else { +mlog (ML_ERROR ,"Error %d when sending message %u (key " +"0x%x) to node %u\n" , ret,DLM_BEGIN_RECO_MSG , + dlm->key, nodenum); +if (dlm_is_host_down (ret)) { +/* node is down. not involved in recovery +* so just keep going */ + ret =0 ; + } }
You are changing the logic here. Please remove this code. Maybe change 0 to ML_NOTICE in the original code.
fs/ocfs2/dlm/dlmmaster.c retry: · line 2667
Quoted 11 lines
fs/ocfs2/dlm/dlmmaster.c +0
-4-/* * Prior to commit aad1b15310b9bcd59fa81ab8f2b1513b59553ea8, * dlm_begin_reco_handler() returned EAGAIN and not -EAGAIN. @@ -2662,9 +2670,6 @@ retry:struct dlm_lock_resource *res;/* this is now a serious problem, possibly ENOMEM * in the network stack. must retry */ -mlog_errno (ret); -mlog (ML_ERROR ,"begin reco of dlm %s to node %u " -" returned %d\n" , dlm->name, nodenum, ret);
Again, leave the original code in.