diff options
| author | Mohammed Rafi KC <rkavunga@redhat.com> | 2015-09-07 14:46:33 +0530 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2015-10-09 10:00:11 -0700 |
| commit | d777b2feaf55347177d6786657d68cc0547f7f73 (patch) | |
| tree | fa3d3bc517fb43299f232b6e962aa24d67d11ca5 /xlators/mgmt/glusterd/src/glusterd.h | |
| parent | 9e0c2c9d5e9b4f5df644911e29be4a611e0d2d42 (diff) | |
tiering/glusterd: keep afr/ec xlators name constant
afr uses the translator name for locking purpose,
so it is mandatory to keep afr/ec xlators name constant
across graph change
currently when a tier is attached, afr names are appended
either with hot or cold. ie that breaks the above
mentioned constraint.
Backport of>
>Change-Id: I3699dcdaa8190bab3ba81cbc01e8fa126d37ba0d
>BUG: 1261276
>Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
>Reviewed-on: http://review.gluster.org/12134
>Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
>Tested-by: Gluster Build System <jenkins@build.gluster.com>
>Reviewed-by: Dan Lambright <dlambrig@redhat.com>
>Tested-by: Dan Lambright <dlambrig@redhat.com>
(cherry picked from commit 4ad9bc5faca60528345f1e9c95c22bd8402162c0)
Change-Id: I7bf5f22f112f1df1c05a0a8503d56029509d6292
BUG: 1261744
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
Reviewed-on: http://review.gluster.org/12323
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-by: Dan Lambright <dlambrig@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd.h')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h index d9b06c3e5da..b6836fbadf8 100644 --- a/xlators/mgmt/glusterd/src/glusterd.h +++ b/xlators/mgmt/glusterd/src/glusterd.h @@ -321,6 +321,7 @@ typedef struct tier_info_ { int hot_replica_count; int promoted; int demoted; + uint16_t cur_tier_hot; } gd_tier_info_t; struct glusterd_volinfo_ { @@ -336,7 +337,12 @@ struct glusterd_volinfo_ { the volume which is snapped. In case of a non-snap volume, this field will be initialized as N/A */ - char volname[GD_VOLUME_NAME_MAX]; + char volname[GD_VOLUME_NAME_MAX + 5]; + /* An extra 5 bytes are allocated. + * Reason is, As part of the tiering + * volfile generation code, we are + * temporarily appending either hot + * or cold */ int type; int brick_count; uint64_t snap_count; |