diff options
| author | Krishnan Parthasarathi <kp@gluster.com> | 2012-02-06 15:12:51 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-02-07 09:45:08 -0800 |
| commit | a4818cef9838ed3b1a270f395b4cce9551532927 (patch) | |
| tree | c782edb6d43d8061b4dd36dc6c6a31c538fdb9d6 /xlators/mgmt/glusterd/src/glusterd.c | |
| parent | 0272f7de41fa529f51bc69fdaf694c77b47250f2 (diff) | |
glusterd: Initialised op_sm/friend_sm before cluster restore.
Cleaned up peerinfo/rpc association.
Change-Id: I11bcaa3ea1f2b86c6b4e235873a60bb5bf76a892
BUG: 786006
Signed-off-by: Krishnan Parthasarathi <kp@gluster.com>
Reviewed-on: http://review.gluster.com/2725
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c index af6381bbfb2..e9f3bd05577 100644 --- a/xlators/mgmt/glusterd/src/glusterd.c +++ b/xlators/mgmt/glusterd/src/glusterd.c @@ -936,6 +936,10 @@ init (xlator_t *this) strncpy (conf->workdir, dirname, PATH_MAX); INIT_LIST_HEAD (&conf->xprt_list); + + glusterd_friend_sm_init (); + glusterd_op_sm_init (); + glusterd_opinfo_init (); ret = glusterd_sm_tr_log_init (&conf->op_sm_log, glusterd_op_sm_state_name_get, glusterd_op_sm_event_name_get, @@ -987,10 +991,6 @@ init (xlator_t *this) if (ret < 0) goto out; - glusterd_friend_sm_init (); - glusterd_op_sm_init (); - glusterd_opinfo_init (); - ret = glusterd_handle_upgrade_downgrade (this->options, conf); if (ret) goto out; |