andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

geo-rep: Fix entries and metadata counters in geo-rep status

Browse Source 
Entries counter was incremented twice and decremented only
once. And entries count was being used in place of metadata
entries. This patch fixes both of them.

Backport of:
 > Patch: https://review.gluster.org/22603
 > BUG: 1512093
 > Change-Id: I5601a5fe8d25c9d65b72eb529171e7117ebbb67f
 > Signed-off-by: Kotresh HR <khiremat@redhat.com>
  (cherry picked from commit e0a6941af6ed352911698012ada895d1296b549e)

fixes: bz#1709685
Change-Id: I5601a5fe8d25c9d65b72eb529171e7117ebbb67f
Signed-off-by: Kotresh HR <khiremat@redhat.com>
This commit is contained in:
Kotresh HR 2019-04-23 10:45:25 +05:30 committed by Amar Tumballi
parent 84b2d08081
commit 4a4710b810
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
geo-replication/syncdaemon/master.py
View File

@ -1170,7 +1170,6 @@ class GMasterChangelogMixin(GMasterCommon):
logging.debug('entries: %s' % repr(entries))
# Increment counters for Status
self.status.inc_value("entry", len(entries))
self.files_in_batch += len(datas)
self.status.inc_value("data", len(datas))
@ -1233,10 +1232,10 @@ class GMasterChangelogMixin(GMasterCommon):
continue
meta_entries.append(edct('META', go=go[0], stat=st))
if meta_entries:
self.status.inc_value("meta", len(entries))
self.status.inc_value("meta", len(meta_entries))
failures = self.slave.server.meta_ops(meta_entries)
self.log_failures(failures, 'go', '', 'META')
self.status.dec_value("meta", len(entries))
self.status.dec_value("meta", len(meta_entries))
self.batch_stats["META_SYNC_TIME"] += time.time() - meta_start_time