openstack/swift
Code Issues Proposed changes

Merge "Continue logging deprecation warnings for run_pause"

Browse Source
This commit is contained in:
Zuul
2020-11-06 00:24:34 +00:00
committed by Gerrit Code Review
parent 14bd6b916d 2b1eec79f6
commit 622bae72f1
3 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
swift/common/db_replicator.py
View File

@@ -198,12 +198,20 @@ class Replicator(Daemon):
self.max_diffs = int(conf.get('max_diffs') or 100)
self.interval = int(conf.get('interval') or
conf.get('run_pause') or 30)
if 'run_pause' in conf and 'interval' not in conf:
self.logger.warning('Option %(type)s-replicator/run_pause '
'is deprecated and will be removed in a '
'future version. Update your configuration'
' to use option %(type)s-replicator/'
'interval.'
if 'run_pause' in conf:
if 'interval' in conf:
self.logger.warning(
'Option %(type)s-replicator/run_pause is deprecated '
'and %(type)s-replicator/interval is already configured. '
'You can safely remove run_pause; it is now ignored and '
'will be removed in a future version.'
% {'type': self.server_type})
else:
self.logger.warning(
'Option %(type)s-replicator/run_pause is deprecated '
'and will be removed in a future version. '
'Update your configuration to use option '
'%(type)s-replicator/interval.'
% {'type': self.server_type})
self.databases_per_second = float(
conf.get('databases_per_second', 50))

19
swift/obj/reconstructor.py
View File

@@ -168,12 +168,19 @@ class ObjectReconstructor(Daemon):
self.partition_times = []
self.interval = int(conf.get('interval') or
conf.get('run_pause') or 30)
if 'run_pause' in conf and 'interval' not in conf:
self.logger.warning('Option object-reconstructor/run_pause '
'is deprecated and will be removed in a '
'future version. Update your configuration'
' to use option object-reconstructor/'
'interval.')
if 'run_pause' in conf:
if 'interval' in conf:
self.logger.warning(
'Option object-reconstructor/run_pause is deprecated and '
'object-reconstructor/interval is already configured. '
'You can safely remove run_pause; it is now ignored and '
'will be removed in a future version.')
else:
self.logger.warning(
'Option object-reconstructor/run_pause is deprecated '
'and will be removed in a future version. '
'Update your configuration to use option '
'object-reconstructor/interval.')
self.http_timeout = int(conf.get('http_timeout', 60))
self.lockup_timeout = int(conf.get('lockup_timeout', 1800))
self.recon_cache_path = conf.get('recon_cache_path',

18
swift/obj/replicator.py
View File

@@ -148,12 +148,18 @@ class ObjectReplicator(Daemon):
self.partition_times = []
self.interval = int(conf.get('interval') or
conf.get('run_pause') or 30)
if 'run_pause' in conf and 'interval' not in conf:
self.logger.warning('Option object-replicator/run_pause '
'is deprecated and will be removed in a '
'future version. Update your configuration'
' to use option object-replicator/'
'interval.')
if 'run_pause' in conf:
if 'interval' in conf:
self.logger.warning(
'Option object-replicator/run_pause is deprecated and '
'object-replicator/interval is already configured. You '
'can safely remove run_pause; it is now ignored and will '
'be removed in a future version.')
else:
self.logger.warning(
'Option object-replicator/run_pause is deprecated and '
'will be removed in a future version. Update your '
'configuration to use option object-replicator/interval.')
self.rsync_timeout = int(conf.get('rsync_timeout',
DEFAULT_RSYNC_TIMEOUT))
self.rsync_io_timeout = conf.get('rsync_io_timeout', '30')