Verify a ConnectionError is reraised in that situation

elasticsearch/_async/transport.py

@@ -427,7 +427,7 @@ async def _do_verify_elasticsearch(self, headers, timeout):
 
  info_headers = {}
  info_response = {}
- info_error = None
+ error = None
 
  for conn in chain(self.connection_pool.connections, self.seed_connections):
  try:
@@ -455,15 +455,20 @@ async def _do_verify_elasticsearch(self, headers, timeout):
  "Elasticsearch due security privileges on the server side"
  ),
  ElasticsearchWarning,
- stacklevel=3,
+ stacklevel=4,
  )
  self._verified_elasticsearch = True
  return
 
  # This connection didn't work, we'll try another.
- except (ConnectionError, SerializationError):
- if info_error is None:
- info_error = info_error
+ except (ConnectionError, SerializationError) as err:
+ if error is None:
+ error = err
+
+ # If we received a connection error and weren't successful
+ # anywhere then we reraise the more appropriate error.
+ if error and not info_response:
+ raise error
 
  # Check the information we got back from the index request.
  _verify_elasticsearch(info_headers, info_response)

elasticsearch/transport.py

@@ -522,6 +522,7 @@ def _do_verify_elasticsearch(self, headers, timeout):
 
  info_headers = {}
  info_response = {}
+ error = None
 
  for conn in chain(self.connection_pool.connections, self.seed_connections):
  try:
@@ -549,14 +550,20 @@ def _do_verify_elasticsearch(self, headers, timeout):
  "Elasticsearch due security privileges on the server side"
  ),
  ElasticsearchWarning,
- stacklevel=3,
+ stacklevel=5,
  )
  self._verified_elasticsearch = True
  return
 
  # This connection didn't work, we'll try another.
- except (ConnectionError, SerializationError):
- pass
+ except (ConnectionError, SerializationError) as err:
+ if error is None:
+ error = err
+
+ # If we received a connection error and weren't successful
+ # anywhere then we reraise the more appropriate error.
+ if error and not info_response:
+ raise error
 
  # Check the information we got back from the index request.
  _verify_elasticsearch(info_headers, info_response)

test_elasticsearch/test_async/test_connection.py

@@ -28,7 +28,7 @@
 from mock import patch
 from multidict import CIMultiDict
 
-from elasticsearch import AIOHttpConnection, __versionstr__
+from elasticsearch import AIOHttpConnection, AsyncElasticsearch, __versionstr__
 from elasticsearch.compat import reraise_exceptions
 from elasticsearch.exceptions import ConnectionError
 
@@ -410,3 +410,9 @@ async def test_aiohttp_connection_error(self):
  conn = AIOHttpConnection("not.a.host.name")
  with pytest.raises(ConnectionError):
  await conn.perform_request("GET", "/")
+
+ async def test_elasticsearch_connection_error(self):
+ es = AsyncElasticsearch("http://not.a.host.name")
+
+ with pytest.raises(ConnectionError):
+ await es.search()

test_elasticsearch/test_connection.py

@@ -31,7 +31,7 @@
 from requests.auth import AuthBase
 from urllib3._collections import HTTPHeaderDict
 
-from elasticsearch import __versionstr__
+from elasticsearch import Elasticsearch, __versionstr__
 from elasticsearch.compat import reraise_exceptions
 from elasticsearch.connection import (
  Connection,
@@ -1045,3 +1045,9 @@ def test_requests_connection_error(self):
  conn = RequestsHttpConnection("not.a.host.name")
  with pytest.raises(ConnectionError):
  conn.perform_request("GET", "/")
+
+ def test_elasticsearch_connection_error(self):
+ es = Elasticsearch("http://not.a.host.name")
+
+ with pytest.raises(ConnectionError):
+ es.search()