diff options
| author | Mohammed Rafi KC <rkavunga@redhat.com> | 2019-04-23 13:03:28 +0530 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2019-04-24 00:10:54 +0000 |
| commit | 87ae36774a0e5a8af9330cf651d93f5cc84cb515 (patch) | |
| tree | 322fc78c3aa53929573f770c1f040b042467ac1a | |
| parent | 17992b69ccc729d59241ceff2aa480d1976e02fc (diff) | |
glusterd/shd: Keep a ref on volinfo until attach rpc execute cbk
When svc attach execute for multiplexing a daemon, we have to keep
a ref on volinfo until it finish the execution. Because, if the attach
is an aysnc call, then a parallel volume delete can lead to free the
volinfo
Change-Id: Ibc02b89557baaed2f63db63d7fb1a7480444ae0d
fixes: bz#1702185
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-shd-svc.c | 3 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-svc-helper.c | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-shd-svc.c b/xlators/mgmt/glusterd/src/glusterd-shd-svc.c index 19eca9f2729..a9eab42a46c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-shd-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-shd-svc.c @@ -452,8 +452,11 @@ glusterd_shdsvc_start(glusterd_svc_t *svc, int flags) } if (shd->attached) { + glusterd_volinfo_ref(volinfo); + /* Unref will happen from glusterd_svc_attach_cbk */ ret = glusterd_attach_svc(svc, volinfo, flags); if (ret) { + glusterd_volinfo_unref(volinfo); gf_msg("glusterd", GF_LOG_ERROR, 0, GD_MSG_VOLINFO_GET_FAIL, "Failed to attach shd svc(volume=%s) to pid=%d. Starting" "a new process", diff --git a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c index 02945b1e313..f7be3949b37 100644 --- a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c +++ b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c @@ -695,6 +695,10 @@ out: if (flag) { GF_FREE(flag); } + + if (volinfo) + glusterd_volinfo_unref(volinfo); + GF_ATOMIC_DEC(conf->blockers); STACK_DESTROY(frame->root); return 0; |