Update ideal state

linkedin · Sep 24, 2024 · 56e7711 · 56e7711
1 parent fd14574
commit 56e7711
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...s/da-vinci-client/src/main/java/com/linkedin/davinci/helix/HelixParticipationService.java b/...s/da-vinci-client/src/main/java/com/linkedin/davinci/helix/HelixParticipationService.java
@@ -427,6 +427,10 @@ public Instance getInstance() {
     return instance;
   }
 
+  public SafeHelixManager getHelixManager() {
+    return helixManager;
+  }
+
   public VeniceOfflinePushMonitorAccessor getVeniceOfflinePushMonitorAccessor() {
     return veniceOfflinePushMonitorAccessor;
   }

diff --git a/services/venice-server/src/main/java/com/linkedin/venice/server/VeniceServer.java b/services/venice-server/src/main/java/com/linkedin/venice/server/VeniceServer.java
@@ -35,7 +35,6 @@
 import com.linkedin.venice.helix.HelixCustomizedViewOfflinePushRepository;
 import com.linkedin.venice.helix.HelixInstanceConfigRepository;
 import com.linkedin.venice.helix.HelixReadOnlyZKSharedSchemaRepository;
-import com.linkedin.venice.helix.SafeHelixDataAccessor;
 import com.linkedin.venice.helix.SafeHelixManager;
 import com.linkedin.venice.helix.ZkAllowlistAccessor;
 import com.linkedin.venice.kafka.protocol.state.PartitionState;
@@ -708,7 +707,9 @@ private Function<String, Boolean> functionToCheckWhetherStorageEngineShouldBeKep
 
       PropertyKey.Builder propertyKeyBuilder =
           new PropertyKey.Builder(this.veniceConfigLoader.getVeniceClusterConfig().getClusterName());
-      IdealState idealState = SafeHelixDataAccessor.getProperty(propertyKeyBuilder.idealStates(storeName));
+      IdealState idealState = getHelixParticipationService().getHelixManager()
+          .getHelixDataAccessor()
+          .getProperty(propertyKeyBuilder.idealStates(storeName));
 
       Set<Integer> idealStatePartitionIds = new HashSet<>();
       idealState.getPartitionSet().stream().forEach(partitionId -> {