diff options
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/cluster/dht/src/dht-common.c | 62 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht-common.h | 1 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht-rebalance.c | 6 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht-shared.c | 13 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-set.c | 5 |
5 files changed, 71 insertions, 16 deletions
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index 83aa9a26f4f..545c4796673 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -1920,25 +1920,51 @@ dht_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, "Entry %s missing on subvol %s", loc->path, prev->this->name); - if (conf->search_unhashed == GF_DHT_LOOKUP_UNHASHED_ON) { - local->op_errno = ENOENT; - dht_lookup_everywhere (frame, this, loc); - return 0; - } - if ((conf->search_unhashed == GF_DHT_LOOKUP_UNHASHED_AUTO) && - (loc->parent)) { + /* lookup-optimize supercedes lookup-unhashed settings, + * - so if it is set, do not process search_unhashed + * - except, in the case of rebalance deamon, we want to + * force the lookup_everywhere behavior */ + if (!conf->defrag && conf->lookup_optimize && loc->parent) { ret = dht_inode_ctx_layout_get (loc->parent, this, &parent_layout); - if (ret || !parent_layout) - goto out; - if (parent_layout->commit_hash - != conf->vol_commit_hash) { - gf_log (this->name, GF_LOG_DEBUG, - "hashes don't match, do global lookup"); + if (ret || !parent_layout || + (parent_layout->commit_hash != + conf->vol_commit_hash)) { + gf_msg_debug (this->name, 0, + "hashes don't match (ret - %d," + " parent_layout - %p, parent_hash - %x," + " vol_hash - %x), do global lookup", + ret, parent_layout, + (parent_layout ? + parent_layout->commit_hash : -1), + conf->vol_commit_hash); + local->op_errno = ENOENT; + dht_lookup_everywhere (frame, this, loc); + return 0; + } + } else { + if (conf->search_unhashed == + GF_DHT_LOOKUP_UNHASHED_ON) { local->op_errno = ENOENT; dht_lookup_everywhere (frame, this, loc); return 0; } + + if ((conf->search_unhashed == + GF_DHT_LOOKUP_UNHASHED_AUTO) && + (loc->parent)) { + ret = dht_inode_ctx_layout_get (loc->parent, + this, + &parent_layout); + if (ret || !parent_layout) + goto out; + if (parent_layout->search_unhashed) { + local->op_errno = ENOENT; + dht_lookup_everywhere (frame, this, + loc); + return 0; + } + } } } @@ -5797,7 +5823,15 @@ dht_mkdir (call_frame_t *frame, xlator_t *this, goto err; } - local->layout->commit_hash = conf->vol_commit_hash; + /* set the newly created directory hash to the commit hash + * if the configuration option is set. If configuration option + * is not set, the older clients may still be connecting to the + * volume and hence we need to preserve the 1 in disk[0] part of the + * layout xattr */ + if (conf->lookup_optimize) + local->layout->commit_hash = conf->vol_commit_hash; + else + local->layout->commit_hash = DHT_LAYOUT_HASH_INVALID; STACK_WIND (frame, dht_mkdir_hashed_cbk, hashed_subvol, diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h index 96f99141a59..87c0fa55898 100644 --- a/xlators/cluster/dht/src/dht-common.h +++ b/xlators/cluster/dht/src/dht-common.h @@ -393,6 +393,7 @@ struct dht_conf { dht_layout_t **file_layouts; dht_layout_t **dir_layouts; gf_boolean_t search_unhashed; + gf_boolean_t lookup_optimize; int gen; dht_du_t *du_stats; double min_free_disk; diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index 92ebd02f995..49e0f879381 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -2357,8 +2357,10 @@ gf_defrag_settle_hash (xlator_t *this, gf_defrag_info_t *defrag, return -1; } - if (conf->local_subvols_cnt == 0) { - /* Commit hash updates are only done on local subvolumes + if (conf->local_subvols_cnt == 0 || !conf->lookup_optimize) { + /* Commit hash updates are only done on local subvolumes and + * only when lookup optmization is needed (for older client + * support) */ return 0; } diff --git a/xlators/cluster/dht/src/dht-shared.c b/xlators/cluster/dht/src/dht-shared.c index 8a15fb2a2b9..b8f42fb145b 100644 --- a/xlators/cluster/dht/src/dht-shared.c +++ b/xlators/cluster/dht/src/dht-shared.c @@ -426,6 +426,9 @@ dht_reconfigure (xlator_t *this, dict_t *options) } } + GF_OPTION_RECONF ("lookup-optimize", conf->lookup_optimize, options, + bool, out); + GF_OPTION_RECONF ("min-free-disk", conf->min_free_disk, options, percent_or_size, out); /* option can be any one of percent or bytes */ @@ -662,6 +665,8 @@ dht_init (xlator_t *this) conf->search_unhashed = GF_DHT_LOOKUP_UNHASHED_AUTO; } + GF_OPTION_INIT ("lookup-optimize", conf->lookup_optimize, bool, err); + GF_OPTION_INIT ("unhashed-sticky-bit", conf->unhashed_sticky_bit, bool, err); @@ -833,6 +838,14 @@ struct volume_options options[] = { "from the hash subvolume. If set to OFF, it does not do a lookup " "on the remaining subvolumes." }, + { .key = {"lookup-optimize"}, + .type = GF_OPTION_TYPE_BOOL, + .default_value = "off", + .description = "This option if set to ON enables the optimization " + "of -ve lookups, by not doing a lookup on non-hashed subvolumes for " + "files, in case the hashed subvolume does not return any result. " + "This option disregards the lookup-unhashed setting, when enabled." + }, { .key = {"min-free-disk"}, .type = GF_OPTION_TYPE_PERCENT_OR_SIZET, .default_value = "10%", diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index a09a9d64c7c..cdcb594258f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -328,6 +328,11 @@ struct volopt_map_entry glusterd_volopt_map[] = { .op_version = 1, .flags = OPT_FLAG_CLIENT_OPT }, + { .key = "cluster.lookup-optimize", + .voltype = "cluster/distribute", + .op_version = GD_OP_VERSION_3_7_1, + .flags = OPT_FLAG_CLIENT_OPT + }, { .key = "cluster.min-free-disk", .voltype = "cluster/distribute", .op_version = 1, |