diff options
| author | Sakshi Bansal <sabansal@redhat.com> | 2015-11-17 15:11:40 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2016-01-29 00:42:44 -0800 |
| commit | 93a7c2a0c36a2ac21c6fff23cb30d6ca784a7995 (patch) | |
| tree | 1566ddc8b6ea50558263e0204a7b616fedbada13 | |
| parent | c2fbcb6140585d9fc82367a9101857bf5d05d732 (diff) | |
dht : changing variable type to avoid overflow
For layout computation we find total size of the cluster
and store it in an unsigned 32 bit variable. For large
clusters this value may overflow which leads to wrong
computations and for some bricks the layout may overflow.
Hence using unsigned 64 bit to handle large values.
> Backport of http://review.gluster.org/12597
> Change-Id: I7c3ba26ea2c4158065ea9e74705a7ede1b6759c7
> BUG: 1282751
> Signed-off-by: Sakshi Bansal <sabansal@redhat.com>
> Reviewed-on: http://review.gluster.org/12597
> Reviewed-by: Susant Palai <spalai@redhat.com>
> Tested-by: NetBSD Build System <jenkins@build.gluster.org>
> Tested-by: Gluster Build System <jenkins@build.gluster.com>
> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
BUG: 1294969
Change-Id: Ia66587c6ae4aa3a25b3ac73920b514c1d3c4c2cb
Signed-off-by: Sakshi Bansal <sabansal@redhat.com>
Reviewed-on: http://review.gluster.org/13127
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
| -rw-r--r-- | xlators/cluster/dht/src/dht-selfheal.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/xlators/cluster/dht/src/dht-selfheal.c b/xlators/cluster/dht/src/dht-selfheal.c index cce963a18d6..72d936f55bd 100644 --- a/xlators/cluster/dht/src/dht-selfheal.c +++ b/xlators/cluster/dht/src/dht-selfheal.c @@ -1587,14 +1587,15 @@ dht_selfheal_layout_new_directory (call_frame_t *frame, loc_t *loc, dht_layout_t *layout) { xlator_t *this = NULL; - uint32_t chunk = 0; + double chunk = 0; int i = 0; uint32_t start = 0; int bricks_to_use = 0; int err = 0; int start_subvol = 0; uint32_t curr_size; - uint32_t total_size = 0; + uint32_t range_size; + uint64_t total_size = 0; int real_i; dht_conf_t *priv; gf_boolean_t weight_by_size; @@ -1627,9 +1628,9 @@ dht_selfheal_layout_new_directory (call_frame_t *frame, loc_t *loc, if (weight_by_size && total_size) { /* We know total_size is not zero. */ - chunk = ((unsigned long) 0xffffffff) / total_size; + chunk = ((double) 0xffffffff) / ((double) total_size); gf_msg_debug (this->name, 0, - "chunk size = 0xffffffff / %u = 0x%x", + "chunk size = 0xffffffff / %lu = %f", total_size, chunk); } else { @@ -1667,17 +1668,18 @@ dht_selfheal_layout_new_directory (call_frame_t *frame, loc_t *loc, else { curr_size = 1; } + range_size = chunk * curr_size; gf_msg_debug (this->name, 0, "assigning range size 0x%x to %s", - chunk * curr_size, + range_size, layout->list[i].xlator->name); - DHT_SET_LAYOUT_RANGE(layout, i, start, chunk * curr_size, + DHT_SET_LAYOUT_RANGE(layout, i, start, range_size, loc->path); if (++bricks_used >= bricks_to_use) { layout->list[i].stop = 0xffffffff; goto done; } - start += (chunk * curr_size); + start += range_size; } done: |