diff options
| author | Gaurav Kumar Garg <ggarg@redhat.com> | 2015-04-15 11:37:22 +0530 |
|---|---|---|
| committer | Krishnan Parthasarathi <kparthas@redhat.com> | 2015-04-30 02:43:59 -0700 |
| commit | 7648c0de36c7927b588abc66734c5b94afb08c00 (patch) | |
| tree | d78deb7dd4958f45c787c15f61b73a8d2ea2af0f /xlators/mgmt/glusterd/src/glusterd-utils.c | |
| parent | 6faf89f4179c452be20f02966b9722641938599d (diff) | |
glusterd: do not pass volinfo in glusterd_svc_manager function
On restarting of glusterd first it will start all the bricks present
in the volume then it will start all the services. During starting of
all the services it may pass volinfo as a NULL. It will cause Assert
failure in glusterd_bitdsvc_manager function and will cause a glusterd
crash.
Change-Id: Ia14cf5022da88516cdd576eb2d1e0e7b17a3782b
BUG: 1207029
Signed-off-by: Gaurav Kumar Garg <ggarg@redhat.com>
Reviewed-on: http://review.gluster.org/10241
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Tested-by: Krishnan Parthasarathi <kparthas@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 3025cd6f118..ce55a9d3490 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -3853,9 +3853,6 @@ glusterd_compare_friend_data (dict_t *peer_data, int32_t *status, int32_t count = 0; int i = 1; gf_boolean_t update = _gf_false; - gf_boolean_t stale_nfs = _gf_false; - gf_boolean_t stale_shd = _gf_false; - gf_boolean_t stale_qd = _gf_false; xlator_t *this = NULL; glusterd_conf_t *priv = NULL; @@ -3895,26 +3892,11 @@ glusterd_compare_friend_data (dict_t *peer_data, int32_t *status, } if (update) { - if (glusterd_proc_is_running (&(priv->nfs_svc.proc))) - stale_nfs = _gf_true; - if (glusterd_proc_is_running (&(priv->shd_svc.proc))) - stale_shd = _gf_true; - if (glusterd_proc_is_running (&(priv->quotad_svc.proc))) - stale_qd = _gf_true; ret = glusterd_import_friend_volumes (peer_data); if (ret) goto out; - if (_gf_false == glusterd_are_all_volumes_stopped ()) { - ret = glusterd_svcs_manager (NULL); - } else { - if (stale_nfs) - priv->nfs_svc.stop (&(priv->nfs_svc), SIGKILL); - if (stale_shd) - priv->shd_svc.stop (&(priv->shd_svc), SIGTERM); - if (stale_qd) - priv->quotad_svc.stop (&(priv->quotad_svc), - SIGTERM); - } + + glusterd_svcs_manager (NULL); } out: |