openstack/swift
Code Issues Proposed changes

SSYNC: Remove useless self.failures in sender

Browse Source 
Change-Id: Ie5264af0bf2a8d557489c597c3fdc5728e69c6e8
This commit is contained in:
Romain LE DISEZ 2018-10-22 11:49:30 +02:00
parent 24bf5eea8c
commit 46c6fab1cf
2 changed files with 1 additions and 23 deletions

6
swift/obj/ssync_sender.py

@ -98,7 +98,6 @@ class Sender(object):
# send_map has an entry for each object that the receiver wants to
# be sync'ed; each entry maps an object hash => dict of wanted parts
self.send_map = {}
self.failures = 0
def __call__(self):
"""
@ -133,10 +132,7 @@ class Sender(object):
set(self.send_map.keys()))
can_delete_obj = dict((hash_, self.available_map[hash_])
for hash_ in in_sync_hashes)
if not self.failures:
return True, can_delete_obj
else:
return False, {}
return True, can_delete_obj
except (exceptions.MessageTimeout,
exceptions.ReplicationException) as err:
self.daemon.logger.error(

18
test/unit/obj/test_ssync_sender.py

@ -175,21 +175,6 @@ class TestSender(BaseTest):
self.sender.updates.assert_called_once_with()
self.sender.disconnect.assert_called_once_with()
def test_call_calls_others_returns_failure(self):
self.sender.suffixes = ['abc']
self.sender.connect = mock.MagicMock()
self.sender.missing_check = mock.MagicMock()
self.sender.updates = mock.MagicMock()
self.sender.disconnect = mock.MagicMock()
self.sender.failures = 1
success, candidates = self.sender()
self.assertFalse(success)
self.assertEqual(candidates, {})
self.sender.connect.assert_called_once_with()
self.sender.missing_check.assert_called_once_with()
self.sender.updates.assert_called_once_with()
self.sender.disconnect.assert_called_once_with()
def test_connect(self):
node = dict(replication_ip='1.2.3.4', replication_port=5678,
device='sda1', index=0)
@ -477,7 +462,6 @@ class TestSender(BaseTest):
found_put = True
self.assertFalse(found_post)
self.assertTrue(found_put)
self.assertEqual(self.sender.failures, 0)
def test_call_and_missing_check(self):
def yield_hashes(device, partition, policy, suffixes=None, **kwargs):
@ -513,7 +497,6 @@ class TestSender(BaseTest):
self.assertEqual(candidates,
dict([('9d41d8cd98f00b204e9800998ecf0abc',
{'ts_data': Timestamp(1380144470.00000)})]))
self.assertEqual(self.sender.failures, 0)
def test_call_and_missing_check_with_obj_list(self):
def yield_hashes(device, partition, policy, suffixes=None, **kwargs):
@ -547,7 +530,6 @@ class TestSender(BaseTest):
self.assertEqual(candidates,
dict([('9d41d8cd98f00b204e9800998ecf0abc',
{'ts_data': Timestamp(1380144470.00000)})]))
self.assertEqual(self.sender.failures, 0)
def test_call_and_missing_check_with_obj_list_but_required(self):
def yield_hashes(device, partition, policy, suffixes=None, **kwargs):