Simplify getRepushInfo HTTP route to call admin directly

- Remove requestHandler parameter from getRepushInfo method
- Call admin.getRepushInfo() directly instead of converting to/from gRPC format
- Remove mapGrpcRepushInfoToRepushInfo helper method (no longer needed)
- Update tests to mock admin.getRepushInfo() directly
- Remove unused gRPC imports from StoresRoutes and StoresRoutesTest

This avoids the inefficient double conversion (RepushInfo -> RepushInfoGrpc -> RepushInfo)
for the HTTP code path, while keeping the gRPC path unchanged.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: pthirun

services/venice-controller/src/main/java/com/linkedin/venice/controller/server/AdminSparkServer.java

@@ -600,9 +600,7 @@ public boolean startInner() throws Exception {
         new VeniceParentControllerRegionStateHandler(admin, jobRoutes.getOngoingIncrementalPushVersions(admin)));
     httpService.get(
         GET_REPUSH_INFO.getPath(),
-        new VeniceParentControllerRegionStateHandler(
-            admin,
-            storesRoutes.getRepushInfo(admin, requestHandler.getStoreRequestHandler())));
+        new VeniceParentControllerRegionStateHandler(admin, storesRoutes.getRepushInfo(admin)));
     httpService.get(
         COMPARE_STORE.getPath(),
         new VeniceParentControllerRegionStateHandler(admin, storesRoutes.compareStore(admin)));

services/venice-controller/src/main/java/com/linkedin/venice/controller/server/StoresRoutes.java

@@ -108,17 +108,11 @@
 import com.linkedin.venice.meta.StoreDataAudit;
 import com.linkedin.venice.meta.StoreInfo;
 import com.linkedin.venice.meta.Version;
-import com.linkedin.venice.meta.VersionImpl;
-import com.linkedin.venice.meta.VersionStatus;
 import com.linkedin.venice.protocols.controller.ClusterStoreGrpcInfo;
-import com.linkedin.venice.protocols.controller.GetRepushInfoGrpcRequest;
-import com.linkedin.venice.protocols.controller.GetRepushInfoGrpcResponse;
 import com.linkedin.venice.protocols.controller.ListStoresGrpcRequest;
 import com.linkedin.venice.protocols.controller.ListStoresGrpcResponse;
-import com.linkedin.venice.protocols.controller.RepushInfoGrpc;
 import com.linkedin.venice.protocols.controller.ValidateStoreDeletedGrpcRequest;
 import com.linkedin.venice.protocols.controller.ValidateStoreDeletedGrpcResponse;
-import com.linkedin.venice.protocols.controller.VersionGrpc;
 import com.linkedin.venice.pubsub.PubSubTopicRepository;
 import com.linkedin.venice.pubsub.api.PubSubTopic;
 import com.linkedin.venice.pubsub.api.exceptions.PubSubTopicDoesNotExistException;
