X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4110970a34689ed526c3365e9b64a784fba7efda..5f93585b16f2b5ac9c2e86f8dea876b310cbcf57:/sdk/python/tests/test_keep_client.py diff --git a/sdk/python/tests/test_keep_client.py b/sdk/python/tests/test_keep_client.py index c44379bac7..a73ca84211 100644 --- a/sdk/python/tests/test_keep_client.py +++ b/sdk/python/tests/test_keep_client.py @@ -332,39 +332,150 @@ class KeepClientServiceTestCase(unittest.TestCase, tutil.ApiClientMock): mock.responses[0].getopt(pycurl.TIMEOUT_MS), int(arvados.KeepClient.DEFAULT_PROXY_TIMEOUT[1]*1000)) - def test_probe_order_reference_set(self): + def check_no_services_error(self, verb, exc_class): + api_client = mock.MagicMock(name='api_client') + api_client.keep_services().accessible().execute.side_effect = ( + arvados.errors.ApiError) + keep_client = arvados.KeepClient(api_client=api_client) + with self.assertRaises(exc_class) as err_check: + getattr(keep_client, verb)('d41d8cd98f00b204e9800998ecf8427e+0') + self.assertEqual(0, len(err_check.exception.request_errors())) + + def test_get_error_with_no_services(self): + self.check_no_services_error('get', arvados.errors.KeepReadError) + + def test_put_error_with_no_services(self): + self.check_no_services_error('put', arvados.errors.KeepWriteError) + + def check_errors_from_last_retry(self, verb, exc_class): + api_client = self.mock_keep_services(count=2) + req_mock = tutil.mock_keep_responses( + "retry error reporting test", 500, 500, 403, 403) + with req_mock, tutil.skip_sleep, \ + self.assertRaises(exc_class) as err_check: + keep_client = arvados.KeepClient(api_client=api_client) + getattr(keep_client, verb)('d41d8cd98f00b204e9800998ecf8427e+0', + num_retries=3) + self.assertEqual([403, 403], [ + getattr(error, 'status_code', None) + for error in err_check.exception.request_errors().itervalues()]) + + def test_get_error_reflects_last_retry(self): + self.check_errors_from_last_retry('get', arvados.errors.KeepReadError) + + def test_put_error_reflects_last_retry(self): + self.check_errors_from_last_retry('put', arvados.errors.KeepWriteError) + + def test_put_error_does_not_include_successful_puts(self): + data = 'partial failure test' + data_loc = '{}+{}'.format(hashlib.md5(data).hexdigest(), len(data)) + api_client = self.mock_keep_services(count=3) + with tutil.mock_keep_responses(data_loc, 200, 500, 500) as req_mock, \ + self.assertRaises(arvados.errors.KeepWriteError) as exc_check: + keep_client = arvados.KeepClient(api_client=api_client) + keep_client.put(data) + self.assertEqual(2, len(exc_check.exception.request_errors())) + + def test_proxy_put_with_no_writable_services(self): + data = 'test with no writable services' + data_loc = '{}+{}'.format(hashlib.md5(data).hexdigest(), len(data)) + api_client = self.mock_keep_services(service_type='proxy', read_only=True, count=1) + with tutil.mock_keep_responses(data_loc, 200, 500, 500) as req_mock, \ + self.assertRaises(arvados.errors.KeepWriteError) as exc_check: + keep_client = arvados.KeepClient(api_client=api_client) + keep_client.put(data) + self.assertEqual(True, ("no Keep services available" in str(exc_check.exception))) + self.assertEqual(0, len(exc_check.exception.request_errors())) + + +@tutil.skip_sleep +class KeepClientRendezvousTestCase(unittest.TestCase, tutil.ApiClientMock): + + def setUp(self): # expected_order[i] is the probe order for # hash=md5(sprintf("%064x",i)) where there are 16 services # with uuid sprintf("anything-%015x",j) with j in 0..15. E.g., # the first probe for the block consisting of 64 "0" # characters is the service whose uuid is # "zzzzz-bi6l4-000000000000003", so expected_order[0][0]=='3'. - expected_order = [ + self.services = 16 + self.expected_order = [ list('3eab2d5fc9681074'), list('097dba52e648f1c3'), list('c5b4e023f8a7d691'), list('9d81c02e76a3bf54'), ] - hashes = [ - hashlib.md5("{:064x}".format(x)).hexdigest() - for x in range(len(expected_order))] - api_client = self.mock_keep_services(count=16) - keep_client = arvados.KeepClient(api_client=api_client) - for i, hash in enumerate(hashes): - roots = keep_client.weighted_service_roots(arvados.KeepLocator(hash)) + self.blocks = [ + "{:064x}".format(x) + for x in range(len(self.expected_order))] + self.hashes = [ + hashlib.md5(self.blocks[x]).hexdigest() + for x in range(len(self.expected_order))] + self.api_client = self.mock_keep_services(count=self.services) + self.keep_client = arvados.KeepClient(api_client=self.api_client) + + def test_weighted_service_roots_against_reference_set(self): + # Confirm weighted_service_roots() returns the correct order + for i, hash in enumerate(self.hashes): + roots = self.keep_client.weighted_service_roots(arvados.KeepLocator(hash)) got_order = [ re.search(r'//\[?keep0x([0-9a-f]+)', root).group(1) for root in roots] - self.assertEqual(expected_order[i], got_order) + self.assertEqual(self.expected_order[i], got_order) + + def test_get_probe_order_against_reference_set(self): + self._test_probe_order_against_reference_set( + lambda i: self.keep_client.get(self.hashes[i], num_retries=1)) + + def test_put_probe_order_against_reference_set(self): + # copies=1 prevents the test from being sensitive to races + # between writer threads. + self._test_probe_order_against_reference_set( + lambda i: self.keep_client.put(self.blocks[i], num_retries=1, copies=1)) + + def _test_probe_order_against_reference_set(self, op): + for i in range(len(self.blocks)): + with tutil.mock_keep_responses('', *[500 for _ in range(self.services*2)]) as mock, \ + self.assertRaises(arvados.errors.KeepRequestError): + op(i) + got_order = [ + re.search(r'//\[?keep0x([0-9a-f]+)', resp.getopt(pycurl.URL)).group(1) + for resp in mock.responses] + self.assertEqual(self.expected_order[i]*2, got_order) + + def test_put_probe_order_multiple_copies(self): + for copies in range(2, 4): + for i in range(len(self.blocks)): + with tutil.mock_keep_responses('', *[500 for _ in range(self.services*3)]) as mock, \ + self.assertRaises(arvados.errors.KeepWriteError): + self.keep_client.put(self.blocks[i], num_retries=2, copies=copies) + got_order = [ + re.search(r'//\[?keep0x([0-9a-f]+)', resp.getopt(pycurl.URL)).group(1) + for resp in mock.responses] + for pos, expected in enumerate(self.expected_order[i]*3): + # With C threads racing to make requests, the + # position of a given server in the sequence of + # HTTP requests (got_order) should be within C-1 + # positions of that server's position in the + # reference probe sequence (expected_order). + close_enough = False + for diff in range(1-copies, copies): + if 0 <= pos+diff < len(got_order): + if expected == got_order[pos+diff]: + close_enough = True + self.assertEqual( + True, close_enough, + "With copies={}, got {}, expected {}".format( + copies, repr(got_order), repr(self.expected_order[i]*3))) def test_probe_waste_adding_one_server(self): hashes = [ hashlib.md5("{:064x}".format(x)).hexdigest() for x in range(100)] initial_services = 12 - api_client = self.mock_keep_services(count=initial_services) - keep_client = arvados.KeepClient(api_client=api_client) + self.api_client = self.mock_keep_services(count=initial_services) + self.keep_client = arvados.KeepClient(api_client=self.api_client) probes_before = [ - keep_client.weighted_service_roots(arvados.KeepLocator(hash)) for hash in hashes] + self.keep_client.weighted_service_roots(arvados.KeepLocator(hash)) for hash in hashes] for added_services in range(1, 12): api_client = self.mock_keep_services(count=initial_services+added_services) keep_client = arvados.KeepClient(api_client=api_client) @@ -402,7 +513,7 @@ class KeepClientServiceTestCase(unittest.TestCase, tutil.ApiClientMock): data = hashlib.md5(data).hexdigest() + '+1234' # Arbitrary port number: aport = random.randint(1024,65535) - api_client = self.mock_keep_services(service_port=aport, count=16) + api_client = self.mock_keep_services(service_port=aport, count=self.services) keep_client = arvados.KeepClient(api_client=api_client) with mock.patch('pycurl.Curl') as curl_mock, \ self.assertRaises(exc_class) as err_check: @@ -419,60 +530,6 @@ class KeepClientServiceTestCase(unittest.TestCase, tutil.ApiClientMock): def test_put_error_shows_probe_order(self): self.check_64_zeros_error_order('put', arvados.errors.KeepWriteError) - def check_no_services_error(self, verb, exc_class): - api_client = mock.MagicMock(name='api_client') - api_client.keep_services().accessible().execute.side_effect = ( - arvados.errors.ApiError) - keep_client = arvados.KeepClient(api_client=api_client) - with self.assertRaises(exc_class) as err_check: - getattr(keep_client, verb)('d41d8cd98f00b204e9800998ecf8427e+0') - self.assertEqual(0, len(err_check.exception.request_errors())) - - def test_get_error_with_no_services(self): - self.check_no_services_error('get', arvados.errors.KeepReadError) - - def test_put_error_with_no_services(self): - self.check_no_services_error('put', arvados.errors.KeepWriteError) - - def check_errors_from_last_retry(self, verb, exc_class): - api_client = self.mock_keep_services(count=2) - req_mock = tutil.mock_keep_responses( - "retry error reporting test", 500, 500, 403, 403) - with req_mock, tutil.skip_sleep, \ - self.assertRaises(exc_class) as err_check: - keep_client = arvados.KeepClient(api_client=api_client) - getattr(keep_client, verb)('d41d8cd98f00b204e9800998ecf8427e+0', - num_retries=3) - self.assertEqual([403, 403], [ - getattr(error, 'status_code', None) - for error in err_check.exception.request_errors().itervalues()]) - - def test_get_error_reflects_last_retry(self): - self.check_errors_from_last_retry('get', arvados.errors.KeepReadError) - - def test_put_error_reflects_last_retry(self): - self.check_errors_from_last_retry('put', arvados.errors.KeepWriteError) - - def test_put_error_does_not_include_successful_puts(self): - data = 'partial failure test' - data_loc = '{}+{}'.format(hashlib.md5(data).hexdigest(), len(data)) - api_client = self.mock_keep_services(count=3) - with tutil.mock_keep_responses(data_loc, 200, 500, 500) as req_mock, \ - self.assertRaises(arvados.errors.KeepWriteError) as exc_check: - keep_client = arvados.KeepClient(api_client=api_client) - keep_client.put(data) - self.assertEqual(2, len(exc_check.exception.request_errors())) - - def test_proxy_put_with_no_writable_services(self): - data = 'test with no writable services' - data_loc = '{}+{}'.format(hashlib.md5(data).hexdigest(), len(data)) - api_client = self.mock_keep_services(service_type='proxy', read_only=True, count=1) - with tutil.mock_keep_responses(data_loc, 200, 500, 500) as req_mock, \ - self.assertRaises(arvados.errors.KeepWriteError) as exc_check: - keep_client = arvados.KeepClient(api_client=api_client) - keep_client.put(data) - self.assertEqual(True, ("no Keep services available" in str(exc_check.exception))) - self.assertEqual(0, len(exc_check.exception.request_errors())) class KeepClientTimeout(unittest.TestCase, tutil.ApiClientMock): DATA = 'x' * 2**10