openstack
/
swift
Code Issues Proposed changes

Merge "sharder: use ContainerBroker.has_other_shard_ranges() method"

This commit is contained in:
Zuul 2023-08-10 22:59:58 +00:00 committed by Gerrit Code Review
parent 5cd75ddfac 6d53010508
commit 730a394758
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swift/container/sharder.py
View File

@ -61,7 +61,7 @@ def sharding_enabled(broker):
# if broker has been marked deleted it will have lost sysmeta, but we still
# need to process the broker (for example, to shrink any shard ranges) so
# fallback to checking if it has any shard ranges
if broker.get_shard_ranges():
if broker.has_other_shard_ranges():
return True
return False
@ -2348,7 +2348,7 @@ class ContainerSharder(ContainerSharderConf, ContainerReplicator):
own_shard_range = broker.get_own_shard_range()
if own_shard_range.state in ShardRange.CLEAVING_STATES:
if broker.get_shard_ranges():
if broker.has_other_shard_ranges():
# container has been given shard ranges rather than
# found them e.g. via replication or a shrink event,
# or manually triggered cleaving.