summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorSusant Palai <spalai@redhat.com>2016-04-18 17:42:06 +0530
committerNiels de Vos <ndevos@redhat.com>2016-05-01 18:05:03 -0700
commit3ff1861546e619bb3c9dc155c55df5d6ee1a479e (patch)
tree9499e68566de0fab5b66a5715cce3a702f351bd9 /xlators
parent2f4733657b0a8439620b045fcb597838a818487a (diff)
glusterd: volume set changes for lock migration
Change-Id: I48c6f9cdda47503615ba65882acd5eedf0a70c89 BUG: 1326085 Signed-off-by: Susant Palai <spalai@redhat.com> Reviewed-on: http://review.gluster.org/14024 Smoke: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Niels de Vos <ndevos@redhat.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators')
-rw-r--r--xlators/cluster/dht/src/dht-common.h7
-rw-r--r--xlators/cluster/dht/src/dht-shared.c23
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-set.c57
3 files changed, 84 insertions, 3 deletions
diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h
index a240a72444d..0ef5c81a608 100644
--- a/xlators/cluster/dht/src/dht-common.h
+++ b/xlators/cluster/dht/src/dht-common.h
@@ -444,6 +444,9 @@ struct gf_defrag_info_ {
/* Hard link handle requirement */
synclock_t link_lock;
+
+ /* lock migration flag */
+ gf_boolean_t lock_migration_enabled;
};
typedef struct gf_defrag_info_ gf_defrag_info_t;
@@ -535,6 +538,10 @@ struct dht_conf {
*/
uint32_t vol_commit_hash;
gf_boolean_t vch_forced;
+
+ /* lock migration */
+
+ gf_boolean_t lock_migration_enabled;
};
typedef struct dht_conf dht_conf_t;
diff --git a/xlators/cluster/dht/src/dht-shared.c b/xlators/cluster/dht/src/dht-shared.c
index 856819ac052..0fea1d58e58 100644
--- a/xlators/cluster/dht/src/dht-shared.c
+++ b/xlators/cluster/dht/src/dht-shared.c
@@ -455,7 +455,13 @@ dht_reconfigure (xlator_t *this, dict_t *options)
GF_OPTION_RECONF ("rebal-throttle", conf->dthrottle, options,
str, out);
+ GF_OPTION_RECONF ("lock-migration", conf->lock_migration_enabled,
+ options, bool, out);
+
if (conf->defrag) {
+ conf->defrag->lock_migration_enabled =
+ conf->lock_migration_enabled;
+
GF_DECIDE_DEFRAG_THROTTLE_COUNT (throttle_count, conf);
gf_msg ("DHT", GF_LOG_INFO, 0,
DHT_MSG_REBAL_THROTTLE_INFO,
@@ -588,8 +594,6 @@ err:
return ret;
}
-
-
int
dht_init (xlator_t *this)
{
@@ -722,8 +726,14 @@ dht_init (xlator_t *this)
GF_OPTION_INIT ("readdir-optimize", conf->readdir_optimize, bool, err);
+
+ GF_OPTION_INIT ("lock-migration", conf->lock_migration_enabled,
+ bool, err);
+
if (defrag) {
- GF_OPTION_INIT ("rebalance-stats", defrag->stats, bool, err);
+ defrag->lock_migration_enabled = conf->lock_migration_enabled;
+
+ GF_OPTION_INIT ("rebalance-stats", defrag->stats, bool, err);
if (dict_get_str (this->options, "rebalance-filter", &temp_str)
== 0) {
if (gf_defrag_pattern_list_fill (this, defrag, temp_str)
@@ -1066,5 +1076,12 @@ struct volume_options options[] = {
"max of [($(processing units) - 4) / 2), 4]"
},
+ { .key = {"lock-migration"},
+ .type = GF_OPTION_TYPE_BOOL,
+ .default_value = "off",
+ .description = " If enabled this feature will migrate the posix locks"
+ " associated with a file during rebalance"
+ },
+
{ .key = {NULL} },
};
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index c9c3047b2de..5bb9d9077b5 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -816,6 +816,53 @@ validate_disperse_heal_enable_disable (glusterd_volinfo_t *volinfo,
return ret;
}
+static int
+validate_lock_migration_option (glusterd_volinfo_t *volinfo, dict_t *dict,
+ char *key, char *value, char **op_errstr)
+{
+ char errstr[2048] = "";
+ glusterd_conf_t *priv = NULL;
+ int ret = 0;
+ xlator_t *this = NULL;
+ gf_boolean_t b = _gf_false;
+
+ this = THIS;
+ GF_ASSERT (this);
+
+ if (volinfo->replica_count > 1 || volinfo->disperse_count ||
+ volinfo->type == GF_CLUSTER_TYPE_TIER) {
+ snprintf (errstr, sizeof (errstr), "Lock migration is "
+ "a experimental feature. Currently works with"
+ " pure distribute volume only");
+ ret = -1;
+
+ gf_msg (this->name, GF_LOG_ERROR, EINVAL,
+ GD_MSG_INVALID_ENTRY, "%s", errstr);
+
+ *op_errstr = gf_strdup (errstr);
+ goto out;
+ }
+
+ ret = gf_string2boolean (value, &b);
+ if (ret) {
+ snprintf (errstr, sizeof (errstr), "Invalid value"
+ " for volume set command. Use on/off only.");
+ ret = -1;
+
+ gf_msg (this->name, GF_LOG_ERROR, EINVAL,
+ GD_MSG_INVALID_ENTRY, "%s", errstr);
+
+ *op_errstr = gf_strdup (errstr);
+
+ goto out;
+ }
+
+ gf_msg_debug (this->name, 0, "Returning %d", ret);
+
+out:
+ return ret;
+}
+
/* dispatch table for VOLUME SET
* -----------------------------
*
@@ -951,6 +998,16 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.validate_fn = validate_defrag_throttle_option,
.flags = OPT_FLAG_CLIENT_OPT,
},
+
+ { .key = "cluster.lock-migration",
+ .voltype = "cluster/distribute",
+ .option = "lock-migration",
+ .value = "off",
+ .op_version = GD_OP_VERSION_3_8_0,
+ .validate_fn = validate_lock_migration_option,
+ .flags = OPT_FLAG_CLIENT_OPT,
+ },
+
/* NUFA xlator options (Distribute special case) */
{ .key = "cluster.nufa",
.voltype = "cluster/distribute",