openstack
/
swift
Code Issues Proposed changes

Merge "sharder: Send broker path as referer when updating root"

This commit is contained in:
Zuul 2021-06-03 12:41:15 +00:00 committed by Gerrit Code Review
parent 4f96fe5a84 e495c3bbef
commit 5bc28a7feb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swift/container/sharder.py
View File

@ -1894,7 +1894,8 @@ class ContainerSharder(ContainerSharderConf, ContainerReplicator):
include_deleted=True) include_deleted=True)
# send everything # send everything
if self._send_shard_ranges( if self._send_shard_ranges(
broker.root_account, broker.root_container, shard_ranges): broker.root_account, broker.root_container, shard_ranges,
{'Referer': quote(broker.path)}):
# on success, mark ourselves as reported so we don't keep # on success, mark ourselves as reported so we don't keep
# hammering the root # hammering the root
own_shard_range.reported = True own_shard_range.reported = True

5
test/unit/container/test_sharder.py
View File

@ -4755,12 +4755,14 @@ class TestSharder(BaseTestSharder):
def check_shard_ranges_sent(self, broker, expected_sent): def check_shard_ranges_sent(self, broker, expected_sent):
bodies = [] bodies = []
servers = [] servers = []
referers = []
def capture_send(conn, data): def capture_send(conn, data):
bodies.append(data) bodies.append(data)
def capture_connect(host, port, *a, **kw): def capture_connect(host, port, _method, _path, headers, *a, **kw):
servers.append((host, port)) servers.append((host, port))
referers.append(headers.get('Referer'))
self.assertFalse(broker.get_own_shard_range().reported) # sanity self.assertFalse(broker.get_own_shard_range().reported) # sanity
with self._mock_sharder() as sharder: with self._mock_sharder() as sharder:
@ -4779,6 +4781,7 @@ class TestSharder(BaseTestSharder):
('10.0.1.1', 1101), ('10.0.1.1', 1101),
('10.0.1.2', 1102), ('10.0.1.2', 1102),
]) ])
self.assertEqual([broker.path] * 3, referers)
self.assertTrue(broker.get_own_shard_range().reported) self.assertTrue(broker.get_own_shard_range().reported)
def test_update_root_container_own_range(self): def test_update_root_container_own_range(self):