X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ec9df4864de8033b4efd8b1cecfd1875fefc303e..ebb2559b3a09636ff687316bbe512e0e8a86b168:/sdk/python/tests/test_keep_client.py?ds=sidebyside diff --git a/sdk/python/tests/test_keep_client.py b/sdk/python/tests/test_keep_client.py index fa82dcc920..85b5bc81f0 100644 --- a/sdk/python/tests/test_keep_client.py +++ b/sdk/python/tests/test_keep_client.py @@ -110,7 +110,7 @@ class KeepTestCase(run_test_server.TestCaseWithServers): locator, '^b9a772c7049325feb7130fff1f8333e9\+9', 'wrong md5 hash from Keep.put for "test_head": ' + locator) - self.assertEqual("true", self.keep_client.head(locator)) + self.assertEqual(True, self.keep_client.head(locator)) self.assertEqual(self.keep_client.get(locator), 'test_head', 'wrong content from Keep.get for "test_head"') @@ -240,8 +240,8 @@ class KeepProxyTestCase(run_test_server.TestCaseWithServers): super(KeepProxyTestCase, self).tearDown() def test_KeepProxyTest1(self): - # Will use ARVADOS_KEEP_PROXY environment variable that is set by - # setUpClass(). + # Will use ARVADOS_KEEP_SERVICES environment variable that + # is set by setUpClass(). keep_client = arvados.KeepClient(api_client=self.api_client, local_store='') baz_locator = keep_client.put('baz') @@ -270,6 +270,22 @@ class KeepProxyTestCase(run_test_server.TestCaseWithServers): 'wrong content from Keep.get(md5("baz2"))') self.assertTrue(keep_client.using_proxy) + def test_KeepProxyTestMultipleURIs(self): + # Test using ARVADOS_KEEP_SERVICES env var overriding any + # existing proxy setting and setting multiple proxies + arvados.config.settings()['ARVADOS_KEEP_SERVICES'] = 'http://10.0.0.1 https://foo.example.org:1234/' + keep_client = arvados.KeepClient(api_client=self.api_client, + local_store='') + uris = [x['_service_root'] for x in keep_client._keep_services] + self.assertEqual(uris, ['http://10.0.0.1/', + 'https://foo.example.org:1234/']) + + def test_KeepProxyTestInvalidURI(self): + arvados.config.settings()['ARVADOS_KEEP_SERVICES'] = 'bad.uri.org' + with self.assertRaises(arvados.errors.ArgumentError): + keep_client = arvados.KeepClient(api_client=self.api_client, + local_store='') + class KeepClientServiceTestCase(unittest.TestCase, tutil.ApiClientMock): def get_service_roots(self, api_client): @@ -793,10 +809,10 @@ class KeepClientTimeout(unittest.TestCase, tutil.ApiClientMock): # Allow 10s to connect, then 1s for response. Nothing should # work, and everything should take at least 1s to return. kc = self.keepClient(timeouts=(10, 1)) - with self.assertTakesBetween(1, 1.9): + with self.assertTakesBetween(1, 9): with self.assertRaises(arvados.errors.KeepReadError): kc.get(loc, num_retries=0) - with self.assertTakesBetween(1, 1.9): + with self.assertTakesBetween(1, 9): with self.assertRaises(arvados.errors.KeepWriteError): kc.put(self.DATA, copies=1, num_retries=0) @@ -827,7 +843,7 @@ class KeepClientGatewayTestCase(unittest.TestCase, tutil.ApiClientMock): self.assertEqual('foo', self.keepClient.get(locator)) self.assertEqual(self.gateway_roots[0]+locator, MockCurl.return_value.getopt(pycurl.URL)) - self.assertEqual("true", self.keepClient.head(locator)) + self.assertEqual(True, self.keepClient.head(locator)) @mock.patch('pycurl.Curl') def test_get_with_gateway_hints_in_order(self, MockCurl): @@ -893,7 +909,7 @@ class KeepClientGatewayTestCase(unittest.TestCase, tutil.ApiClientMock): code=200, body='foo', headers={'Content-Length': 3}) self.mock_disks_and_gateways() locator = 'acbd18db4cc2f85cedef654fccc4a4d8+3+K@xyzzy' - self.assertEqual("true", self.keepClient.head(locator)) + self.assertEqual(True, self.keepClient.head(locator)) self.assertEqual('https://keep.xyzzy.arvadosapi.com/'+locator, MockCurl.return_value.getopt(pycurl.URL)) @@ -1014,7 +1030,7 @@ class KeepClientRetryGetTestCase(KeepClientRetryTestMixin, unittest.TestCase): @tutil.skip_sleep class KeepClientRetryHeadTestCase(KeepClientRetryTestMixin, unittest.TestCase): - DEFAULT_EXPECT = "true" + DEFAULT_EXPECT = True DEFAULT_EXCEPTION = arvados.errors.KeepReadError HINTED_LOCATOR = KeepClientRetryTestMixin.TEST_LOCATOR + '+K@xyzzy' TEST_PATCHER = staticmethod(tutil.mock_keep_responses) @@ -1065,6 +1081,76 @@ class KeepClientRetryPutTestCase(KeepClientRetryTestMixin, unittest.TestCase): self.check_exception(copies=2, num_retries=3) +class AvoidOverreplication(unittest.TestCase, tutil.ApiClientMock): + + class FakeKeepService(object): + def __init__(self, delay, will_succeed=False, will_raise=None, replicas=1): + self.delay = delay + self.will_succeed = will_succeed + self.will_raise = will_raise + self._result = {} + self._result['headers'] = {} + self._result['headers']['x-keep-replicas-stored'] = str(replicas) + self._result['body'] = 'foobar' + + def put(self, data_hash, data, timeout): + time.sleep(self.delay) + if self.will_raise is not None: + raise self.will_raise + return self.will_succeed + + def last_result(self): + if self.will_succeed: + return self._result + + def finished(self): + return False + + def setUp(self): + self.copies = 3 + self.pool = arvados.KeepClient.KeepWriterThreadPool( + data = 'foo', + data_hash = 'acbd18db4cc2f85cedef654fccc4a4d8+3', + max_service_replicas = self.copies, + copies = self.copies + ) + + def test_only_write_enough_on_success(self): + for i in range(10): + ks = self.FakeKeepService(delay=i/10.0, will_succeed=True) + self.pool.add_task(ks, None) + self.pool.join() + self.assertEqual(self.pool.done(), self.copies) + + def test_only_write_enough_on_partial_success(self): + for i in range(5): + ks = self.FakeKeepService(delay=i/10.0, will_succeed=False) + self.pool.add_task(ks, None) + ks = self.FakeKeepService(delay=i/10.0, will_succeed=True) + self.pool.add_task(ks, None) + self.pool.join() + self.assertEqual(self.pool.done(), self.copies) + + def test_only_write_enough_when_some_crash(self): + for i in range(5): + ks = self.FakeKeepService(delay=i/10.0, will_raise=Exception()) + self.pool.add_task(ks, None) + ks = self.FakeKeepService(delay=i/10.0, will_succeed=True) + self.pool.add_task(ks, None) + self.pool.join() + self.assertEqual(self.pool.done(), self.copies) + + def test_fail_when_too_many_crash(self): + for i in range(self.copies+1): + ks = self.FakeKeepService(delay=i/10.0, will_raise=Exception()) + self.pool.add_task(ks, None) + for i in range(self.copies-1): + ks = self.FakeKeepService(delay=i/10.0, will_succeed=True) + self.pool.add_task(ks, None) + self.pool.join() + self.assertEqual(self.pool.done(), self.copies-1) + + @tutil.skip_sleep class RetryNeedsMultipleServices(unittest.TestCase, tutil.ApiClientMock): # Test put()s that need two distinct servers to succeed, possibly @@ -1079,14 +1165,14 @@ class RetryNeedsMultipleServices(unittest.TestCase, tutil.ApiClientMock): 'acbd18db4cc2f85cedef654fccc4a4d8+3', Exception('mock err'), 200, 200) as req_mock: self.keep_client.put('foo', num_retries=1, copies=2) - self.assertTrue(3, req_mock.call_count) + self.assertEqual(3, req_mock.call_count) def test_success_after_retryable_error(self): with tutil.mock_keep_responses( 'acbd18db4cc2f85cedef654fccc4a4d8+3', 500, 200, 200) as req_mock: self.keep_client.put('foo', num_retries=1, copies=2) - self.assertTrue(3, req_mock.call_count) + self.assertEqual(3, req_mock.call_count) def test_fail_after_final_error(self): # First retry loop gets a 200 (can't achieve replication by @@ -1097,4 +1183,4 @@ class RetryNeedsMultipleServices(unittest.TestCase, tutil.ApiClientMock): 200, 400, 200) as req_mock: with self.assertRaises(arvados.errors.KeepWriteError): self.keep_client.put('foo', num_retries=1, copies=2) - self.assertTrue(2, req_mock.call_count) + self.assertEqual(2, req_mock.call_count)