openstack/swift
Code Issues Proposed changes

Merge "use a context manager to apply --no-auto-shard option"

Browse Source
This commit is contained in:
Zuul 2021-08-20 18:58:43 +00:00 committed by Gerrit Code Review
commit f190ba2b7d
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
swift/container/sharder.py
View File

@ -25,6 +25,7 @@ import os
import six import six
from six.moves.urllib.parse import quote from six.moves.urllib.parse import quote
from eventlet import Timeout from eventlet import Timeout
from contextlib import contextmanager
from swift.common import internal_client from swift.common import internal_client
from swift.common.constraints import check_drive, AUTO_CREATE_ACCOUNT_PREFIX from swift.common.constraints import check_drive, AUTO_CREATE_ACCOUNT_PREFIX
@ -2127,29 +2128,35 @@ class ContainerSharder(ContainerSharderConf, ContainerReplicator):
self._report_stats() self._report_stats()
@contextmanager
def _set_auto_shard_from_command_line(self, **kwargs): def _set_auto_shard_from_command_line(self, **kwargs):
conf_auto_shard = self.auto_shard
auto_shard = kwargs.get('auto_shard', None) auto_shard = kwargs.get('auto_shard', None)
if auto_shard is not None: if auto_shard is not None:
self.auto_shard = config_true_value(auto_shard) self.auto_shard = config_true_value(auto_shard)
try:
yield
finally:
self.auto_shard = conf_auto_shard
def run_forever(self, *args, **kwargs): def run_forever(self, *args, **kwargs):
"""Run the container sharder until stopped.""" """Run the container sharder until stopped."""
self._set_auto_shard_from_command_line(**kwargs) with self._set_auto_shard_from_command_line(**kwargs):
self.reported = time.time() self.reported = time.time()
time.sleep(random() * self.interval) time.sleep(random() * self.interval)
while True: while True:
begin = time.time() begin = time.time()
try: try:
self._one_shard_cycle(devices_to_shard=Everything(), self._one_shard_cycle(devices_to_shard=Everything(),
partitions_to_shard=Everything()) partitions_to_shard=Everything())
except (Exception, Timeout): except (Exception, Timeout):
self.logger.increment('errors') self.logger.increment('errors')
self.logger.exception('Exception in sharder') self.logger.exception('Exception in sharder')
elapsed = time.time() - begin elapsed = time.time() - begin
self.logger.info( self.logger.info(
'Container sharder cycle completed: %.02fs', elapsed) 'Container sharder cycle completed: %.02fs', elapsed)
if elapsed < self.interval: if elapsed < self.interval:
time.sleep(self.interval - elapsed) time.sleep(self.interval - elapsed)
def run_once(self, *args, **kwargs): def run_once(self, *args, **kwargs):
"""Run the container sharder once.""" """Run the container sharder once."""
@ -2157,10 +2164,10 @@ class ContainerSharder(ContainerSharderConf, ContainerReplicator):
override_options = parse_override_options(once=True, **kwargs) override_options = parse_override_options(once=True, **kwargs)
devices_to_shard = override_options.devices or Everything() devices_to_shard = override_options.devices or Everything()
partitions_to_shard = override_options.partitions or Everything() partitions_to_shard = override_options.partitions or Everything()
self._set_auto_shard_from_command_line(**kwargs) with self._set_auto_shard_from_command_line(**kwargs):
begin = self.reported = time.time() begin = self.reported = time.time()
self._one_shard_cycle(devices_to_shard=devices_to_shard, self._one_shard_cycle(devices_to_shard=devices_to_shard,
partitions_to_shard=partitions_to_shard) partitions_to_shard=partitions_to_shard)
elapsed = time.time() - begin elapsed = time.time() - begin
self.logger.info( self.logger.info(
'Container sharder "once" mode completed: %.02fs', elapsed) 'Container sharder "once" mode completed: %.02fs', elapsed)