summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorankitraj <anraj@redhat.com>2016-11-02 13:04:24 +0530
committerRaghavendra G <rgowdapp@redhat.com>2016-11-02 22:33:02 -0700
commitd54f8d96f18f23568221e765e9cd2189f686af80 (patch)
tree6db0d5de56335226219d2d1fa42eb361e08da2a8
parent78b0f84bc80336c876ccd8e240d39f648fb981a6 (diff)
dht: Proper log message if data migration is skipped
There was a misleading message from logs about available disk space while rebalancing of bricks while calculating free space. Bug: 1390870 Backprt of http://review.gluster.org/#/c/15345/ Change-Id: Ie9df0b2cbf00faaf13a0a3f0dbd657377a082755 Signed-off-by: ankitraj <anraj@redhat.com> Reviewed-on: http://review.gluster.org/15765 Tested-by: ankitraj CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
-rw-r--r--xlators/cluster/dht/src/dht-rebalance.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index 77f6ec2f823..59168d2fab9 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -714,14 +714,14 @@ __dht_check_free_space (xlator_t *to, xlator_t *from, loc_t *loc,
(src_statfs_blocks + stbuf->ia_blocks)) {
gf_msg (this->name, GF_LOG_WARNING, 0,
- DHT_MSG_MIGRATE_FILE_FAILED,
- "data movement attempted from node "
- "(%s:%"PRIu64") with higher disk space "
- "to a node (%s:%"PRIu64") with lesser "
- "disk space, file { blocks:%"PRIu64", "
- "name:(%s) }", from->name, src_statfs_blocks,
- to->name, dst_statfs_blocks,
- stbuf->ia_blocks, loc->path);
+ DHT_MSG_MIGRATE_FILE_FAILED,
+ "data movement of file "
+ "{blocks:%"PRIu64" name:(%s) } would result in "
+ "dst node (%s:%"PRIu64") having lower disk "
+ "space then the source node (%s:%"PRIu64")"
+ ".Skipping file.", stbuf->ia_blocks, loc->path,
+ to->name, dst_statfs_blocks, from->name,
+ src_statfs_blocks);
/* this is not a 'failure', but we don't want to
consider this as 'success' too :-/ */