summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Bellur <vijay@gluster.com>2011-08-21 18:21:21 +0530
committerVijay Bellur <vijay@gluster.com>2011-08-21 06:28:18 -0700
commit08e8c966869b091fb4df8bfc8cadc37cb40719a5 (patch)
tree5527bab85bea76ae61a1635368f6d63c5ace66d8
parentaf32ab6bc031347289201f33f496b6b713f7a3f6 (diff)
protocol/client: Changes to be benign to replace-brick
Change-Id: Ic227781760a5f6dbf8aad69a19f90e45d4aaec13 BUG: 3415 Reviewed-on: http://review.gluster.com/288 Reviewed-by: Krishnan Parthasarathi <kp@gluster.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
-rw-r--r--xlators/protocol/client/src/client.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index c0d5248..f9c8683 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -1158,8 +1158,10 @@ client_setxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *dict,
GF_ASSERT (value);
gf_log (this->name, GF_LOG_INFO, "client rpc init command");
ret = client_set_remote_options (value, this);
- if (ret)
+ if (ret) {
+ (void) client_destroy_rpc (this);
ret = client_init_rpc (this);
+ }
if (!ret) {
op_ret = 0;
@@ -1969,11 +1971,9 @@ build_client_config (xlator_t *this, clnt_conf_t *conf)
GF_OPTION_INIT ("remote-subvolume", conf->opt.remote_subvolume,
path, out);
- if (!conf->opt.remote_subvolume) {
- gf_log (this->name, GF_LOG_ERROR,
+ if (!conf->opt.remote_subvolume)
+ gf_log (this->name, GF_LOG_WARNING,
"option 'remote-subvolume' not given");
- goto out;
- }
ret = 0;
out: