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

glusterfsd: Sometime brick process is crashed after enable brick mux

Browse Source 
Problem: glusterfsd is getting Segfault while running bug-1432542-mpx-restart-crash.t
         in a loop in while brick mux is enabled.

Solution: Change the index_worker code as well as notify code in index.c
          to cleanup index_worker thread appropriately.

BUG: 1459402
Change-Id: Id036664dc34309dd3f6e54746fc2724182cb074f
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
Reviewed-on: https://review.gluster.org/17471
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Jeff Darcy <jeff@pl.atyp.us>
This commit is contained in:
Mohit Agrawal 2017-06-06 13:44:06 +05:30 committed by Jeff Darcy
parent bae51359b4
commit 0a07cffbf3
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xlators/features/index/src/index.c
View File

@ -199,6 +199,8 @@ index_worker (void *data)
index_priv_t *priv = NULL;
xlator_t *this = NULL;
call_stub_t *stub = NULL;
gf_boolean_t bye = _gf_false;
THIS = data;
this = data;
@ -208,16 +210,27 @@ index_worker (void *data)
pthread_mutex_lock (&priv->mutex);
{
while (list_empty (&priv->callstubs)) {
if (priv->down) {
bye = _gf_true;/*Avoid wait*/
break;
}
(void) pthread_cond_wait (&priv->cond,
&priv->mutex);
if (priv->down) {
bye = _gf_true;
break;
}
}
stub = __index_dequeue (&priv->callstubs);
if (!bye)
stub = __index_dequeue (&priv->callstubs);
}
pthread_mutex_unlock (&priv->mutex);
if (stub) /* guard against spurious wakeups */
call_resume (stub);
stub = NULL;
if (bye)
break;
}
return NULL;
@ -2380,6 +2393,7 @@ init (xlator_t *this)
/*init indices files counts*/
count = index_fetch_link_count (this, XATTROP);
index_set_link_count (priv, count, XATTROP);
priv->down = _gf_false;
ret = gf_thread_create (&priv->thread, &w_attr, index_worker, this);
if (ret) {
@ -2505,10 +2519,8 @@ notify (xlator_t *this, int event, void *data, ...)
switch (event) {
case GF_EVENT_CLEANUP:
if (priv->thread) {
(void) gf_thread_cleanup_xint (priv->thread);
priv->thread = 0;
}
priv->down = _gf_true;
pthread_cond_broadcast (&priv->cond);
break;
}

1
xlators/features/index/src/index.h
View File

@ -61,6 +61,7 @@ typedef struct index_priv {
dict_t *complete_watchlist;
int64_t pending_count;
pthread_t thread;
gf_boolean_t down;
} index_priv_t;
typedef struct index_local {