COH-27562 - Fix Entries and Values paging tests - currently failing on GitHub Actions ONLY

Author: dhirupandey

coherence/client.py

@@ -820,18 +820,45 @@ def is_locked(self) -> bool:
 
 
 class Options:
+    ENV_SERVER_ADDRESS = "COHERENCE_SERVER_ADDRESS"
+    ENV_REQUEST_TIMEOUT = "COHERENCE_CLIENT_REQUEST_TIMEOUT"
+
+    DEFAULT_ADDRESS: Final[str] = "localhost:1408"
+    """The default target address to connect to Coherence gRPC server."""
+    DEFAULT_SCOPE: Final[str] = ""
+    """The default scope."""
+    DEFAULT_REQUEST_TIMEOUT: Final[float] = 30.0
+    """The default request timeout."""
+    DEFAULT_FORMAT: Final[str] = "json"
+    """The default serialization format"""
+
     def __init__(
         self,
-        address: str,
-        scope: str,
-        request_timeout_seconds: float,
-        ser_format: str,
+        address: str = DEFAULT_ADDRESS,
+        scope: str = DEFAULT_SCOPE,
+        request_timeout_seconds: float = DEFAULT_REQUEST_TIMEOUT,
+        ser_format: str = DEFAULT_FORMAT,
         channel_options: Optional[Sequence[Tuple[str, Any]]] = None,
         tls_options: Optional[TlsOptions] = None,
     ) -> None:
-        self._address = address
+        addr = os.getenv(Options.ENV_SERVER_ADDRESS)
+        if addr is not None:
+            self._address = addr
+        else:
+            self._address = address
+
+        timeout = os.getenv(Options.ENV_REQUEST_TIMEOUT)
+        if timeout is not None:
+            time_out: float
+            try:
+                time_out = float(timeout)
+            except ValueError:
+                print(f"The value of {Options.ENV_REQUEST_TIMEOUT} cannot be converted to a float")
+            self._request_timeout_seconds = time_out
+        else:
+            self._request_timeout_seconds = request_timeout_seconds
+
         self._scope = scope
-        self._request_timeout_seconds = request_timeout_seconds
         self._ser_format = ser_format
 
         if channel_options is not None:
@@ -912,12 +939,6 @@ class Session:
 
     """
 
-    DEFAULT_ADDRESS: Final[str] = "localhost:1408"
-    """The default target address to connect to Coherence gRPC server."""
-    DEFAULT_SCOPE: Final[str] = ""
-    """The default scope."""
-    DEFAULT_REQUEST_TIMEOUT: Final[float] = 30.0
-    """The default request timeout."""
     DEFAULT_FORMAT: Final[str] = "json"
     """The default serialization format"""
 
@@ -931,9 +952,7 @@ def __init__(self, session_options: Optional[Options] = None):
         if session_options is not None:
             self._session_options = session_options
         else:
-            self._session_options = Options(
-                Session.DEFAULT_ADDRESS, Session.DEFAULT_SCOPE, Session.DEFAULT_REQUEST_TIMEOUT, Session.DEFAULT_FORMAT
-            )
+            self._session_options = Options()
 
         self._tasks: Set[Task[None]] = set()
 
@@ -1279,6 +1298,7 @@ async def __load_next_page(self) -> None:
         :return: None
         """
         request: PageRequest = self._client._request_factory.page_request(self._cookie)
+        print("### DEBUG: __load_next_page() called!")
         self._stream = self._get_stream(request)
         self._new_page = True
 

tests/java/pom.xml

@@ -188,6 +188,7 @@
                   <jvmFlag>-Dcoherence.distributed.localstorage=true</jvmFlag>
                   <jvmFlag>-Dcoherence.management.refresh.expiry=1s</jvmFlag>
                   <jvmFlag>-Dcoherence.cacheconfig=${coherence.cache.config}</jvmFlag>
+                  <jvmFlag>-Dcoherence.distributed.partitioncount=13</jvmFlag>
                 </jvmFlags>
                 <mainClass>com.oracle.coherence.python.testing.RestServer</mainClass>
                 <format>OCI</format>

tests/scripts/run-tests.sh

@@ -13,12 +13,15 @@ set -e
 # INCLUDE_LONG_RUNNING=true
 
 echo "Coherence CE 22.06.2"
-COHERENCE_VERSION=22.06.2 make clean test-cluster-shutdown remove-app-images build-test-images test-cluster-startup just-wait test
+COHERENCE_CLIENT_REQUEST_TIMEOUT=180.0 \
+  COHERENCE_VERSION=22.06.2 \
+  make clean test-cluster-shutdown remove-app-images build-test-images test-cluster-startup just-wait test
 
 echo "Coherence CE 22.06.2 with SSL"
 RUN_SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true \
   COHERENCE_TLS_CERTS_PATH=$(pwd)/tests/utils/certs/guardians-ca.crt \
   COHERENCE_TLS_CLIENT_CERT=$(pwd)/tests/utils/certs/star-lord.crt \
   COHERENCE_TLS_CLIENT_KEY=$(pwd)/tests/utils/certs/star-lord.pem \
+  COHERENCE_CLIENT_REQUEST_TIMEOUT=180.0 \
   COHERENCE_VERSION=22.06.2 PROFILES=,secure make clean certs test-cluster-shutdown remove-app-images \
                                                   build-test-images test-cluster-startup just-wait test

tests/test_client.py

@@ -27,7 +27,7 @@ async def _insert_large_number_of_entries(cache: NamedCache[str, str]) -> int:
     # insert enough data into the cache to ensure results will be paged
     # by the proxy.
     num_bulk_ops: int = 10
-    num_entries: int = 100000
+    num_entries: int = 40000
     bulk_ops: int = int(num_entries / num_bulk_ops)
     to_send: dict[str, str] = {}
     for i in range(num_bulk_ops):
@@ -42,11 +42,6 @@ async def _insert_large_number_of_entries(cache: NamedCache[str, str]) -> int:
 
 
 def get_session() -> Session:
-    default_address: Final[str] = "localhost:1408"
-    default_scope: Final[str] = ""
-    default_request_timeout: Final[float] = 30.0
-    default_format: Final[str] = "json"
-
     run_secure: Final[str] = "RUN_SECURE"
     session: Session = Session(None)
 
@@ -60,7 +55,7 @@ def get_session() -> Session:
         tls_options.enabled = True
         tls_options.locked()
 
-        options: Options = Options(default_address, default_scope, default_request_timeout, default_format)
+        options: Options = Options()
         options.tls_options = tls_options
         options.channel_options = (("grpc.ssl_target_name_override", "Star-Lord"),)
         session = Session(options)
@@ -269,7 +264,6 @@ async def test_entries_filtered(setup_and_teardown: NamedCache[str, str]) -> Non
 
 # noinspection PyShadowingNames
 @pytest.mark.asyncio
-@pytest.mark.skip
 async def test_entries_paged(setup_and_teardown: NamedCache[str, str]) -> None:
     cache: NamedCache[str, str] = setup_and_teardown
 
@@ -312,7 +306,6 @@ async def test_values_filtered(setup_and_teardown: NamedCache[str, str]) -> None
 
 # noinspection PyShadowingNames
 @pytest.mark.asyncio
-@pytest.mark.skip
 async def test_values_paged(setup_and_teardown: NamedCache[str, str]) -> None:
     cache: NamedCache[str, str] = setup_and_teardown