diff options
| author | Zuul <zuul@review.openstack.org> | 2018-04-23 23:19:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-04-23 23:19:24 +0000 |
| commit | 4c14c9abfd35f9deddc849e8da1836bcce968252 (patch) | |
| tree | 9ac9f68500feeeea60dd9ac4bb3f922f7795ba81 | |
| parent | 0079fa70ad38dbadb137dba71ee0cfa35191aa95 (diff) | |
| parent | 6bbea803192c99cfb0dc42c41cfd42531ef1202a (diff) | |
| download | swift-4c14c9abfd35f9deddc849e8da1836bcce968252.tar.gz | |
Merge "Remove TODO's re leader election" into feature/deep
| -rw-r--r-- | swift/container/sharder.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/swift/container/sharder.py b/swift/container/sharder.py index 42a2fd200..2a4e56ba2 100644 --- a/swift/container/sharder.py +++ b/swift/container/sharder.py @@ -912,8 +912,6 @@ class ContainerSharder(ContainerReplicator): self._increment_stat('scanned', 'failure', statsd=True) return 0 - # TODO: if we bring back leader election, this is about the spot where - # we should confirm we're still the scanner shard_ranges = make_shard_ranges( broker, shard_data, self.shards_account_prefix) broker.merge_shard_ranges(shard_ranges) @@ -1294,9 +1292,6 @@ class ContainerSharder(ContainerReplicator): # have new objects sitting in them that may need to move. return - # TODO: bring back leader election (maybe?); if so make it - # on-demand since we may not need to know if we are leader for all - # states is_leader = node['index'] == 0 and self.auto_shard if state in (UNSHARDED, COLLAPSED): if is_leader and broker.is_root_container(): |