Merge branch 'master' of github.com:milvus-io/pymilvus into 2404-floa…

…t-array-bw
milvus-io · Apr 12, 2024 · dffbbf0 · dffbbf0
2 parents a9eb5d1 + e0f0e91
commit dffbbf0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/pymilvus/client/grpc_handler.py b/pymilvus/client/grpc_handler.py
@@ -756,7 +756,7 @@ def _execute_hybrid_search(
                 return SearchFuture(None, None, e)
             raise e from e
 
-    @retry_on_rpc_failure(retry_on_inconsistent_requery=True)
+    @retry_on_rpc_failure()
     def search(
         self,
         collection_name: str,
@@ -796,7 +796,7 @@ def search(
         )
         return self._execute_search(request, timeout, round_decimal=round_decimal, **kwargs)
 
-    @retry_on_rpc_failure(retry_on_inconsistent_requery=True)
+    @retry_on_rpc_failure()
     def hybrid_search(
         self,
         collection_name: str,

diff --git a/pymilvus/decorators.py b/pymilvus/decorators.py
@@ -45,7 +45,6 @@ def retry_on_rpc_failure(
     initial_back_off: float = 0.01,
     max_back_off: float = 3,
     back_off_multiplier: int = 3,
-    retry_on_inconsistent_requery: bool = False,
 ):
     def wrapper(func: Any):
         @functools.wraps(func)
@@ -107,14 +106,8 @@ def timeout(start_time: Optional[float] = None) -> bool:
                         raise MilvusException(
                             code=e.code, message=f"{to_msg}, message={e.message}"
                         ) from e
-                    if (
-                        _retry_on_rate_limit
-                        and (
-                            e.code == ErrorCode.RATE_LIMIT
-                            or e.compatible_code == common_pb2.RateLimit
-                        )
-                        or retry_on_inconsistent_requery
-                        and e.code == 2200
+                    if _retry_on_rate_limit and (
+                        e.code == ErrorCode.RATE_LIMIT or e.compatible_code == common_pb2.RateLimit
                     ):
                         time.sleep(back_off)
                         back_off = min(back_off * back_off_multiplier, max_back_off)