openstack/swift
Code Issues Proposed changes

Wait on greenthreads before unmocking http_connect

Browse Source 
The fake_spawn() context manager wraps spawn and waits
for greenthreads to complete (such as the async_update threads).
The wait needs to be done before http_connect is un-mocked, so
the fake_spawn context manager should exit *before* any context
manager that mocks the http_connect method.

Also add fake_spawn to _test_PUT_then_POST_async_pendings()

Related-Bug: #1536376
Related-Bug: #1514111
Closes-Bug: #1555739

Change-Id: I15f36e191cfe3ee6c82b4be56e8618ec0230e328
This commit is contained in:
Alistair Coles
2016-03-10 18:02:44 +00:00
parent 902cb8f8d7
commit 0bc5a69d41
1 changed files with 60 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
test/unit/obj/test_server.py
View File

@@ -729,9 +729,10 @@ class TestObjectController(unittest.TestCase):
environ={'REQUEST_METHOD': 'PUT'}, environ={'REQUEST_METHOD': 'PUT'},
headers=put_headers, body='test') headers=put_headers, body='test')
with mock.patch('swift.obj.server.http_connect', fake_http_connect): with mock.patch('swift.obj.server.http_connect', fake_http_connect), \
with mock.patch('swift.common.utils.HASH_PATH_PREFIX', ''): mock.patch('swift.common.utils.HASH_PATH_PREFIX', ''), \
resp = req.get_response(self.object_controller) fake_spawn():
resp = req.get_response(self.object_controller)
self.assertEqual(resp.status_int, 201) self.assertEqual(resp.status_int, 201)
@@ -772,9 +773,10 @@ class TestObjectController(unittest.TestCase):
environ={'REQUEST_METHOD': 'POST'}, environ={'REQUEST_METHOD': 'POST'},
headers=post_headers) headers=post_headers)
with mock.patch('swift.obj.server.http_connect', fake_http_connect): with mock.patch('swift.obj.server.http_connect', fake_http_connect), \
with mock.patch('swift.common.utils.HASH_PATH_PREFIX', ''): mock.patch('swift.common.utils.HASH_PATH_PREFIX', ''), \
resp = req.get_response(self.object_controller) fake_spawn():
resp = req.get_response(self.object_controller)
self.assertEqual(resp.status_int, 202) self.assertEqual(resp.status_int, 202)
@@ -836,10 +838,10 @@ class TestObjectController(unittest.TestCase):
os.listdir(os.path.join( os.listdir(os.path.join(
device_dir, diskfile.get_async_dir(policy)))) device_dir, diskfile.get_async_dir(policy))))
def test_PUT_then_POST_async_updates_with_repl_policy(self): def test_PUT_then_POST_async_pendings_with_repl_policy(self):
self._test_PUT_then_POST_async_pendings(POLICIES[0]) self._test_PUT_then_POST_async_pendings(POLICIES[0])
def test_PUT_then_POST_async_updates_with_EC_policy(self): def test_PUT_then_POST_async_pendings_with_EC_policy(self):
self._test_PUT_then_POST_async_pendings( self._test_PUT_then_POST_async_pendings(
POLICIES[1], update_etag='override_etag') POLICIES[1], update_etag='override_etag')
@@ -1964,10 +1966,10 @@ class TestObjectController(unittest.TestCase):
'X-Container-Timestamp': '1', 'X-Container-Timestamp': '1',
'Content-Type': 'application/new1', 'Content-Type': 'application/new1',
'Content-Length': '0'}) 'Content-Length': '0'})
with fake_spawn(), mock.patch.object( with mock.patch.object(
object_server, 'http_connect', object_server, 'http_connect', mock_http_connect(201)):
mock_http_connect(201)): with fake_spawn():
resp = req.get_response(self.object_controller) resp = req.get_response(self.object_controller)
self.assertEqual(resp.status_int, 201) self.assertEqual(resp.status_int, 201)
timestamp = normalize_timestamp(time()) timestamp = normalize_timestamp(time())
req = Request.blank( req = Request.blank(
@@ -1980,10 +1982,10 @@ class TestObjectController(unittest.TestCase):
'X-Container-Timestamp': '1', 'X-Container-Timestamp': '1',
'Content-Type': 'application/new1', 'Content-Type': 'application/new1',
'Content-Length': '0'}) 'Content-Length': '0'})
with fake_spawn(), mock.patch.object( with mock.patch.object(
object_server, 'http_connect', object_server, 'http_connect', mock_http_connect(500)):
mock_http_connect(500)): with fake_spawn():
resp = req.get_response(self.object_controller) resp = req.get_response(self.object_controller)
self.assertEqual(resp.status_int, 201) self.assertEqual(resp.status_int, 201)
timestamp = normalize_timestamp(time()) timestamp = normalize_timestamp(time())
req = Request.blank( req = Request.blank(
@@ -1996,10 +1998,11 @@ class TestObjectController(unittest.TestCase):
'X-Container-Timestamp': '1', 'X-Container-Timestamp': '1',
'Content-Type': 'application/new1', 'Content-Type': 'application/new1',
'Content-Length': '0'}) 'Content-Length': '0'})
with fake_spawn(), mock.patch.object( with mock.patch.object(
object_server, 'http_connect', object_server, 'http_connect',
mock_http_connect(500, with_exc=True)): mock_http_connect(500, with_exc=True)):
resp = req.get_response(self.object_controller) with fake_spawn():
resp = req.get_response(self.object_controller)
self.assertEqual(resp.status_int, 201) self.assertEqual(resp.status_int, 201)
def test_PUT_ssync_multi_frag(self): def test_PUT_ssync_multi_frag(self):
@@ -3198,10 +3201,10 @@ class TestObjectController(unittest.TestCase):
'X-Container-Device': 'sda1', 'X-Container-Device': 'sda1',
'X-Container-Partition': 'p', 'X-Container-Partition': 'p',
'Content-Type': 'text/plain'}) 'Content-Type': 'text/plain'})
with fake_spawn(), mocked_http_conn( with mocked_http_conn(200, give_connect=capture_updates) as fake_conn:
200, give_connect=capture_updates) as fake_conn: with fake_spawn():
resp = req.get_response(self.object_controller) resp = req.get_response(self.object_controller)
self.assertRaises(StopIteration, fake_conn.code_iter.next) self.assertRaises(StopIteration, fake_conn.code_iter.next)
self.assertEqual(resp.status_int, 201) self.assertEqual(resp.status_int, 201)
self.assertEqual(1, len(container_updates)) self.assertEqual(1, len(container_updates))
for update in container_updates: for update in container_updates:
@@ -3237,10 +3240,10 @@ class TestObjectController(unittest.TestCase):
'X-Container-Device': 'sda1', 'X-Container-Device': 'sda1',
'X-Container-Partition': 'p', 'X-Container-Partition': 'p',
'Content-Type': 'text/html'}) 'Content-Type': 'text/html'})
with fake_spawn(), mocked_http_conn( with mocked_http_conn(200, give_connect=capture_updates) as fake_conn:
200, give_connect=capture_updates) as fake_conn: with fake_spawn():
resp = req.get_response(self.object_controller) resp = req.get_response(self.object_controller)
self.assertRaises(StopIteration, fake_conn.code_iter.next) self.assertRaises(StopIteration, fake_conn.code_iter.next)
self.assertEqual(resp.status_int, 201) self.assertEqual(resp.status_int, 201)
self.assertEqual(1, len(container_updates)) self.assertEqual(1, len(container_updates))
for update in container_updates: for update in container_updates:
@@ -3275,10 +3278,10 @@ class TestObjectController(unittest.TestCase):
'X-Container-Device': 'sda1', 'X-Container-Device': 'sda1',
'X-Container-Partition': 'p', 'X-Container-Partition': 'p',
'Content-Type': 'text/enriched'}) 'Content-Type': 'text/enriched'})
with fake_spawn(), mocked_http_conn( with mocked_http_conn(200, give_connect=capture_updates) as fake_conn:
200, give_connect=capture_updates) as fake_conn: with fake_spawn():
resp = req.get_response(self.object_controller) resp = req.get_response(self.object_controller)
self.assertRaises(StopIteration, fake_conn.code_iter.next) self.assertRaises(StopIteration, fake_conn.code_iter.next)
self.assertEqual(resp.status_int, 201) self.assertEqual(resp.status_int, 201)
self.assertEqual(1, len(container_updates)) self.assertEqual(1, len(container_updates))
for update in container_updates: for update in container_updates:
@@ -3313,10 +3316,10 @@ class TestObjectController(unittest.TestCase):
'X-Container-Host': '10.0.0.1:8080', 'X-Container-Host': '10.0.0.1:8080',
'X-Container-Device': 'sda1', 'X-Container-Device': 'sda1',
'X-Container-Partition': 'p'}) 'X-Container-Partition': 'p'})
with fake_spawn(), mocked_http_conn( with mocked_http_conn(200, give_connect=capture_updates) as fake_conn:
200, give_connect=capture_updates) as fake_conn: with fake_spawn():
resp = req.get_response(self.object_controller) resp = req.get_response(self.object_controller)
self.assertRaises(StopIteration, fake_conn.code_iter.next) self.assertRaises(StopIteration, fake_conn.code_iter.next)
self.assertEqual(resp.status_int, 204) self.assertEqual(resp.status_int, 204)
self.assertEqual(1, len(container_updates)) self.assertEqual(1, len(container_updates))
for update in container_updates: for update in container_updates:
@@ -3344,10 +3347,10 @@ class TestObjectController(unittest.TestCase):
'X-Container-Host': '10.0.0.1:8080', 'X-Container-Host': '10.0.0.1:8080',
'X-Container-Device': 'sda1', 'X-Container-Device': 'sda1',
'X-Container-Partition': 'p'}) 'X-Container-Partition': 'p'})
with fake_spawn(), mocked_http_conn( with mocked_http_conn(200, give_connect=capture_updates) as fake_conn:
200, give_connect=capture_updates) as fake_conn: with fake_spawn():
resp = req.get_response(self.object_controller) resp = req.get_response(self.object_controller)
self.assertRaises(StopIteration, fake_conn.code_iter.next) self.assertRaises(StopIteration, fake_conn.code_iter.next)
self.assertEqual(resp.status_int, 404) self.assertEqual(resp.status_int, 404)
self.assertEqual(1, len(container_updates)) self.assertEqual(1, len(container_updates))
for update in container_updates: for update in container_updates:
@@ -3813,9 +3816,10 @@ class TestObjectController(unittest.TestCase):
'X-Delete-At-Partition': '6237', 'X-Delete-At-Partition': '6237',
'X-Delete-At-Device': 'sdp,sdq'}) 'X-Delete-At-Device': 'sdp,sdq'})
with fake_spawn(), mock.patch.object( with mock.patch.object(
object_server, 'http_connect', fake_http_connect): object_server, 'http_connect', fake_http_connect):
resp = req.get_response(self.object_controller) with fake_spawn():
resp = req.get_response(self.object_controller)
self.assertEqual(resp.status_int, 201) self.assertEqual(resp.status_int, 201)
@@ -3925,9 +3929,10 @@ class TestObjectController(unittest.TestCase):
'X-Container-Host': '1.2.3.4:5, 6.7.8.9:10', 'X-Container-Host': '1.2.3.4:5, 6.7.8.9:10',
'X-Container-Device': 'sdb1, sdf1'}) 'X-Container-Device': 'sdb1, sdf1'})
with fake_spawn(), mock.patch.object( with mock.patch.object(
object_server, 'http_connect', fake_http_connect): object_server, 'http_connect', fake_http_connect):
req.get_response(self.object_controller) with fake_spawn():
req.get_response(self.object_controller)
http_connect_args.sort(key=operator.itemgetter('ipaddr')) http_connect_args.sort(key=operator.itemgetter('ipaddr'))
@@ -4002,10 +4007,11 @@ class TestObjectController(unittest.TestCase):
headers['X-Object-Sysmeta-Ec-Frag-Index'] = '2' headers['X-Object-Sysmeta-Ec-Frag-Index'] = '2'
req = Request.blank( req = Request.blank(
'/sda1/p/a/c/o', method='PUT', body='', headers=headers) '/sda1/p/a/c/o', method='PUT', body='', headers=headers)
with fake_spawn(), mocked_http_conn( with mocked_http_conn(
500, 500, give_connect=capture_updates) as fake_conn: 500, 500, give_connect=capture_updates) as fake_conn:
resp = req.get_response(self.object_controller) with fake_spawn():
self.assertRaises(StopIteration, fake_conn.code_iter.next) resp = req.get_response(self.object_controller)
self.assertRaises(StopIteration, fake_conn.code_iter.next)
self.assertEqual(resp.status_int, 201) self.assertEqual(resp.status_int, 201)
self.assertEqual(2, len(container_updates)) self.assertEqual(2, len(container_updates))
delete_at_update, container_update = container_updates delete_at_update, container_update = container_updates
@@ -4238,10 +4244,10 @@ class TestObjectController(unittest.TestCase):
'X-Container-Partition': 'cpartition', 'X-Container-Partition': 'cpartition',
'X-Container-Device': 'cdevice', 'X-Container-Device': 'cdevice',
'Content-Type': 'text/plain'}, body='') 'Content-Type': 'text/plain'}, body='')
with fake_spawn(), mocked_http_conn( with mocked_http_conn(200, give_connect=capture_updates) as fake_conn:
200, give_connect=capture_updates) as fake_conn: with fake_spawn():
resp = req.get_response(self.object_controller) resp = req.get_response(self.object_controller)
self.assertRaises(StopIteration, fake_conn.code_iter.next) self.assertRaises(StopIteration, fake_conn.code_iter.next)
self.assertEqual(resp.status_int, 201) self.assertEqual(resp.status_int, 201)
self.assertEqual(len(container_updates), 1) self.assertEqual(len(container_updates), 1)
ip, port, method, path, headers = container_updates[0] ip, port, method, path, headers = container_updates[0]
@@ -4279,10 +4285,10 @@ class TestObjectController(unittest.TestCase):
} }
req = Request.blank('/sda1/0/a/c/o', environ={'REQUEST_METHOD': 'PUT'}, req = Request.blank('/sda1/0/a/c/o', environ={'REQUEST_METHOD': 'PUT'},
headers=headers, body='') headers=headers, body='')
with fake_spawn(), mocked_http_conn( with mocked_http_conn(200, give_connect=capture_updates) as fake_conn:
200, give_connect=capture_updates) as fake_conn: with fake_spawn():
resp = req.get_response(self.object_controller) resp = req.get_response(self.object_controller)
self.assertRaises(StopIteration, fake_conn.code_iter.next) self.assertRaises(StopIteration, fake_conn.code_iter.next)
self.assertEqual(resp.status_int, 201) self.assertEqual(resp.status_int, 201)
self.assertEqual(len(container_updates), 1) self.assertEqual(len(container_updates), 1)
ip, port, method, path, headers = container_updates[0] ip, port, method, path, headers = container_updates[0]
@@ -4320,7 +4326,7 @@ class TestObjectController(unittest.TestCase):
given_args[:] = args given_args[:] = args
diskfile_mgr = self.object_controller._diskfile_router[policy] diskfile_mgr = self.object_controller._diskfile_router[policy]
diskfile_mgr.pickle_async_update = fake_pickle_async_update diskfile_mgr.pickle_async_update = fake_pickle_async_update
with fake_spawn(), mocked_http_conn(500) as fake_conn: with mocked_http_conn(500) as fake_conn, fake_spawn():
resp = req.get_response(self.object_controller) resp = req.get_response(self.object_controller)
self.assertRaises(StopIteration, fake_conn.code_iter.next) self.assertRaises(StopIteration, fake_conn.code_iter.next)
self.assertEqual(resp.status_int, 201) self.assertEqual(resp.status_int, 201)