summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd.c
diff options
context:
space:
mode:
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c
index 255c1db5de9..c2e6fe8b251 100644
--- a/xlators/mgmt/glusterd/src/glusterd.c
+++ b/xlators/mgmt/glusterd/src/glusterd.c
@@ -199,20 +199,32 @@ glusterd_options_init (xlator_t *this)
goto out;
ret = glusterd_store_retrieve_options (this);
- if (ret == 0)
- goto out;
+ if (ret == 0) {
+ goto set;
+ }
ret = dict_set_str (priv->opts, GLUSTERD_GLOBAL_OPT_VERSION,
initial_version);
if (ret)
goto out;
+
ret = glusterd_store_options (this, priv->opts);
if (ret) {
gf_log (this->name, GF_LOG_ERROR, "Unable to store version");
return ret;
}
-out:
+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;
}
int