summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorMohammed Rafi KC <rkavunga@redhat.com>2015-05-11 14:43:23 +0530
committerKrishnan Parthasarathi <kparthas@redhat.com>2015-06-10 01:08:47 -0700
commitf6a062044a3447bea5bf0fcf21a3f85c00fb6c7d (patch)
tree3d45bbfccdca4e9189131b2609730a5b628029ee /xlators
parentd835219a30327ede60e4ef28210914ab30bd0712 (diff)
tier/volume set: Validate volume set option for tier
Volume set option related to tier volume can only be set for tier volume, also currently all volume set i for tier option accepts a non-negative integer. This patch validate both condition. Change-Id: I3611af048ff4ab193544058cace8db205ea92336 BUG: 1216960 Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com> Signed-off-by: Dan Lambright <dlambrig@redhat.com> Reviewed-on: http://review.gluster.org/10751 Tested-by: Gluster Build System <jenkins@build.gluster.com> Tested-by: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Joseph Fernandes
Diffstat (limited to 'xlators')
-rw-r--r--xlators/cluster/dht/src/tier.c6
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-set.c82
2 files changed, 84 insertions, 4 deletions
diff --git a/xlators/cluster/dht/src/tier.c b/xlators/cluster/dht/src/tier.c
index 0c8daf64087..2279e060442 100644
--- a/xlators/cluster/dht/src/tier.c
+++ b/xlators/cluster/dht/src/tier.c
@@ -827,6 +827,12 @@ tier_start (xlator_t *this, gf_defrag_info_t *defrag)
}
tick = (tick + 1) % TIMER_SECS;
+
+ if (freq_promote != defrag->tier_promote_frequency)
+ next_promote = tick;
+ if (freq_demote != defrag->tier_demote_frequency)
+ next_demote = tick;
+
if ((next_demote != tick) && (next_promote != tick))
continue;
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 5cba295a25b..ae829ad8434 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -12,6 +12,76 @@
#include "glusterd-utils.h"
static int
+validate_tier (glusterd_volinfo_t *volinfo, dict_t *dict, char *key,
+ char *value, char **op_errstr)
+{
+ char errstr[2048] = "";
+ int ret = 0;
+ xlator_t *this = NULL;
+ int origin_val = -1;
+
+ this = THIS;
+ GF_ASSERT (this);
+
+ if (volinfo->type != GF_CLUSTER_TYPE_TIER) {
+ snprintf (errstr, sizeof (errstr), "Volume %s is not a tier "
+ "volume. Option %s is only valid for tier volume.",
+ volinfo->volname, key);
+ gf_log (this->name, GF_LOG_ERROR, "%s", errstr);
+ *op_errstr = gf_strdup (errstr);
+ ret = -1;
+ goto out;
+ }
+
+ /*
+ * All the volume set options for tier are expecting a positive
+ * Integer. Change the function accordingly if this constraint is
+ * changed.
+ */
+
+ ret = gf_string2int (value, &origin_val);
+ if (ret) {
+ snprintf (errstr, sizeof (errstr), "%s is not a compatible "
+ "value. %s expects an integer value.",
+ value, key);
+ gf_log (this->name, GF_LOG_ERROR, "%s", errstr);
+ *op_errstr = gf_strdup (errstr);
+ ret = -1;
+ goto out;
+ }
+
+ if (strstr ("cluster.tier-promote-frequency", key) ||
+ strstr ("cluster.tier-demote-frequency", key)) {
+ if (origin_val < 1) {
+ snprintf (errstr, sizeof (errstr), "%s is not a "
+ "compatible value. %s expects a positive "
+ "integer value.",
+ value, key);
+ gf_log (this->name, GF_LOG_ERROR, "%s", errstr);
+ *op_errstr = gf_strdup (errstr);
+ ret = -1;
+ goto out;
+ }
+ } else {
+ if (origin_val < 0) {
+ snprintf (errstr, sizeof (errstr), "%s is not a "
+ "compatible value. %s expects a non-negative"
+ " integer value.",
+ value, key);
+ gf_log (this->name, GF_LOG_ERROR, "%s", errstr);
+ *op_errstr = gf_strdup (errstr);
+ ret = -1;
+ goto out;
+ }
+ }
+
+out:
+ gf_log (this->name, GF_LOG_DEBUG, "Returning %d", ret);
+
+ return ret;
+}
+
+static int
validate_cache_max_min_size (glusterd_volinfo_t *volinfo, dict_t *dict,
char *key, char *value, char **op_errstr)
{
@@ -1753,25 +1823,29 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.voltype = "cluster/tier",
.option = "write-freq-threshold",
.op_version = GD_OP_VERSION_3_7_0,
- .flags = OPT_FLAG_CLIENT_OPT
+ .flags = OPT_FLAG_CLIENT_OPT,
+ .validate_fn = validate_tier
},
{ .key = "cluster.read-freq-threshold",
.voltype = "cluster/tier",
.option = "read-freq-threshold",
.op_version = GD_OP_VERSION_3_7_0,
- .flags = OPT_FLAG_CLIENT_OPT
+ .flags = OPT_FLAG_CLIENT_OPT,
+ .validate_fn = validate_tier
},
{ .key = "cluster.tier-promote-frequency",
.voltype = "cluster/tier",
.option = "tier-promote-frequency",
.op_version = GD_OP_VERSION_3_7_0,
- .flags = OPT_FLAG_CLIENT_OPT
+ .flags = OPT_FLAG_CLIENT_OPT,
+ .validate_fn = validate_tier
},
{ .key = "cluster.tier-demote-frequency",
.voltype = "cluster/tier",
.option = "tier-demote-frequency",
.op_version = GD_OP_VERSION_3_7_0,
- .flags = OPT_FLAG_CLIENT_OPT
+ .flags = OPT_FLAG_CLIENT_OPT,
+ .validate_fn = validate_tier
},
{ .key = "features.ctr-enabled",
.voltype = "features/changetimerecorder",