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 /libglusterfs | |
| 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 'libglusterfs')
| -rw-r--r-- | libglusterfs/src/quota-common-utils.c | 51 | ||||
| -rw-r--r-- | libglusterfs/src/quota-common-utils.h | 8 |
2 files changed, 2 insertions, 57 deletions
diff --git a/libglusterfs/src/quota-common-utils.c b/libglusterfs/src/quota-common-utils.c index 97965b09947..012f80fab48 100644 --- a/libglusterfs/src/quota-common-utils.c +++ b/libglusterfs/src/quota-common-utils.c @@ -177,57 +177,6 @@ out: } int32_t -quota_conf_write_header (int fd) -{ - int header_len = 0; - int ret = 0; - - header_len = strlen (QUOTA_CONF_HEADER); - - ret = gf_nwrite (fd, QUOTA_CONF_HEADER, header_len); - if (ret != header_len) { - ret = -1; - goto out; - } - - ret = 0; - -out: - if (ret < 0) - gf_log_callingfn ("quota", GF_LOG_ERROR, "failed to write " - "header to a quota conf"); - - return ret; -} - -int32_t -quota_conf_write_gfid (int fd, void *buf, char type) -{ - int ret = 0; - - ret = gf_nwrite (fd, buf, 16); - if (ret != 16) { - ret = -1; - goto out; - } - - ret = gf_nwrite (fd, &type, 1); - if (ret != 1) { - ret = -1; - goto out; - } - - ret = 0; - -out: - if (ret < 0) - gf_log_callingfn ("quota", GF_LOG_ERROR, "failed to write " - "gfid %s to a quota conf", uuid_utoa (buf)); - - return ret; -} - -int32_t quota_conf_read_gfid (int fd, void *buf, char *type, float version) { int ret = 0; diff --git a/libglusterfs/src/quota-common-utils.h b/libglusterfs/src/quota-common-utils.h index e80c74cba72..2c3632b903c 100644 --- a/libglusterfs/src/quota-common-utils.h +++ b/libglusterfs/src/quota-common-utils.h @@ -16,6 +16,8 @@ #define GF_QUOTA_CONF_VERSION 1.2 #define QUOTA_CONF_HEADER \ "GlusterFS Quota conf | version: v1.2\n" +#define QUOTA_CONF_HEADER_1_1 \ + "GlusterFS Quota conf | version: v1.1\n" typedef enum { GF_QUOTA_CONF_TYPE_USAGE = 1, @@ -52,12 +54,6 @@ int32_t quota_conf_read_version (int fd, float *version); int32_t -quota_conf_write_header (int fd); - -int32_t -quota_conf_write_gfid (int fd, void *buf, char type); - -int32_t quota_conf_read_gfid (int fd, void *buf, char *type, float version); int32_t |