diff options
| author | Kaushal M <kaushal@redhat.com> | 2017-08-16 20:17:19 +0530 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2017-08-29 10:14:52 +0000 |
| commit | 83990996736c72f3131f66df35ea7bf2b3d3b5fa (patch) | |
| tree | b598dbc80cc6f146d4632bdfdb8786f99d80b200 /xlators/mgmt/glusterd/src/glusterd-op-sm.c | |
| parent | 3563a48af96b37453774afc08787d3e449c3f0f9 (diff) | |
libglusterfs: Add new fields to volume_options struct
The new fields are required to enable equivalent volume set and volgen
features, and some more additional features in GD2. GD2 does not use a
hard-coded volume options map like GD1, but builds such by reading the
options tables directly from the xlators.
The new fields being introduced into the volume options struct include
the following,
- op-version - version(s) the option was introduced in
- deprecated - version(s) the option was deprecated in
- flags - flags for the option (settable, client, global, force, doc etc.)
- tags - descriptive tags that apply to this option, can be used to
group options
- validate_fn - custom option validation function
Enums for currently available flags have also been defined. To avoid a
naming clashes, the flag enums in GD1 have been renamed.
Updates #302
Change-Id: Ic7e08aef9e051beb47e8dc17d7f7be211aed308a
Signed-off-by: Kaushal M <kaushal@redhat.com>
Reviewed-on: https://review.gluster.org/18059
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Amar Tumballi <amarts@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-op-sm.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index a5d0477e00b..b461edba106 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -2068,12 +2068,12 @@ _delete_reconfig_opt (dict_t *this, char *key, data_t *value, void *data) GF_ASSERT (data); is_force = (int32_t*)data; - /* Keys which has the flag OPT_FLAG_NEVER_RESET + /* Keys which has the flag VOLOPT_FLAG_NEVER_RESET * should not be deleted */ if (_gf_true == glusterd_check_voloption_flags (key, - OPT_FLAG_NEVER_RESET)) { + VOLOPT_FLAG_NEVER_RESET)) { if (*is_force != 1) *is_force = *is_force | GD_OP_PROTECTED; goto out; @@ -2081,7 +2081,7 @@ _delete_reconfig_opt (dict_t *this, char *key, data_t *value, void *data) if (*is_force != 1) { if (_gf_true == glusterd_check_voloption_flags (key, - OPT_FLAG_FORCE)) { + VOLOPT_FLAG_FORCE)) { /* indicate to caller that we don't set the option * due to being protected */ |