summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/dht/src/dht-selfheal.c
diff options
context:
space:
mode:
authorN Balachandran <nbalacha@redhat.com>2016-09-06 11:13:20 +0530
committerJeff Darcy <jdarcy@redhat.com>2016-09-08 12:00:50 -0700
commit2209f6d49bc8d16beed52b1d145be936d2da941a (patch)
tree9171a3efed1bd0ad427ae6f910fea3de4c4449dc /xlators/cluster/dht/src/dht-selfheal.c
parentb86a7de9b5ea9dcd0a630dbe09fce6d9ad0d8944 (diff)
cluster/dht: Skip layout overlap maximization on weighted rebalance
dht_selfheal_layout_maximize_overlap () does not consider chunk sizes while calculating overlaps. Temporarily enabling this operation if only if weighted rebalance is disabled or all bricks are the same size. Change-Id: I5ed16cdff2551b826a1759ca8338921640bfc7b3 BUG: 1366494 Signed-off-by: N Balachandran <nbalacha@redhat.com> Reviewed-on: http://review.gluster.org/15403 Smoke: Gluster Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Raghavendra G <rgowdapp@redhat.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Diffstat (limited to 'xlators/cluster/dht/src/dht-selfheal.c')
-rw-r--r--xlators/cluster/dht/src/dht-selfheal.c25
1 files changed, 21 insertions, 4 deletions
diff --git a/xlators/cluster/dht/src/dht-selfheal.c b/xlators/cluster/dht/src/dht-selfheal.c
index ca75224..bd4c236 100644
--- a/xlators/cluster/dht/src/dht-selfheal.c
+++ b/xlators/cluster/dht/src/dht-selfheal.c
@@ -1702,6 +1702,7 @@ dht_fix_layout_of_directory (call_frame_t *frame, loc_t *loc,
dht_local_t *local = NULL;
uint32_t subvol_down = 0;
int ret = 0;
+ gf_boolean_t maximize_overlap = _gf_true;
this = frame->this;
priv = this->private;
@@ -1748,9 +1749,18 @@ dht_fix_layout_of_directory (call_frame_t *frame, loc_t *loc,
"subvolume %d (%s): %u chunks", i,
priv->subvolumes[i]->name,
priv->du_stats[i].chunks);
+
+ /* Maximize overlap if the bricks are all the same
+ * size.
+ * This is probably not going to be very common on
+ * live setups but will benefit our regression tests
+ */
+ if (i && (priv->du_stats[i].chunks
+ != priv->du_stats[0].chunks)) {
+ maximize_overlap = _gf_false;
+ }
}
- }
- else {
+ } else {
gf_msg (this->name, GF_LOG_WARNING, 0,
DHT_MSG_NO_DISK_USAGE_STATUS, "no du stats ?!?");
}
@@ -1760,9 +1770,16 @@ dht_fix_layout_of_directory (call_frame_t *frame, loc_t *loc,
dht_layout_sort_volname (new_layout);
dht_selfheal_layout_new_directory (frame, loc, new_layout);
- /* Now selectively re-assign ranges only when it helps */
- dht_selfheal_layout_maximize_overlap (frame, loc, new_layout, layout);
+ /* Maximize overlap if weighted-rebalance is disabled */
+ if (!priv->do_weighting)
+ maximize_overlap = _gf_true;
+
+ /* Now selectively re-assign ranges only when it helps */
+ if (maximize_overlap) {
+ dht_selfheal_layout_maximize_overlap (frame, loc, new_layout,
+ layout);
+ }
done:
if (new_layout) {
/* Now that the new layout has all the proper layout, change the