[test] Increase test timeout for FC tests after adding compute to them (

#717) After adding read-compute support to fast-client, some FC tests added a "compute" test to them and this caused tests that were close to hitting the timeout now start getting timed out. This commit increases the timeout for one such test that we notice on our internal CI
linkedin · Oct 26, 2023 · e2d8009 · e2d8009
1 parent 0b6606f
commit e2d8009
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/.../src/integrationTest/java/com/linkedin/venice/fastclient/AvroStoreClientEndToEndTest.java b/.../src/integrationTest/java/com/linkedin/venice/fastclient/AvroStoreClientEndToEndTest.java
@@ -396,7 +396,7 @@ public void testFastClientGet(
     }
   }
 
-  @Test(dataProvider = "fastClientHTTPVariantsAndStoreMetadataFetchModes", timeOut = TIME_OUT)
+  @Test(dataProvider = "fastClientHTTPVariantsAndStoreMetadataFetchModes", timeOut = 2 * TIME_OUT)
   public void testFastClientGetWithDifferentHTTPVariants(
       ClientTestUtils.FastClientHTTPVariant fastClientHTTPVariant,
       StoreMetadataFetchMode storeMetadataFetchMode) throws Exception {

diff --git a/...ntegrationTest/java/com/linkedin/venice/fastclient/utils/AbstractClientEndToEndSetup.java b/...ntegrationTest/java/com/linkedin/venice/fastclient/utils/AbstractClientEndToEndSetup.java
@@ -467,14 +467,11 @@ private void setupDaVinciClientForMetaStore() {
    * TODO: Explore to see if we can reuse these for all the tests rather than cleaning it up everytime.
    * */
   protected void cleanupDaVinciClientForMetaStore() {
-    if (daVinciClientForMetaStore != null) {
-      daVinciClientForMetaStore.close();
-      daVinciClientForMetaStore = null;
-    }
-    if (daVinciClientFactory != null) {
-      daVinciClientFactory.close();
-      daVinciClientFactory = null;
-    }
+    Utils.closeQuietlyWithErrorLogged(daVinciClientForMetaStore);
+    daVinciClientForMetaStore = null;
+
+    Utils.closeQuietlyWithErrorLogged(daVinciClientFactory);
+    daVinciClientFactory = null;
   }
 
   protected AvroGenericStoreClient<String, GenericRecord> getGenericThinClient(MetricsRepository metricsRepository) {