[dvc] Config flag for subscribing on disk partitions automatically. U…

…pdated with integration test and unit test.
linkedin · Feb 5, 2025 · 9f36693 · 9f36693
1 parent 0e82518
commit 9f36693
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/clients/da-vinci-client/src/main/java/com/linkedin/davinci/DaVinciBackend.java b/clients/da-vinci-client/src/main/java/com/linkedin/davinci/DaVinciBackend.java
@@ -399,7 +399,7 @@ private Function<String, Boolean> functionToCheckWhetherStorageEngineShouldBeKep
     };
   }
 
-  private synchronized void bootstrap() {
+  final synchronized void bootstrap() {
     List<AbstractStorageEngine> storageEngines =
         storageService.getStorageEngineRepository().getAllLocalStorageEngines();
     LOGGER.info("Starting bootstrap, storageEngines: {}", storageEngines);
@@ -669,10 +669,6 @@ protected void handleStoreChanged(StoreBackend storeBackend) {
     storeBackend.trySubscribeDaVinciFutureVersion();
   }
 
-  protected void executeBootstrapping() {
-    bootstrap();
-  }
-
   Version getVeniceLatestNonFaultyVersion(String storeName, Set<Integer> faultyVersions) {
     try {
       return getVeniceLatestNonFaultyVersion(getStoreRepository().getStoreOrThrow(storeName), faultyVersions);

diff --git a/clients/da-vinci-client/src/test/java/com/linkedin/davinci/DaVinciBackendTest.java b/clients/da-vinci-client/src/test/java/com/linkedin/davinci/DaVinciBackendTest.java
@@ -256,12 +256,21 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
 
     // DA_VINCI_SUBSCRIBE_ON_DISK_PARTITIONS_AUTOMATICALLY == false
     when(mockCombinedProperties.getBoolean(anyString(), anyBoolean())).thenReturn(false);
-    doCallRealMethod().when(backend).executeBootstrapping();
-    backend.executeBootstrapping();
+    doCallRealMethod().when(backend).bootstrap();
+    backend.bootstrap();
 
     ComplementSet<Integer> subscription = mockStoreBackend.getSubscription();
     assertTrue(subscription.contains(0));
     assertTrue(subscription.contains(1));
     assertFalse(subscription.contains(2));
+
+    // DA_VINCI_SUBSCRIBE_ON_DISK_PARTITIONS_AUTOMATICALLY == true
+    when(mockCombinedProperties.getBoolean(anyString(), anyBoolean())).thenReturn(true);
+    backend.bootstrap();
+
+    subscription = mockStoreBackend.getSubscription();
+    assertTrue(subscription.contains(0));
+    assertTrue(subscription.contains(1));
+    assertTrue(subscription.contains(2));
   }
 }