diff options
| author | Kaushik BV <kaushikbv@gluster.com> | 2010-10-11 12:13:51 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2010-10-11 11:07:10 -0700 |
| commit | d31e97336aac057510203f0942856b66baf4a91b (patch) | |
| tree | 35431889b253c6517dd7071032d9a34d63348f16 | |
| parent | 27c8b7a36972db1a80d51764f9dfc6d3deb10a80 (diff) | |
mgmt/Glusterd: fixes in volume reset
Signed-off-by: Kaushik BV <kaushikbv@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 1159 ()
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1159
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 1 | ||||
| -rw-r--r-- | xlators/protocol/client/src/client.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index ca935841593..e0fc1cc7ee3 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -4838,6 +4838,7 @@ glusterd_op_stage_validate (gd1_mgmt_stage_op_req *req, char **op_errstr, case GD_OP_RESET_VOLUME: ret = glusterd_op_stage_reset_volume (req); + break; case GD_OP_REMOVE_BRICK: ret = glusterd_op_stage_remove_brick (req); diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c index 17fcc1a85f3..e2513f89145 100644 --- a/xlators/protocol/client/src/client.c +++ b/xlators/protocol/client/src/client.c @@ -1898,6 +1898,8 @@ reconfigure (xlator_t *this, dict_t *options) conf->rpc_conf.rpc_timeout = frame_timeout; } + else + conf->rpc_conf.rpc_timeout = 1800; timeout_ret = dict_get_int32 (options, "ping-timeout", &ping_timeout); @@ -1925,6 +1927,8 @@ reconfigure (xlator_t *this, dict_t *options) "'option ping-timeout' to %d", ping_timeout); conf->opt.ping_timeout = ping_timeout; } + else + conf->opt.ping_timeout = GF_UNIVERSAL_ANSWER; subvol_ret = dict_get_str (this->options, "remote-host", &old_remote_host); |