@@ -259,7 +253,7 @@ public void internalHandle(Request request, SchemaUsageResponse response) {
   /**
    * @see Admin#getRepushInfo(String, String, Optional)
    */
-  public Route getRepushInfo(Admin admin, StoreRequestHandler requestHandler) {
+  public Route getRepushInfo(Admin admin) {
     return new VeniceRouteHandler<RepushInfoResponse>(RepushInfoResponse.class) {
       @Override
       public void internalHandle(Request request, RepushInfoResponse veniceResponse) {
@@ -268,26 +262,11 @@ public void internalHandle(Request request, RepushInfoResponse veniceResponse) {
         String storeName = request.queryParams(NAME);
         String fabricName = request.queryParams(FABRIC);
 
-        // Convert to gRPC request
-        ClusterStoreGrpcInfo storeInfo =
-            ClusterStoreGrpcInfo.newBuilder().setClusterName(clusterName).setStoreName(storeName).build();
-        GetRepushInfoGrpcRequest.Builder grpcRequestBuilder =
-            GetRepushInfoGrpcRequest.newBuilder().setStoreInfo(storeInfo);
-        if (fabricName != null) {
-          grpcRequestBuilder.setFabric(fabricName);
-        }
-        GetRepushInfoGrpcRequest grpcRequest = grpcRequestBuilder.build();
+        Optional<String> fabric = fabricName != null ? Optional.of(fabricName) : Optional.empty();
+        RepushInfo repushInfo = admin.getRepushInfo(clusterName, storeName, fabric);
 
-        // Call handler
-        GetRepushInfoGrpcResponse grpcResponse = requestHandler.getRepushInfo(grpcRequest);
-
-        // Map response back to HTTP
         veniceResponse.setCluster(clusterName);
         veniceResponse.setName(storeName);
-
-        // Convert proto RepushInfo back to Java RepushInfo for HTTP response
-        RepushInfo repushInfo = mapGrpcRepushInfoToRepushInfo(grpcResponse.getRepushInfo(), storeName);
-
         veniceResponse.setRepushInfo(repushInfo);
       }
     };
@@ -1248,33 +1227,4 @@ public void internalHandle(Request request, StoreDeletedValidationResponse venic
     };
   }
 
-  /**
-   * Converts a gRPC RepushInfoGrpc message to a RepushInfo object.
-   * @param repushInfoProto the gRPC message
-   * @param storeName the store name needed for Version creation
-   * @return the converted RepushInfo object
-   */
-  RepushInfo mapGrpcRepushInfoToRepushInfo(RepushInfoGrpc repushInfoProto, String storeName) {
-    Version version = null;
-    if (repushInfoProto.hasVersion()) {
-      VersionGrpc versionProto = repushInfoProto.getVersion();
-      version = new VersionImpl(
-          storeName,
-          versionProto.getNumber(),
-          versionProto.getCreatedTime(),
-          versionProto.getPushJobId(),
-          versionProto.getPartitionCount(),
-          null,
-          null);
-      version.setStatus(VersionStatus.getVersionStatusFromInt(versionProto.getStatus()));
-    }
-
-    return RepushInfo.createRepushInfo(
-        version,
-        repushInfoProto.getKafkaBrokerUrl(),
-        repushInfoProto.hasSystemSchemaClusterD2ServiceName()
-            ? repushInfoProto.getSystemSchemaClusterD2ServiceName()
-            : null,
-        repushInfoProto.hasSystemSchemaClusterD2ZkHost() ? repushInfoProto.getSystemSchemaClusterD2ZkHost() : null);
-  }
 }

services/venice-controller/src/test/java/com/linkedin/venice/controller/server/StoresRoutesTest.java

@@ -42,14 +42,10 @@
 import com.linkedin.venice.meta.VersionStatus;
 import com.linkedin.venice.meta.ZKStore;
 import com.linkedin.venice.protocols.controller.ClusterStoreGrpcInfo;
-import com.linkedin.venice.protocols.controller.GetRepushInfoGrpcRequest;
-import com.linkedin.venice.protocols.controller.GetRepushInfoGrpcResponse;
 import com.linkedin.venice.protocols.controller.ListStoresGrpcRequest;
 import com.linkedin.venice.protocols.controller.ListStoresGrpcResponse;
-import com.linkedin.venice.protocols.controller.RepushInfoGrpc;
 import com.linkedin.venice.protocols.controller.ValidateStoreDeletedGrpcRequest;
 import com.linkedin.venice.protocols.controller.ValidateStoreDeletedGrpcResponse;
-import com.linkedin.venice.protocols.controller.VersionGrpc;
 import com.linkedin.venice.pubsub.PubSubTopicRepository;
 import com.linkedin.venice.utils.ObjectMapperFactory;
 import java.util.Arrays;
@@ -700,7 +696,6 @@ public void testGetAllStoresWithFilters() throws Exception {
   @Test
   public void testGetRepushInfo() throws Exception {
     Admin mockAdmin = mock(VeniceParentHelixAdmin.class);
-    StoreRequestHandler mockRequestHandler = mock(StoreRequestHandler.class);
     doReturn(true).when(mockAdmin).isLeaderControllerFor(TEST_CLUSTER);
 
     Request request = mock(Request.class);
@@ -717,31 +712,7 @@ public void testGetRepushInfo() throws Exception {
     doReturn(queryMap).when(queryParamsMap).toMap();
     doReturn(queryParamsMap).when(request).queryMap();
 
-    Route route =
-        new StoresRoutes(false, Optional.empty(), pubSubTopicRepository).getRepushInfo(mockAdmin, mockRequestHandler);
-
-    // Test success case
-    ClusterStoreGrpcInfo storeInfo =
-        ClusterStoreGrpcInfo.newBuilder().setClusterName(TEST_CLUSTER).setStoreName(TEST_STORE_NAME).build();
-
-    VersionGrpc versionGrpc = VersionGrpc.newBuilder()
-        .setNumber(1)
-        .setCreatedTime(123456789L)
-        .setStatus(VersionStatus.ONLINE.getValue())
-        .setPushJobId("test-push-job")
-        .setPartitionCount(10)
-        .setReplicationFactor(3)
-        .build();
-
-    RepushInfoGrpc repushInfoGrpc = RepushInfoGrpc.newBuilder()
-        .setKafkaBrokerUrl("kafka.broker:9092")
-        .setVersion(versionGrpc)
-        .setSystemSchemaClusterD2ServiceName("d2-service")
-        .setSystemSchemaClusterD2ZkHost("zk-host")
-        .build();
-
-    GetRepushInfoGrpcResponse grpcResponse =
-        GetRepushInfoGrpcResponse.newBuilder().setStoreInfo(storeInfo).setRepushInfo(repushInfoGrpc).build();
+    Route route = new StoresRoutes(false, Optional.empty(), pubSubTopicRepository).getRepushInfo(mockAdmin);
 
     // Create a real Version for admin.getRepushInfo() call to avoid Jackson serialization issues
     Version version = new VersionImpl(TEST_STORE_NAME, 1, "test-push-job", 10);
@@ -750,7 +721,6 @@ public void testGetRepushInfo() throws Exception {
 
     RepushInfo mockRepushInfo = RepushInfo.createRepushInfo(version, "kafka.broker:9092", "d2-service", "zk-host");
 
-    when(mockRequestHandler.getRepushInfo(any(GetRepushInfoGrpcRequest.class))).thenReturn(grpcResponse);
     when(mockAdmin.getRepushInfo(eq(TEST_CLUSTER), eq(TEST_STORE_NAME), eq(Optional.of("test-fabric"))))
         .thenReturn(mockRepushInfo);
 
@@ -764,7 +734,8 @@ public void testGetRepushInfo() throws Exception {
     Assert.assertEquals(response.getRepushInfo().getKafkaBrokerUrl(), "kafka.broker:9092");
 
     // Test error case
-    when(mockRequestHandler.getRepushInfo(any(GetRepushInfoGrpcRequest.class))).thenThrow(new VeniceException("Error"));
+    when(mockAdmin.getRepushInfo(eq(TEST_CLUSTER), eq(TEST_STORE_NAME), eq(Optional.of("test-fabric"))))
+        .thenThrow(new VeniceException("Error"));
     response = ObjectMapperFactory.getInstance()
         .readValue(route.handle(request, mock(Response.class)).toString(), RepushInfoResponse.class);
     Assert.assertTrue(response.isError());
@@ -773,7 +744,6 @@ public void testGetRepushInfo() throws Exception {
   @Test
   public void testGetRepushInfoWithoutFabric() throws Exception {
     Admin mockAdmin = mock(VeniceParentHelixAdmin.class);
-    StoreRequestHandler mockRequestHandler = mock(StoreRequestHandler.class);
     doReturn(true).when(mockAdmin).isLeaderControllerFor(TEST_CLUSTER);
 
     Request request = mock(Request.class);
@@ -789,20 +759,10 @@ public void testGetRepushInfoWithoutFabric() throws Exception {
     doReturn(queryMap).when(queryParamsMap).toMap();
     doReturn(queryParamsMap).when(request).queryMap();
 
-    Route route =
-        new StoresRoutes(false, Optional.empty(), pubSubTopicRepository).getRepushInfo(mockAdmin, mockRequestHandler);
-
-    ClusterStoreGrpcInfo storeInfo =
-        ClusterStoreGrpcInfo.newBuilder().setClusterName(TEST_CLUSTER).setStoreName(TEST_STORE_NAME).build();
-
-    RepushInfoGrpc repushInfoGrpc = RepushInfoGrpc.newBuilder().setKafkaBrokerUrl("another.kafka:9092").build();
-
-    GetRepushInfoGrpcResponse grpcResponse =
-        GetRepushInfoGrpcResponse.newBuilder().setStoreInfo(storeInfo).setRepushInfo(repushInfoGrpc).build();
+    Route route = new StoresRoutes(false, Optional.empty(), pubSubTopicRepository).getRepushInfo(mockAdmin);
 
     RepushInfo mockRepushInfo = RepushInfo.createRepushInfo(null, "another.kafka:9092", null, null);
 
-    when(mockRequestHandler.getRepushInfo(any(GetRepushInfoGrpcRequest.class))).thenReturn(grpcResponse);
     when(mockAdmin.getRepushInfo(eq(TEST_CLUSTER), eq(TEST_STORE_NAME), eq(Optional.empty())))
         .thenReturn(mockRepushInfo);