diff options
Diffstat (limited to 'xlators/storage/posix')
-rw-r--r-- | xlators/storage/posix/src/posix-helpers.c | 6 | ||||
-rw-r--r-- | xlators/storage/posix/src/posix.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c index 52be925aae2..9e4ab5e7d98 100644 --- a/xlators/storage/posix/src/posix-helpers.c +++ b/xlators/storage/posix/src/posix-helpers.c @@ -1864,15 +1864,15 @@ posix_health_check_thread_proc (void *data) ret = sleep (interval); if (ret > 0) break; - /* prevent thread errors while doing the health-check(s) */ pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL); /* Do the health-check.*/ ret = posix_fs_health_check (this); - if (ret < 0) + if (ret < 0 && priv->health_check_active) goto abort; - + if (!priv->health_check_active) + goto out; pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, NULL); } diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c index 754a45aa6fb..5a11f62dcc7 100644 --- a/xlators/storage/posix/src/posix.c +++ b/xlators/storage/posix/src/posix.c @@ -6639,6 +6639,7 @@ notify (xlator_t *this, break; case GF_EVENT_CLEANUP: if (priv->health_check) { + priv->health_check_active = _gf_false; pthread_cancel (priv->health_check); priv->health_check = 0; } |