diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-09-14 22:30:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-09-14 22:30:35 +0000 |
| commit | 322c8551cd3934ef09a8b5e5f23af6ae2f7755cf (patch) | |
| tree | cbfe1b4a26614ca65974a56f1566682767411935 /swift/common/db_replicator.py | |
| parent | 00aa07249407a118be2b0029ec403d59aa12c000 (diff) | |
| parent | 8e59dfbee2a67f84a1fd1d5cc1679ec514255fdc (diff) | |
| download | swift-322c8551cd3934ef09a8b5e5f23af6ae2f7755cf.tar.gz | |
Merge "Log remote_merges during DB replication"
Diffstat (limited to 'swift/common/db_replicator.py')
| -rw-r--r-- | swift/common/db_replicator.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/swift/common/db_replicator.py b/swift/common/db_replicator.py index c8a87bf8b..cb93d8a1c 100644 --- a/swift/common/db_replicator.py +++ b/swift/common/db_replicator.py @@ -221,9 +221,9 @@ class Replicator(Daemon): 'replication_last': now}, self.rcache, self.logger) self.logger.info(' '.join(['%s:%s' % item for item in - self.stats.items() if item[0] in + sorted(self.stats.items()) if item[0] in ('no_change', 'hashmatch', 'rsync', 'diff', 'ts_repl', - 'empty', 'diff_capped')])) + 'empty', 'diff_capped', 'remote_merge')])) def _add_failure_stats(self, failure_devs_info): for node, dev in failure_devs_info: |