diff options
| author | vmallika <vmallika@redhat.com> | 2015-05-22 14:04:31 +0530 |
|---|---|---|
| committer | Krishnan Parthasarathi <kparthas@redhat.com> | 2015-06-01 02:13:35 -0700 |
| commit | 4c630a77e1325349adb369f9a7c83557007eda56 (patch) | |
| tree | 7fe0c543f379e8c6f07603db9b17a1fbc84e0c48 /xlators/mgmt/glusterd/src/glusterd-utils.c | |
| parent | 4fda438a0aa55e2cb0412f8c800d01f81fe4bbbe (diff) | |
quota: quota.conf backward compatibility fix
This is a backport of http://review.gluster.org/#/c/10889/
> In release-3.7 the format of quota.conf is changed.
> There is a backward compatibility issues during upgrade
> 1) There can be an issue when peer sync between node-3.6 and node-3.7
> 2) If the user sets/removes limit, there is will different format of
> file in node-3.6 and node-3.7
>
> This patch fixes the issue:
> 1) restrict the user to execute command quota enable, limit-usage, remove
> 2) write quota.conf in older format if op-version is less than 3.6
>
> Change-Id: Ib76f5a0a85394642159607a105cacda743e7d26b
> BUG: 1223739
> Signed-off-by: vmallika <vmallika@redhat.com>
> Reviewed-on: http://review.gluster.org/10889
> Tested-by: NetBSD Build System
> Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Change-Id: I3d5075b96de1e125d30b0f6045389573aaaaecdb
BUG: 1226153
Signed-off-by: vmallika <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/10985
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Tested-by: Krishnan Parthasarathi <kparthas@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 387e0a6e8ae..f90abc19b2e 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -2998,7 +2998,7 @@ glusterd_import_quota_conf (dict_t *peer_data, int vol_idx, if (ret) goto out; - ret = quota_conf_write_header (fd); + ret = glusterd_quota_conf_write_header (fd); if (ret) goto out; @@ -3018,7 +3018,8 @@ glusterd_import_quota_conf (dict_t *peer_data, int vol_idx, gfid_type = GF_QUOTA_CONF_TYPE_USAGE; gf_uuid_parse (gfid_str, gfid); - ret = quota_conf_write_gfid (fd, gfid, (char)gfid_type); + ret = glusterd_quota_conf_write_gfid (fd, gfid, + (char)gfid_type); if (ret < 0) { gf_log (this->name, GF_LOG_CRITICAL, "Unable to write " "gfid %s into quota.conf for %s", gfid_str, |