iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fs: dlm: fix mark per nodeid setting

Browse Source 
This patch fixes to set per nodeid mark configuration for accepted
sockets as well. Before this patch only the listen socket mark value was
used for all accepted connections. This patch will ensure that the
cluster mark attribute value will be always used for all sockets, if a
per nodeid mark value is specified dlm will use this value for the
specific node.

Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
This commit is contained in:
Alexander Aring 2020-09-24 10:31:23 -04:00 committed by David Teigland
parent 0461e0db94
commit 3f78cd7d24
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/dlm/config.c
View File

@ -860,18 +860,22 @@ int dlm_comm_seq(int nodeid, uint32_t *seq)
return 0; return 0;
} }
int dlm_comm_mark(int nodeid, unsigned int *mark) void dlm_comm_mark(int nodeid, unsigned int *mark)
{ {
struct dlm_comm *cm; struct dlm_comm *cm;
cm = get_comm(nodeid); cm = get_comm(nodeid);
if (!cm) if (!cm) {
return -ENOENT; *mark = dlm_config.ci_mark;
return;
}
if (cm->mark)
*mark = cm->mark;
else
*mark = dlm_config.ci_mark;
*mark = cm->mark;
put_comm(cm); put_comm(cm);
return 0;
} }
int dlm_our_nodeid(void) int dlm_our_nodeid(void)

2
fs/dlm/config.h
View File

@ -46,7 +46,7 @@ void dlm_config_exit(void);
int dlm_config_nodes(char *lsname, struct dlm_config_node **nodes_out, int dlm_config_nodes(char *lsname, struct dlm_config_node **nodes_out,
int *count_out); int *count_out);
int dlm_comm_seq(int nodeid, uint32_t *seq); int dlm_comm_seq(int nodeid, uint32_t *seq);
int dlm_comm_mark(int nodeid, unsigned int *mark); void dlm_comm_mark(int nodeid, unsigned int *mark);
int dlm_our_nodeid(void); int dlm_our_nodeid(void);
int dlm_our_addr(struct sockaddr_storage *addr, int num); int dlm_our_addr(struct sockaddr_storage *addr, int num);

12
fs/dlm/lowcomms.c
View File

@ -790,6 +790,7 @@ static int accept_from_sock(struct connection *con)
int nodeid; int nodeid;
struct connection *newcon; struct connection *newcon;
struct connection *addcon; struct connection *addcon;
unsigned int mark;
if (!dlm_allow_conn) { if (!dlm_allow_conn) {
return -1; return -1;
@ -826,6 +827,9 @@ static int accept_from_sock(struct connection *con)
return -1; return -1;
} }
dlm_comm_mark(nodeid, &mark);
sock_set_mark(newsock->sk, mark);
log_print("got connection from %d", nodeid); log_print("got connection from %d", nodeid);
/* Check to see if we already have a connection to this node. This /* Check to see if we already have a connection to this node. This
@ -971,9 +975,7 @@ static void sctp_connect_to_sock(struct connection *con)
return; return;
} }
result = dlm_comm_mark(con->nodeid, &mark); dlm_comm_mark(con->nodeid, &mark);
if (result < 0)
return;
mutex_lock(&con->sock_mutex); mutex_lock(&con->sock_mutex);
@ -1071,9 +1073,7 @@ static void tcp_connect_to_sock(struct connection *con)
return; return;
} }
result = dlm_comm_mark(con->nodeid, &mark); dlm_comm_mark(con->nodeid, &mark);
if (result < 0)
return;
mutex_lock(&con->sock_mutex); mutex_lock(&con->sock_mutex);
if (con->retries++ > MAX_CONNECT_RETRIES) if (con->retries++ > MAX_CONNECT_RETRIES)