From beca3d718bbb0851ffa0d07199a4779f50d19fdc Mon Sep 17 00:00:00 2001 From: Kotresh HR Date: Tue, 22 Dec 2015 12:29:32 +0530 Subject: geo-rep: Fix getting subvol count Tiering doesn't support disperse volume as hot tier, hence xml output doesn't give 'hotdisperseCount'. Remove the usage of 'hotdisperseCount' in geo-rep and return 0 instead. BUG: 1293309 Change-Id: I3f50d21cb51db91e31faebf69af4f72360420b73 Signed-off-by: Kotresh HR Reviewed-on: http://review.gluster.org/13062 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Aravinda VK Reviewed-on: http://review.gluster.org/13068 --- geo-replication/syncdaemon/monitor.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geo-replication/syncdaemon/monitor.py b/geo-replication/syncdaemon/monitor.py index a7978993035..cabb982349d 100644 --- a/geo-replication/syncdaemon/monitor.py +++ b/geo-replication/syncdaemon/monitor.py @@ -146,7 +146,10 @@ class Volinfo(object): def disperse_count(self, tier, hot): if (tier and hot): - return int(self.get('hotBricks/hotdisperseCount')[0].text) + # Tiering doesn't support disperse volume as hot brick, + # hence no xml output, so returning 0. In case, if it's + # supported later, we should change here. + return 0 elif (tier and not hot): return int(self.get('coldBricks/colddisperseCount')[0].text) else: -- cgit