diff options
author | Sachin Pandit <spandit@redhat.com> | 2014-06-26 07:51:02 +0530 |
---|---|---|
committer | Kaushal M <kaushal@redhat.com> | 2014-07-24 03:03:53 -0700 |
commit | 00bcf8e80bd65de7a8a102b137d35af3ba2cc3c1 (patch) | |
tree | 6b34aca9816d37f0b32228f586b82794d5e44d8b /xlators/mgmt/glusterd/src/glusterd.c | |
parent | f4110bed9230025ef7cac8e550057e316f9de1cb (diff) |
cli/snapshot : Dont display the snapshot hard-limit, soft-limit
and auto-delete value in gluster volume info.
Problem : Even though snap-max-hard-limit, snap-max-soft-limit and
auto-delete values were not set explicitly, It was getting showed
in the output of gluster volume info.
Solution : Check if the value is already present in dictionary
(That means, it is set), If value is not present then consider
the default value,
NOTE : This patch doesn't solve the problem where the values
which is set globally are being displayed in gluster volume info
Change-Id: I61445b3d2a12eb68c38a19bea53b9051ad028050
BUG: 1113476
Signed-off-by: Sachin Pandit <spandit@redhat.com>
Reviewed-on: http://review.gluster.org/8191
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
Reviewed-by: Kaushal M <kaushal@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd.c')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c index adf58cc7dde..c5fa245dbd8 100644 --- a/xlators/mgmt/glusterd/src/glusterd.c +++ b/xlators/mgmt/glusterd/src/glusterd.c @@ -200,7 +200,7 @@ glusterd_options_init (xlator_t *this) ret = glusterd_store_retrieve_options (this); if (ret == 0) { - goto set; + goto out; } ret = dict_set_str (priv->opts, GLUSTERD_GLOBAL_OPT_VERSION, @@ -213,17 +213,6 @@ glusterd_options_init (xlator_t *this) gf_log (this->name, GF_LOG_ERROR, "Unable to store version"); return ret; } - -set: - if (priv->op_version >= GD_OP_VERSION_3_6_0) { - ret = glusterd_check_and_set_config_limit (priv); - if (ret) { - gf_log (this->name, GF_LOG_ERROR, "Failed " - "to set config limit in options"); - return ret; - } - } - out: return 0; } |