diff options
| author | Atin Mukherjee <amukherj@redhat.com> | 2018-11-22 09:58:52 +0530 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2018-11-27 10:11:20 +0000 |
| commit | a52d2d704318a930b0a2eb6d92701499fa97e52e (patch) | |
| tree | 4d438faff9c52bdc12aee40460b955c4c2a66736 /xlators/mgmt/glusterd | |
| parent | c7eb1883bea6e72a72908b2e2966d4893d47db16 (diff) | |
glusterd: perform store operation in cleanup lock
All glusterd store operation and cleanup thread should work under a
critical section to avoid any partial store write.
Change-Id: I4f12e738f597a1f925c87ea2f42565dcf9ecdb9d
Fixes: bz#1652430
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-store.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c index e37d22616ac..57ad7ca501d 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -1768,9 +1768,16 @@ glusterd_store_volinfo(glusterd_volinfo_t *volinfo, glusterd_volinfo_ver_ac_t ac) { int32_t ret = -1; + glusterfs_ctx_t *ctx = NULL; + xlator_t *this = NULL; + this = THIS; + GF_ASSERT(this); + ctx = this->ctx; + GF_ASSERT(ctx); GF_ASSERT(volinfo); + pthread_mutex_lock(&ctx->cleanup_lock); pthread_mutex_lock(&volinfo->store_volinfo_lock); { glusterd_perform_volinfo_version_action(volinfo, ac); @@ -1812,6 +1819,7 @@ glusterd_store_volinfo(glusterd_volinfo_t *volinfo, } unlock: pthread_mutex_unlock(&volinfo->store_volinfo_lock); + pthread_mutex_unlock(&ctx->cleanup_lock); if (ret) glusterd_store_volume_cleanup_tmp(volinfo); |