actions/opensearch-pyd
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

It's REtries, not tries, respect that

Browse Source
This commit is contained in:
Honza Kral
2013-05-24 01:45:15 +02:00
parent b1e6c4d6a7
commit a7a3d660b5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
elasticsearch/transport.py
+2 -2
View File
@@ -211,7 +211,7 @@ class Transport(object):
if body: if body:
body = self.serializer.dumps(body) body = self.serializer.dumps(body)
for attempt in range(self.max_retries): for attempt in range(self.max_retries + 1):
connection, dead_count = self.get_connection() connection, dead_count = self.get_connection()
try: try:
@@ -220,7 +220,7 @@ class Transport(object):
self.mark_dead(connection, dead_count + 1) self.mark_dead(connection, dead_count + 1)
# raise exception on last retry # raise exception on last retry
if attempt + 1 == self.max_retries: if attempt == self.max_retries:
raise raise
else: else:
# resurrected connection didn't fail, confirm it's live status # resurrected connection didn't fail, confirm it's live status
test_elasticsearch/test_transport.py
+2 -2
View File
@@ -62,7 +62,7 @@ class TestTransport(TestCase):
t = Transport([{'exception': ConnectionError('abandon ship')}], connection_class=DummyConnection) t = Transport([{'exception': ConnectionError('abandon ship')}], connection_class=DummyConnection)
self.assertRaises(ConnectionError, t.perform_request, 'GET', '/') self.assertRaises(ConnectionError, t.perform_request, 'GET', '/')
self.assertEquals(3, len(t.get_connection()[0].calls)) self.assertEquals(4, len(t.get_connection()[0].calls))
def test_failed_connection_will_be_marked_as_dead(self): def test_failed_connection_will_be_marked_as_dead(self):
t = Transport([{'exception': ConnectionError('abandon ship')}], connection_class=DummyConnection) t = Transport([{'exception': ConnectionError('abandon ship')}], connection_class=DummyConnection)
@@ -102,7 +102,7 @@ class TestTransport(TestCase):
def test_sniff_on_fail_triggers_sniffing_on_fail(self): def test_sniff_on_fail_triggers_sniffing_on_fail(self):
t = Transport([{'exception': ConnectionError('abandon ship')}, {"data": CLUSTER_NODES}], t = Transport([{'exception': ConnectionError('abandon ship')}, {"data": CLUSTER_NODES}],
connection_class=DummyConnection, sniff_on_connection_fail=True, max_retries=1, randomize_hosts=False) connection_class=DummyConnection, sniff_on_connection_fail=True, max_retries=0, randomize_hosts=False)
self.assertRaises(ConnectionError, t.perform_request, 'GET', '/') self.assertRaises(ConnectionError, t.perform_request, 'GET', '/')
self.assertEquals(1, len(t.connection_pool.connections)) self.assertEquals(1, len(t.connection_pool.connections))