Commit a5196ec5 authored by Wengang Wang's avatar Wengang Wang Committed by Joel Becker
Browse files

ocfs2: print node # when tcp fails 



Print the node number of a peer node if sending it a message failed.

Signed-off-by: default avatarWengang Wang <wen.gang.wang@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent 83f92318

fs/ocfs2/dlm/dlmast.c

+3 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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

+13 −6
Original line number Diff line number Diff line
@@ -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,9 @@ 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 +1033,11 @@ 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 +1108,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
Original line number Diff line number Diff line
@@ -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

+9 −3
Original line number Diff line number Diff line
@@ -1666,7 +1666,9 @@ static int dlm_do_assert_master(struct dlm_ctxt *dlm, 
		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 +2209,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 +2981,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();