summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-store.c
diff options
context:
space:
mode:
authorSachin Pandit <spandit@redhat.com>2014-06-04 03:41:35 +0530
committerKrishnan Parthasarathi <kparthas@redhat.com>2014-06-11 21:54:07 -0700
commit5906be31845f6a63ff9d5cd15ad0c13af51b81ea (patch)
tree8965923d227408970ddc83e13cb36717525dffee /xlators/mgmt/glusterd/src/glusterd-store.c
parentb9856eca80e2f820c88f60fdc6cb1427905671af (diff)
glusterd/snapshot : Store the global snapshot config limit in options.
Problem : Initially we used to save the global config limit in glusterd.info, The problem with that approach was glusterd.info is local to a particular glusterd and hence is not synced during the handshake of glusterds. Solution : Store the global snapshot config in options, which is synced during handshake. Change-Id: I4c688bb4052a57df28aadba8581b14e2ddb510ef BUG: 1104642 Signed-off-by: Sachin Pandit <spandit@redhat.com> Reviewed-on: http://review.gluster.org/7971 Reviewed-by: Rajesh Joseph <rjoseph@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Atin Mukherjee <amukherj@redhat.com> Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com> Tested-by: Krishnan Parthasarathi <kparthas@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-store.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-store.c40
1 files changed, 0 insertions, 40 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 7efa9fb6d17..a243a1365d3 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -1784,24 +1784,6 @@ glusterd_store_global_info (xlator_t *this)
goto out;
}
- snprintf (buf, sizeof (buf), "%"PRIu64, conf->snap_max_hard_limit);
- ret = gf_store_save_value (handle->fd,
- GLUSTERD_STORE_KEY_SNAP_MAX_HARD_LIMIT, buf);
- if (ret) {
- gf_log (this->name, GF_LOG_ERROR,
- "Storing snap-max-hard-limit failed ret = %d", ret);
- goto out;
- }
-
- snprintf (buf, sizeof (buf), "%"PRIu64, conf->snap_max_soft_limit);
- ret = gf_store_save_value (handle->fd,
- GLUSTERD_STORE_KEY_SNAP_MAX_SOFT_LIMIT, buf);
- if (ret) {
- gf_log (this->name, GF_LOG_ERROR,
- "Storing snap-max-soft-limit failed ret = %d", ret);
- goto out;
- }
-
ret = gf_store_rename_tmppath (handle);
out:
if (handle) {
@@ -1940,28 +1922,6 @@ glusterd_restore_op_version (xlator_t *this)
conf = this->private;
- ret = glusterd_retrieve_sys_snap_max_limit (this,
- &conf->snap_max_hard_limit,
- GLUSTERD_STORE_KEY_SNAP_MAX_HARD_LIMIT);
- if (ret) {
- gf_log (this->name, GF_LOG_WARNING,
- "Unable to retrieve system snap-max-hard-limit, "
- "setting it to default value(%d)",
- GLUSTERD_SNAPS_MAX_HARD_LIMIT);
- conf->snap_max_hard_limit = GLUSTERD_SNAPS_MAX_HARD_LIMIT;
- }
-
- ret = glusterd_retrieve_sys_snap_max_limit (this,
- &conf->snap_max_soft_limit,
- GLUSTERD_STORE_KEY_SNAP_MAX_SOFT_LIMIT);
- if (ret) {
- gf_log (this->name, GF_LOG_WARNING,
- "Unable to retrieve system snap-max-soft-limit, "
- "setting it to default value(%d)",
- GLUSTERD_SNAPS_DEF_SOFT_LIMIT_PERCENT);
- conf->snap_max_soft_limit = GLUSTERD_SNAPS_DEF_SOFT_LIMIT_PERCENT;
- }
-
ret = glusterd_retrieve_op_version (this, &op_version);
if (!ret) {
if ((op_version < GD_OP_VERSION_MIN) ||