diff options
| author | vmallika <vmallika@redhat.com> | 2015-12-03 14:55:36 +0530 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2015-12-08 23:21:15 -0800 |
| commit | 156022b67f5da2ca27a607ee9e7608fdf5e91a20 (patch) | |
| tree | c667230e0726f64884c3eae511c367e13b8c5a7c /xlators/mgmt/glusterd/src/glusterd-store.c | |
| parent | 28da53e26e88f23f8917810ce0177f2628aa7e9a (diff) | |
glusterd/quota: quota-version conflict in export/import volinfo
When exporting/importing voinfo during handshake,
quota conf and quota xattr version were using same key
'quota-version' and updated wrong values when importing
quota version values.
Change-Id: If939d6f5bc4851d4114963877be72dda21834f0f
BUG: 1287996
Signed-off-by: vmallika <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/12865
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-store.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-store.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c index 5d9004c496e..c436e3b8195 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -1019,7 +1019,7 @@ glusterd_volume_exclude_options_write (int fd, glusterd_volinfo_t *volinfo) goto out; } - snprintf (buf, sizeof (buf), "%d", volinfo->quota_version); + snprintf (buf, sizeof (buf), "%d", volinfo->quota_xattr_version); ret = gf_store_save_value (fd, GLUSTERD_STORE_KEY_VOL_QUOTA_VERSION, buf); if (ret) @@ -2687,7 +2687,7 @@ glusterd_store_update_volinfo (glusterd_volinfo_t *volinfo) volinfo->tier_info.cold_type = atoi (value); } else if (!strncmp (key, GLUSTERD_STORE_KEY_VOL_QUOTA_VERSION, strlen (GLUSTERD_STORE_KEY_VOL_QUOTA_VERSION))) { - volinfo->quota_version = atoi (value); + volinfo->quota_xattr_version = atoi (value); } else { if (is_key_glusterd_hooks_friendly (key)) { |