avoid doing getStore() for which the controller is not the leader

linkedin · Dec 2, 2024 · 60aefd2 · 60aefd2
1 parent f1d2066
commit 60aefd2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/...ices/venice-controller/src/main/java/com/linkedin/venice/controller/VeniceHelixAdmin.java b/...ices/venice-controller/src/main/java/com/linkedin/venice/controller/VeniceHelixAdmin.java
@@ -3534,7 +3534,7 @@ private boolean hasFatalDataValidationError(PushMonitor pushMonitor, String topi
 
   private void safeDeleteRTTopic(String clusterName, String storeName) {
     if (isRTTopicDeletionPermittedByAllControllers(clusterName, storeName)) {
-      deleteRTTopic(clusterName, storeName);
+      deleteRealTtimeTopic(clusterName, storeName);
     }
   }
 
@@ -3545,7 +3545,6 @@ public boolean isRTTopicDeletionPermittedByAllControllers(String clusterName, St
     // approach if some fabrics are unavailable or out of sync (temporarily).
     // String storeName = store.getName();
     String rtTopicName = Version.composeRealTimeTopic(storeName);
-
     Map<String, ControllerClient> controllerClientMap = getControllerClientMap(clusterName);
     for (Map.Entry<String, ControllerClient> controllerClientEntry: controllerClientMap.entrySet()) {
       StoreResponse storeResponse = controllerClientEntry.getValue().getStore(storeName);
@@ -3569,7 +3568,7 @@ public boolean isRTTopicDeletionPermittedByAllControllers(String clusterName, St
     return true;
   }
 
-  private void deleteRTTopic(String clusterName, String storeName) {
+  private void deleteRealTtimeTopic(String clusterName, String storeName) {
     Map<String, ControllerClient> controllerClientMap = getControllerClientMap(clusterName);
     String rtTopicToDelete = Version.composeRealTimeTopic(storeName);
     deleteRTTopicFromAllFabrics(rtTopicToDelete, controllerClientMap);

diff --git a/...ce-controller/src/main/java/com/linkedin/venice/controller/kafka/TopicCleanupService.java b/...ce-controller/src/main/java/com/linkedin/venice/controller/kafka/TopicCleanupService.java
@@ -230,10 +230,8 @@ void cleanupVeniceTopics() {
       PubSubTopic topic = allTopics.poll();
       String storeName = topic.getStoreName();
       String clusterDiscovered;
-      Store store;
       try {
         clusterDiscovered = admin.discoverCluster(storeName).getFirst();
-        store = admin.getStoreInfoInChildColos(clusterDiscovered, storeName).get();
       } catch (VeniceNoStoreException e) {
         LOGGER.warn(
             "Store {} not found. Exception when trying to delete topic: {} - {}",