andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: heketi-cli is throwing error "target is busy"

Browse Source 
Problem: When rpc-transport-disconnect happens, server_connection_cleanup_flush_cbk() 
         is supposed to call rpc_transport_unref() after open-files on 
         that transport are flushed per transport.But open-fd-count is 
         maintained in bound_xl->fd_count, which can be incremented/decremented 
         cumulatively in server_connection_cleanup() by all transport 
         disconnect paths. So instead of rpc_transport_unref() happening 
         per transport, it ends up doing it only once after all the files 
         on all the transports for the brick are flushed leading to 
         rpc-leaks.

Solution: To avoid races maintain fd_cnt at client instead of maintaining
          on brick

Credits: Pranith Kumar Karampuri
Change-Id: I6e8ea37a61f82d9aefb227c5b3ab57a7a36850e6
fixes: bz#1668190
Signed-off-by: Mohit Agrawal <moagrawal@redhat.com>
This commit is contained in:
Mohit Agrawal 2019-01-28 21:28:45 +05:30 committed by Amar Tumballi
parent 09db11b0c0
commit b41cdeb638
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libglusterfs/src/client_t.c
View File

@ -224,6 +224,7 @@ gf_client_get(xlator_t *this, struct rpcsvc_auth_data *cred, char *client_uid,
GF_ATOMIC_INIT(client->bind, 1);
GF_ATOMIC_INIT(client->count, 1);
GF_ATOMIC_INIT(client->fd_cnt, 0);
client->auth.flavour = cred->flavour;
if (cred->flavour != AUTH_NONE) {

2
libglusterfs/src/glusterfs/client_t.h
View File

@ -47,6 +47,8 @@ typedef struct _client {
inode_t *subdir_inode;
uuid_t subdir_gfid;
int32_t opversion;
/* Variable to save fd_count for detach brick */
gf_atomic_t fd_cnt;
} client_t;
#define GF_CLIENTCTX_INITIAL_SIZE 8

3
libglusterfs/src/glusterfs/xlator.h
View File

@ -856,9 +856,6 @@ struct _xlator {
/* Flag to understand how this xlator is categorized */
gf_category_t category;
/* Variable to save fd_count for detach brick */
gf_atomic_t fd_cnt;
/* Variable to save xprt associated for detach brick */
gf_atomic_t xprtrefcnt;

1
libglusterfs/src/xlator.c
View File

@ -614,7 +614,6 @@ xlator_init(xlator_t *xl)
xl->instance_name = NULL;
GF_ATOMIC_INIT(xl->xprtrefcnt, 0);
GF_ATOMIC_INIT(xl->fd_cnt, 0);
if (!xl->init) {
gf_msg(xl->name, GF_LOG_WARNING, 0, LG_MSG_INIT_FAILED,
"No init() found");

4
xlators/protocol/server/src/server-helpers.c
View File

@ -257,7 +257,7 @@ server_connection_cleanup_flush_cbk(call_frame_t *frame, void *cookie,
victim = client->bound_xl;
if (victim) {
fd_cnt = GF_ATOMIC_DEC(victim->fd_cnt);
fd_cnt = GF_ATOMIC_DEC(client->fd_cnt);
if (!fd_cnt && conf && detach) {
pthread_mutex_lock(&conf->mutex);
{
@ -399,7 +399,7 @@ server_connection_cleanup(xlator_t *this, client_t *client, int32_t flags,
if (fd_cnt) {
if (fd_exist)
(*fd_exist) = _gf_true;
GF_ATOMIC_ADD(bound_xl->fd_cnt, fd_cnt);
GF_ATOMIC_ADD(client->fd_cnt, fd_cnt);
}
}