diff options
| author | Vijay Bellur <vijay@gluster.com> | 2010-09-30 11:41:07 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2010-09-30 11:19:28 -0700 |
| commit | da74288339563759f568aa5052fdce4c45ebcd22 (patch) | |
| tree | 49c2f9eaa7131c45b864b7c073fb2d20615a9881 /glusterfsd | |
| parent | af18c636c44b1ea56296850e55afe0e4b2ce845c (diff) | |
glusterfsd: perform init new graph if re-configure fails
Signed-off-by: Vijay Bellur <vijay@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 1235 (Bug for all pump/migrate commits)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1235
Diffstat (limited to 'glusterfsd')
| -rw-r--r-- | glusterfsd/src/glusterfsd-mgmt.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c index ac0abfac35e..b1fa5ca47e4 100644 --- a/glusterfsd/src/glusterfsd-mgmt.c +++ b/glusterfsd/src/glusterfsd-mgmt.c @@ -229,7 +229,7 @@ out: return ret; } -/* Function has 3types of return value 0, -ve , 1 +/* Function has 3types of return value 0, -ve , 1 * return 0 =======> reconfiguration of options has succeded * return 1 =======> the graph has to be reconstructed and all the xlators should be inited * return -1(or -ve) =======> Some Internal Error occured during the operation @@ -249,7 +249,7 @@ glusterfs_volfile_reconfigure (FILE *newvolfile_fp) goto out; if (!oldvollen) { - ret = 1; // Has to call INIT for the whole graph + ret = 1; // Has to call INIT for the whole graph goto out; } fwrite (oldvolfile, oldvollen, 1, oldvolfile_fp); @@ -300,6 +300,7 @@ glusterfs_volfile_reconfigure (FILE *newvolfile_fp) if (ret) { gf_log ("glusterfsd-mgmt", GF_LOG_DEBUG, "Could not reconfigure new options in old graph"); + goto out; } ret = 0; @@ -359,13 +360,12 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count, /* Check if only options have changed. No need to reload the * volfile if topology hasn't changed. - * glusterfs_volfile_reconfigure returns 3 possible return states + * glusterfs_volfile_reconfigure returns 3 possible return states * return 0 =======> reconfiguration of options has succeded * return 1 =======> the graph has to be reconstructed and all the xlators should be inited * return -1(or -ve) =======> Some Internal Error occured during the operation */ - ret = glusterfs_volfile_reconfigure (tmpfp); if (ret == 0) { gf_log ("glusterfsd-mgmt", GF_LOG_DEBUG, @@ -378,8 +378,6 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count, goto out; } - - ret = glusterfs_process_volfp (ctx, tmpfp); if (ret) goto out; |