From d54f8d96f18f23568221e765e9cd2189f686af80 Mon Sep 17 00:00:00 2001 From: ankitraj Date: Wed, 2 Nov 2016 13:04:24 +0530 Subject: 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 Reviewed-on: http://review.gluster.org/15765 Tested-by: ankitraj CentOS-regression: Gluster Build System Smoke: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Raghavendra G --- xlators/cluster/dht/src/dht-rebalance.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'xlators/cluster/dht/src/dht-rebalance.c') 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 :-/ */ -- cgit