diff options
| author | Ravishankar N <ravishankar@redhat.com> | 2018-06-29 11:30:37 +0530 |
|---|---|---|
| committer | Ravishankar N <ravishankar@redhat.com> | 2018-07-02 10:12:14 +0000 |
| commit | 8f6e437073ee20d8f1ec8efc57b9aac86d09269d (patch) | |
| tree | 1612bae6a3894656f70f2f764ca929f3c73acd16 | |
| parent | b17acca6d00b31a72bf8bcb81ab3bbb5787313c1 (diff) | |
glusterfsd: Do not process GLUSTERD_BRICK_XLATOR_OP if graph is not ready
Problem:
If glustershd gets restarted by glusterd due to node reboot/volume start force/
or any thing that changes shd graph (add/remove brick), and index heal
is launched via CLI, there can be a chance that shd receives this IPC
before the graph is fully active. Thus when it accesses
glusterfsd_ctx->active, it crashes.
Fix:
Since glusterd does not really wait for the daemons it spawned to be
fully initialized and can send the request as soon as rpc initialization has
succeeded, we just handle it at shd. If glusterfs_graph_activate() is
not yet done in shd but glusterd sends GD_OP_HEAL_VOLUME to shd,
we fail the request.
Change-Id: If6cc07bc5455c4ba03458a36c28b63664496b17d
fixes: bz#1597229
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
(cherry picked from commit 2f9e555f79ce69668950693ed2e09cfafd2b7ec1)
| -rw-r--r-- | glusterfsd/src/glusterfsd-messages.h | 3 | ||||
| -rw-r--r-- | glusterfsd/src/glusterfsd-mgmt.c | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/glusterfsd/src/glusterfsd-messages.h b/glusterfsd/src/glusterfsd-messages.h index 8df32a33179..95fc79ef8d0 100644 --- a/glusterfsd/src/glusterfsd-messages.h +++ b/glusterfsd/src/glusterfsd-messages.h @@ -60,7 +60,8 @@ GLFS_MSGID(GLUSTERFSD, glusterfsd_msg_34, glusterfsd_msg_35, glusterfsd_msg_36, - glusterfsd_msg_37 + glusterfsd_msg_37, + glusterfsd_msg_38 ); #endif /* !_GLUSTERFSD_MESSAGES_H_ */ diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c index 91c75069627..32954c901e6 100644 --- a/glusterfsd/src/glusterfsd-mgmt.c +++ b/glusterfsd/src/glusterfsd-mgmt.c @@ -673,6 +673,13 @@ glusterfs_handle_translator_op (rpcsvc_request_t *req) ctx = glusterfsd_ctx; active = ctx->active; + if (!active) { + ret = -1; + gf_msg (this->name, GF_LOG_ERROR, EAGAIN, glusterfsd_msg_38, + "Not processing brick-op no. %d since volume graph is " + "not yet active.", xlator_req.op); + goto out; + } any = active->first; input = dict_new (); ret = dict_unserialize (xlator_req.input.input_val, |