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

gfapi: Access fs->oldvolfile under mutex lock

Browse Source 
In some cases (for eg., when there are multiple
RPC_CLNT_CONNECT notifications), multiple threads may fetch
volfile and try to update it in 'fs' object simultaneously.
Hence protect those variables' access under fs->mutex lock.

Change-Id: Idaee9548560db32d83f4c04ebb1f375fee7864a9
fixes: bz#1660577
Signed-off-by: Soumya Koduri <skoduri@redhat.com>
This commit is contained in:
Soumya Koduri
2018-12-18 22:07:55 +05:30
committed by Amar Tumballi
parent 233c909077
commit 8fe3c6107a
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/glfs-mgmt.c
View File

@ -653,12 +653,15 @@ volfile:
ret = 0;
size = rsp.op_ret;
pthread_mutex_lock(&fs->mutex);
if ((size == fs->oldvollen) &&
(memcmp(fs->oldvolfile, rsp.spec, size) == 0)) {
gf_msg(frame->this->name, GF_LOG_INFO, 0, API_MSG_VOLFILE_INFO,
"No change in volfile, continuing");
pthread_mutex_unlock(&fs->mutex);
goto out;
}
pthread_mutex_unlock(&fs->mutex);
/* coverity[secure_temp] mkstemp uses 0600 as the mode and is safe */
tmp_fd = mkstemp(template);
@ -699,7 +702,10 @@ volfile:
* occurred during the operation
*/
pthread_mutex_lock(&fs->mutex);
ret = gf_volfile_reconfigure(fs->oldvollen, tmpfp, fs->ctx, fs->oldvolfile);
pthread_mutex_unlock(&fs->mutex);
if (ret == 0) {
gf_msg_debug("glusterfsd-mgmt", 0,
"No need to re-load "