diff options
| author | vmallika <vmallika@redhat.com> | 2015-12-03 14:55:36 +0530 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2015-12-08 23:25:25 -0800 |
| commit | f18432dde90fbea02ff656eecc916e8b04e0d516 (patch) | |
| tree | 6bdbf0581410b6089a125d801be86f54c189ce54 /xlators/mgmt/glusterd/src/glusterd-store.c | |
| parent | 2142614f385352903d0cdb67657f2e639b79f72c (diff) | |
glusterd/quota: quota-version conflict in export/import volinfo
This is a backport of http://review.gluster.org/#/c/12865/
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>
Change-Id: Ic234d9e496f1372789112a0b82ba5cf34014de64
BUG: 1288052
Signed-off-by: vmallika <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/12872
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
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 73d416b384e..2c9ab006d3e 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -1023,7 +1023,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) @@ -2691,7 +2691,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)) { |