Fix timeout related parameters in the options() method

Author: miriam-eid

elasticsearch/_async/client/__init__.py

@@ -519,26 +519,36 @@ def options(
 
         if request_timeout is not DEFAULT:
             client._request_timeout = request_timeout
+        else:
+            client._request_timeout = self._request_timeout
 
         if ignore_status is not DEFAULT:
             if isinstance(ignore_status, int):
                 ignore_status = (ignore_status,)
             client._ignore_status = ignore_status
+        else:
+            client._ignore_status = self._ignore_status
 
         if max_retries is not DEFAULT:
             if not isinstance(max_retries, int):
                 raise TypeError("'max_retries' must be of type 'int'")
             client._max_retries = max_retries
+        else:
+            client._max_retries = self._max_retries
 
         if retry_on_status is not DEFAULT:
             if isinstance(retry_on_status, int):
                 retry_on_status = (retry_on_status,)
             client._retry_on_status = retry_on_status
+        else:
+            client._retry_on_status = self._retry_on_status
 
         if retry_on_timeout is not DEFAULT:
             if not isinstance(retry_on_timeout, bool):
                 raise TypeError("'retry_on_timeout' must be of type 'bool'")
             client._retry_on_timeout = retry_on_timeout
+        else:
+            client._retry_on_timeout = self._retry_on_timeout
 
         return client
 

elasticsearch/_sync/client/__init__.py

@@ -519,26 +519,36 @@ def options(
 
         if request_timeout is not DEFAULT:
             client._request_timeout = request_timeout
+        else:
+            client._request_timeout = self._request_timeout
 
         if ignore_status is not DEFAULT:
             if isinstance(ignore_status, int):
                 ignore_status = (ignore_status,)
             client._ignore_status = ignore_status
+        else:
+            client._ignore_status = self._ignore_status
 
         if max_retries is not DEFAULT:
             if not isinstance(max_retries, int):
                 raise TypeError("'max_retries' must be of type 'int'")
             client._max_retries = max_retries
+        else:
+            client._max_retries = self._max_retries
 
         if retry_on_status is not DEFAULT:
             if isinstance(retry_on_status, int):
                 retry_on_status = (retry_on_status,)
             client._retry_on_status = retry_on_status
+        else:
+            client._retry_on_status = self._retry_on_status
 
         if retry_on_timeout is not DEFAULT:
             if not isinstance(retry_on_timeout, bool):
                 raise TypeError("'retry_on_timeout' must be of type 'bool'")
             client._retry_on_timeout = retry_on_timeout
+        else:
+            client._retry_on_timeout = self._retry_on_timeout
 
         return client
 

test_elasticsearch/test_client/test_options.py

@@ -368,3 +368,104 @@ def test_user_agent_override(self):
             "user-agent": "custom4",
             "accept": "application/vnd.elasticsearch+json; compatible-with=8",
         }
+
+    def test_options_timeout_parameters(self):
+        client = Elasticsearch(
+            "http://localhost:9200",
+            transport_class=DummyTransport,
+            request_timeout=1,
+            max_retries=2,
+            retry_on_status=(404,),
+            retry_on_timeout=True,
+        )
+
+        # timeout parameters are preserved with .options()
+        client.options().indices.get(index="test")
+
+        calls = client.transport.calls
+        call = calls[("GET", "/test")][0]
+        assert call.pop("client_meta") is DEFAULT
+        assert call == {
+            "headers": {
+                "accept": "application/vnd.elasticsearch+json; compatible-with=8",
+            },
+            "body": None,
+            "request_timeout": 1,
+            "max_retries": 2,
+            "retry_on_status": (404,),
+            "retry_on_timeout": True,
+        }
+
+        client = Elasticsearch(
+            "http://localhost:9200",
+            transport_class=DummyTransport,
+            request_timeout=1,
+            max_retries=2,
+            retry_on_status=(404,),
+            retry_on_timeout=True,
+        )
+        client.options(
+            request_timeout=2,
+            max_retries=3,
+            retry_on_status=(400,),
+            retry_on_timeout=False,
+        ).indices.get(index="test")
+
+        calls = client.transport.calls
+        call = calls[("GET", "/test")][0]
+        assert call.pop("client_meta") is DEFAULT
+        assert call == {
+            "headers": {
+                "accept": "application/vnd.elasticsearch+json; compatible-with=8",
+            },
+            "body": None,
+            "request_timeout": 2,
+            "max_retries": 3,
+            "retry_on_status": (400,),
+            "retry_on_timeout": False,
+        }
+
+        client = Elasticsearch(
+            "http://localhost:9200",
+            transport_class=DummyTransport,
+        )
+        client.options().indices.get(index="test")
+
+        calls = client.transport.calls
+        call = calls[("GET", "/test")][0]
+        assert call.pop("request_timeout") is DEFAULT
+        assert call.pop("max_retries") is DEFAULT
+        assert call.pop("retry_on_timeout") is DEFAULT
+        assert call.pop("retry_on_status") is DEFAULT
+        assert call.pop("client_meta") is DEFAULT
+        assert call == {
+            "headers": {
+                "accept": "application/vnd.elasticsearch+json; compatible-with=8",
+            },
+            "body": None,
+        }
+
+        client = Elasticsearch(
+            "http://localhost:9200",
+            transport_class=DummyTransport,
+        )
+        client.options(
+            request_timeout=1,
+            max_retries=2,
+            retry_on_status=(404,),
+            retry_on_timeout=True,
+        ).indices.get(index="test")
+
+        calls = client.transport.calls
+        call = calls[("GET", "/test")][0]
+        assert call.pop("client_meta") is DEFAULT
+        assert call == {
+            "headers": {
+                "accept": "application/vnd.elasticsearch+json; compatible-with=8",
+            },
+            "body": None,
+            "request_timeout": 1,
+            "max_retries": 2,
+            "retry_on_status": (404,),
+            "retry_on_timeout": True,
+        }