From 55bc031eb3df63cee83dc185d18ea062a02a86ca Mon Sep 17 00:00:00 2001 From: tbak Date: Mon, 15 Nov 2021 09:30:19 -0800 Subject: [PATCH] Remove the AgentManagement GRPC/REST endpoints in TitusGateway (#1173) --- .../service/AgentManagementException.java | 57 -------- .../gateway/endpoint/GatewayGrpcModule.java | 4 - .../gateway/endpoint/GatewayJerseyModule.java | 2 - .../DefaultAgentManagementServiceGrpc.java | 110 --------------- .../v3/grpc/TitusGatewayGrpcServer.java | 9 -- .../v3/rest/AgentManagementResource.java | 129 ------------------ .../TitusMasterConnectorModule.java | 8 -- .../endpoint/v3/grpc/ErrorResponses.java | 15 -- .../embedded/EmbeddedTitusOperations.java | 5 - .../cell/EmbeddedCellTitusOperations.java | 11 -- .../cell/gateway/EmbeddedTitusGateway.java | 15 -- .../cell/master/EmbeddedTitusMaster.java | 20 --- .../EmbeddedFederationTitusOperations.java | 17 --- .../federation/EmbeddedTitusFederation.java | 21 --- 14 files changed, 423 deletions(-) delete mode 100644 titus-api/src/main/java/com/netflix/titus/api/agent/service/AgentManagementException.java delete mode 100644 titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/v3/grpc/DefaultAgentManagementServiceGrpc.java delete mode 100644 titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/v3/rest/AgentManagementResource.java diff --git a/titus-api/src/main/java/com/netflix/titus/api/agent/service/AgentManagementException.java b/titus-api/src/main/java/com/netflix/titus/api/agent/service/AgentManagementException.java deleted file mode 100644 index 30acc56ce8..0000000000 --- a/titus-api/src/main/java/com/netflix/titus/api/agent/service/AgentManagementException.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2018 Netflix, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.netflix.titus.api.agent.service; - -public class AgentManagementException extends RuntimeException { - - public enum ErrorCode { - InitializationError, - InvalidArgument, - InstanceGroupNotFound, - AgentNotFound, - InstanceTypeNotFound, - } - - private final ErrorCode errorCode; - - public AgentManagementException(ErrorCode errorCode, String message, Throwable cause, Object... args) { - super(String.format(message, args), cause); - this.errorCode = errorCode; - } - - public ErrorCode getErrorCode() { - return errorCode; - } - - public static AgentManagementException agentGroupNotFound(String agentGroupId) { - return new AgentManagementException(ErrorCode.InstanceGroupNotFound, "Instance group %s not found", null, agentGroupId); - } - - public static AgentManagementException agentNotFound(String agentInstanceId) { - return new AgentManagementException(ErrorCode.AgentNotFound, "Agent instance %s not found", null, agentInstanceId); - } - - public static AgentManagementException invalidArgument(String message, Object... args) { - throw new AgentManagementException(ErrorCode.InvalidArgument, message, null, args); - } - - public static void checkArgument(boolean condition, String message, Object... args) { - if (!condition) { - throw new AgentManagementException(ErrorCode.InvalidArgument, message, null, args); - } - } -} diff --git a/titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/GatewayGrpcModule.java b/titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/GatewayGrpcModule.java index e003b6014d..562b3bc2ff 100644 --- a/titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/GatewayGrpcModule.java +++ b/titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/GatewayGrpcModule.java @@ -21,13 +21,10 @@ import com.google.inject.AbstractModule; import com.google.inject.Provides; import com.netflix.archaius.ConfigProxyFactory; -import com.netflix.titus.gateway.endpoint.v3.grpc.DefaultAgentManagementServiceGrpc; import com.netflix.titus.gateway.endpoint.v3.grpc.DefaultSchedulerServiceGrpc; import com.netflix.titus.gateway.endpoint.v3.grpc.GrpcEndpointConfiguration; import com.netflix.titus.gateway.endpoint.v3.grpc.TitusGatewayGrpcServer; import com.netflix.titus.gateway.eviction.EvictionModule; -import com.netflix.titus.gateway.kubernetes.KubeApiConnector; -import com.netflix.titus.grpc.protogen.AgentManagementServiceGrpc.AgentManagementServiceImplBase; import com.netflix.titus.grpc.protogen.AutoScalingServiceGrpc; import com.netflix.titus.grpc.protogen.HealthGrpc; import com.netflix.titus.grpc.protogen.JobManagementServiceGrpc; @@ -46,7 +43,6 @@ protected void configure() { bind(HealthGrpc.HealthImplBase.class).to(DefaultHealthServiceGrpc.class); bind(JobManagementServiceGrpc.JobManagementServiceImplBase.class).to(DefaultJobManagementServiceGrpc.class); - bind(AgentManagementServiceImplBase.class).to(DefaultAgentManagementServiceGrpc.class); bind(AutoScalingServiceGrpc.AutoScalingServiceImplBase.class).to(DefaultAutoScalingServiceGrpc.class); bind(LoadBalancerServiceGrpc.LoadBalancerServiceImplBase.class).to(DefaultLoadBalancerServiceGrpc.class); bind(SchedulerServiceGrpc.SchedulerServiceImplBase.class).to(DefaultSchedulerServiceGrpc.class); diff --git a/titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/GatewayJerseyModule.java b/titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/GatewayJerseyModule.java index 5e21e6c68b..e687342d37 100644 --- a/titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/GatewayJerseyModule.java +++ b/titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/GatewayJerseyModule.java @@ -25,7 +25,6 @@ import com.netflix.governator.guice.jersey.GovernatorServletContainer; import com.netflix.governator.providers.Advises; import com.netflix.titus.gateway.endpoint.v2.rest.TitusMasterProxyServlet; -import com.netflix.titus.gateway.endpoint.v3.rest.AgentManagementResource; import com.netflix.titus.gateway.endpoint.v3.rest.SchedulerResource; import com.netflix.titus.gateway.eviction.EvictionResource; import com.netflix.titus.runtime.endpoint.common.rest.JsonMessageReaderWriter; @@ -79,7 +78,6 @@ UnaryOperator getConfig() { // resources config.getClasses().add(HealthResource.class); - config.getClasses().add(AgentManagementResource.class); config.getClasses().add(JobManagementResource.class); config.getClasses().add(EvictionResource.class); config.getClasses().add(AutoScalingResource.class); diff --git a/titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/v3/grpc/DefaultAgentManagementServiceGrpc.java b/titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/v3/grpc/DefaultAgentManagementServiceGrpc.java deleted file mode 100644 index ec1b27ee6e..0000000000 --- a/titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/v3/grpc/DefaultAgentManagementServiceGrpc.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright 2018 Netflix, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.netflix.titus.gateway.endpoint.v3.grpc; - -import javax.inject.Inject; -import javax.inject.Singleton; - -import com.google.protobuf.Empty; -import com.netflix.titus.api.agent.service.AgentManagementException; -import com.netflix.titus.grpc.protogen.AgentChangeEvent; -import com.netflix.titus.grpc.protogen.AgentInstance; -import com.netflix.titus.grpc.protogen.AgentInstanceAttributesUpdate; -import com.netflix.titus.grpc.protogen.AgentInstanceGroup; -import com.netflix.titus.grpc.protogen.AgentInstanceGroups; -import com.netflix.titus.grpc.protogen.AgentInstances; -import com.netflix.titus.grpc.protogen.AgentManagementServiceGrpc.AgentManagementServiceImplBase; -import com.netflix.titus.grpc.protogen.AgentQuery; -import com.netflix.titus.grpc.protogen.DeleteAgentInstanceAttributesRequest; -import com.netflix.titus.grpc.protogen.DeleteInstanceGroupAttributesRequest; -import com.netflix.titus.grpc.protogen.Id; -import com.netflix.titus.grpc.protogen.InstanceGroupAttributesUpdate; -import com.netflix.titus.grpc.protogen.InstanceGroupLifecycleStateUpdate; -import com.netflix.titus.grpc.protogen.TierUpdate; -import io.grpc.stub.StreamObserver; - -/** - * @deprecated Remove this stub after confirming that no clients depend on this API. - */ -@Singleton -public class DefaultAgentManagementServiceGrpc extends AgentManagementServiceImplBase { - - @Inject - public DefaultAgentManagementServiceGrpc() { - } - - @Override - public void getInstanceGroups(Empty request, StreamObserver responseObserver) { - responseObserver.onNext(AgentInstanceGroups.getDefaultInstance()); - responseObserver.onCompleted(); - } - - @Override - public void getInstanceGroup(Id request, StreamObserver responseObserver) { - responseObserver.onError(AgentManagementException.agentGroupNotFound(request.getId())); - } - - @Override - public void getAgentInstance(Id request, StreamObserver responseObserver) { - responseObserver.onError(AgentManagementException.agentNotFound(request.getId())); - } - - @Override - public void findAgentInstances(AgentQuery request, StreamObserver responseObserver) { - responseObserver.onNext(AgentInstances.getDefaultInstance()); - responseObserver.onCompleted(); - } - - @Override - public void updateInstanceGroupTier(TierUpdate request, StreamObserver responseObserver) { - responseObserver.onError(AgentManagementException.agentGroupNotFound(request.getInstanceGroupId())); - } - - @Override - public void updateInstanceGroupLifecycleState(InstanceGroupLifecycleStateUpdate request, StreamObserver responseObserver) { - responseObserver.onError(AgentManagementException.agentGroupNotFound(request.getInstanceGroupId())); - } - - @Override - public void updateInstanceGroupAttributes(InstanceGroupAttributesUpdate request, StreamObserver responseObserver) { - responseObserver.onError(AgentManagementException.agentGroupNotFound(request.getInstanceGroupId())); - } - - @Override - public void deleteInstanceGroupAttributes(DeleteInstanceGroupAttributesRequest request, StreamObserver responseObserver) { - responseObserver.onError(AgentManagementException.agentGroupNotFound(request.getInstanceGroupId())); - } - - @Override - public void updateAgentInstanceAttributes(AgentInstanceAttributesUpdate request, StreamObserver responseObserver) { - responseObserver.onError(AgentManagementException.agentNotFound(request.getAgentInstanceId())); - } - - @Override - public void deleteAgentInstanceAttributes(DeleteAgentInstanceAttributesRequest request, StreamObserver responseObserver) { - responseObserver.onError(AgentManagementException.agentNotFound(request.getAgentInstanceId())); - } - - @Override - public void observeAgents(Empty request, StreamObserver responseObserver) { - // Emit snapshot and never complete - responseObserver.onNext(AgentChangeEvent.newBuilder() - .setSnapshotEnd(AgentChangeEvent.SnapshotEnd.getDefaultInstance()) - .build() - ); - } -} \ No newline at end of file diff --git a/titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/v3/grpc/TitusGatewayGrpcServer.java b/titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/v3/grpc/TitusGatewayGrpcServer.java index c7b5507413..c552a71bdd 100644 --- a/titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/v3/grpc/TitusGatewayGrpcServer.java +++ b/titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/v3/grpc/TitusGatewayGrpcServer.java @@ -31,8 +31,6 @@ import com.netflix.titus.common.util.ExecutorsExt; import com.netflix.titus.common.util.grpc.reactor.GrpcToReactorServerFactory; import com.netflix.titus.gateway.kubernetes.KubeApiConnector; -import com.netflix.titus.grpc.protogen.AgentManagementServiceGrpc; -import com.netflix.titus.grpc.protogen.AgentManagementServiceGrpc.AgentManagementServiceImplBase; import com.netflix.titus.grpc.protogen.AutoScalingServiceGrpc; import com.netflix.titus.grpc.protogen.AutoScalingServiceGrpc.AutoScalingServiceImplBase; import com.netflix.titus.grpc.protogen.EvictionServiceGrpc; @@ -66,7 +64,6 @@ public class TitusGatewayGrpcServer { private final HealthImplBase healthService; private final JobManagementServiceImplBase jobManagementService; private final EvictionServiceImplBase evictionService; - private final AgentManagementServiceImplBase agentManagementService; private final AutoScalingServiceImplBase appAutoScalingService; private final LoadBalancerServiceImplBase loadBalancerService; private final SchedulerServiceImplBase schedulerService; @@ -85,7 +82,6 @@ public TitusGatewayGrpcServer( HealthImplBase healthService, EvictionServiceImplBase evictionService, JobManagementServiceImplBase jobManagementService, - AgentManagementServiceImplBase agentManagementService, AutoScalingServiceImplBase appAutoScalingService, LoadBalancerServiceImplBase loadBalancerService, SchedulerServiceImplBase schedulerService, @@ -96,7 +92,6 @@ public TitusGatewayGrpcServer( this.healthService = healthService; this.evictionService = evictionService; this.jobManagementService = jobManagementService; - this.agentManagementService = agentManagementService; this.appAutoScalingService = appAutoScalingService; this.loadBalancerService = loadBalancerService; this.schedulerService = schedulerService; @@ -130,10 +125,6 @@ public void start() { evictionService, createInterceptors(EvictionServiceGrpc.getServiceDescriptor()) )) - .addService(ServerInterceptors.intercept( - agentManagementService, - createInterceptors(AgentManagementServiceGrpc.getServiceDescriptor()) - )) .addService(ServerInterceptors.intercept( appAutoScalingService, createInterceptors(AutoScalingServiceGrpc.getServiceDescriptor()) diff --git a/titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/v3/rest/AgentManagementResource.java b/titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/v3/rest/AgentManagementResource.java deleted file mode 100644 index 307f0c5593..0000000000 --- a/titus-server-gateway/src/main/java/com/netflix/titus/gateway/endpoint/v3/rest/AgentManagementResource.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright 2018 Netflix, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.netflix.titus.gateway.endpoint.v3.rest; - -import javax.inject.Inject; -import javax.inject.Singleton; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; - -import com.netflix.titus.api.agent.service.AgentManagementException; -import com.netflix.titus.gateway.endpoint.v3.rest.representation.TierWrapper; -import com.netflix.titus.grpc.protogen.AgentInstance; -import com.netflix.titus.grpc.protogen.AgentInstanceAttributesUpdate; -import com.netflix.titus.grpc.protogen.AgentInstanceGroup; -import com.netflix.titus.grpc.protogen.AgentInstanceGroups; -import com.netflix.titus.grpc.protogen.AgentInstances; -import com.netflix.titus.grpc.protogen.InstanceGroupAttributesUpdate; -import com.netflix.titus.grpc.protogen.InstanceGroupLifecycleStateUpdate; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; - -@Produces(MediaType.APPLICATION_JSON) -@Consumes(MediaType.APPLICATION_JSON) -@Api(tags = "Agent Management") -@Path("/v3/agent") -@Singleton -/** - * @deprecated Remove this stub after confirming that no clients depend on this API. - */ -public class AgentManagementResource { - - @Inject - public AgentManagementResource() { - } - - @GET - @ApiOperation("Get all agent instance groups") - @Path("/instanceGroups") - public AgentInstanceGroups getInstanceGroups() { - return AgentInstanceGroups.getDefaultInstance(); - } - - @GET - @ApiOperation("Get an agent instance group with the given id") - @Path("/instanceGroups/{id}") - public AgentInstanceGroup getInstanceGroup(@PathParam("id") String id) { - throw AgentManagementException.agentGroupNotFound(id); - } - - @GET - @ApiOperation("Get an agent instance with the given id") - @Path("/instances/{id}") - public AgentInstance getAgentInstance(@PathParam("id") String id) { - throw AgentManagementException.agentNotFound(id); - } - - @GET - @ApiOperation("Find agent instances") - @Path("/instances") - public AgentInstances findAgentInstances(@Context UriInfo info) { - return AgentInstances.getDefaultInstance(); - } - - @PUT - @ApiOperation("Update instance group tier") - @Path("/instanceGroups/{id}/tier") - public Response updateInstanceGroupTier(@PathParam("id") String instanceGroupId, TierWrapper tierWrapper) { - throw AgentManagementException.agentGroupNotFound(instanceGroupId); - } - - @PUT - @ApiOperation("Update instance group lifecycle configuration") - @Path("/instanceGroups/{id}/lifecycle") - public Response updateInstanceGroupLifecycle(InstanceGroupLifecycleStateUpdate lifecycleStateUpdate) { - throw AgentManagementException.agentGroupNotFound(lifecycleStateUpdate.getInstanceGroupId()); - } - - @PUT - @ApiOperation("Update instance group attributes") - @Path("/instanceGroups/{id}/attributes") - public Response updateInstanceGroupAttributes(@PathParam("id") String instanceGroupId, InstanceGroupAttributesUpdate attributesUpdate) { - throw AgentManagementException.agentGroupNotFound(instanceGroupId); - } - - @DELETE - @ApiOperation("Delete instance group attributes") - @Path("/instanceGroups/{id}/attributes") - public Response deleteInstanceGroupAttributes(@PathParam("id") String instanceGroupId, @QueryParam("keys") String delimitedKeys) { - throw AgentManagementException.agentGroupNotFound(instanceGroupId); - } - - @PUT - @ApiOperation("Update agent instance attributes") - @Path("/instances/{id}/attributes") - public Response updateAgentInstanceAttributes(@PathParam("id") String agentInstanceId, AgentInstanceAttributesUpdate attributesUpdate) { - throw AgentManagementException.agentNotFound(agentInstanceId); - } - - @DELETE - @ApiOperation("Delete agent instance attributes") - @Path("/instances/{id}/attributes") - public Response deleteAgentInstanceAttributes(@PathParam("id") String agentInstanceId, @QueryParam("keys") String delimitedKeys) { - throw AgentManagementException.agentNotFound(agentInstanceId); - } -} diff --git a/titus-server-runtime/src/main/java/com/netflix/titus/runtime/connector/titusmaster/TitusMasterConnectorModule.java b/titus-server-runtime/src/main/java/com/netflix/titus/runtime/connector/titusmaster/TitusMasterConnectorModule.java index 47ef5b67da..079a796db5 100644 --- a/titus-server-runtime/src/main/java/com/netflix/titus/runtime/connector/titusmaster/TitusMasterConnectorModule.java +++ b/titus-server-runtime/src/main/java/com/netflix/titus/runtime/connector/titusmaster/TitusMasterConnectorModule.java @@ -41,8 +41,6 @@ import com.netflix.titus.common.network.http.internal.okhttp.RxOkHttpClient; import com.netflix.titus.common.runtime.TitusRuntime; import com.netflix.titus.common.util.grpc.reactor.GrpcToReactorClientFactory; -import com.netflix.titus.grpc.protogen.AgentManagementServiceGrpc; -import com.netflix.titus.grpc.protogen.AgentManagementServiceGrpc.AgentManagementServiceStub; import com.netflix.titus.grpc.protogen.AutoScalingServiceGrpc; import com.netflix.titus.grpc.protogen.AutoScalingServiceGrpc.AutoScalingServiceStub; import com.netflix.titus.grpc.protogen.HealthGrpc; @@ -133,12 +131,6 @@ SupervisorServiceGrpc.SupervisorServiceStub supervisorClient(final @Named(MANAGE return SupervisorServiceGrpc.newStub(channel); } - @Provides - @Singleton - AgentManagementServiceStub managementClient(final @Named(MANAGED_CHANNEL_NAME) Channel channel) { - return AgentManagementServiceGrpc.newStub(channel); - } - @Provides @Singleton JobManagementServiceStub jobManagementClient(final @Named(MANAGED_CHANNEL_NAME) Channel channel) { diff --git a/titus-server-runtime/src/main/java/com/netflix/titus/runtime/endpoint/v3/grpc/ErrorResponses.java b/titus-server-runtime/src/main/java/com/netflix/titus/runtime/endpoint/v3/grpc/ErrorResponses.java index 04b637dfb8..533edd2a2d 100644 --- a/titus-server-runtime/src/main/java/com/netflix/titus/runtime/endpoint/v3/grpc/ErrorResponses.java +++ b/titus-server-runtime/src/main/java/com/netflix/titus/runtime/endpoint/v3/grpc/ErrorResponses.java @@ -23,7 +23,6 @@ import com.google.protobuf.Any; import com.google.rpc.BadRequest; import com.google.rpc.DebugInfo; -import com.netflix.titus.api.agent.service.AgentManagementException; import com.netflix.titus.api.eviction.service.EvictionException; import com.netflix.titus.api.jobmanager.service.JobManagerException; import com.netflix.titus.api.service.TitusServiceException; @@ -138,20 +137,6 @@ private static Status toGrpcStatus(Throwable original) { default: return Status.INTERNAL; } - } else if (cause instanceof AgentManagementException) { - AgentManagementException e = (AgentManagementException) cause; - switch (e.getErrorCode()) { - case InitializationError: - return Status.INTERNAL; - case InvalidArgument: - return Status.INVALID_ARGUMENT; - case InstanceGroupNotFound: - case AgentNotFound: - case InstanceTypeNotFound: - return Status.NOT_FOUND; - default: - return Status.INTERNAL; - } } else if (cause instanceof JobManagerException) { JobManagerException e = (JobManagerException) cause; switch (e.getErrorCode()) { diff --git a/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/EmbeddedTitusOperations.java b/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/EmbeddedTitusOperations.java index ebf471c758..2406e9c3bb 100644 --- a/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/EmbeddedTitusOperations.java +++ b/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/EmbeddedTitusOperations.java @@ -16,7 +16,6 @@ package com.netflix.titus.testkit.embedded; -import com.netflix.titus.grpc.protogen.AgentManagementServiceGrpc; import com.netflix.titus.grpc.protogen.HealthGrpc; import com.netflix.titus.grpc.protogen.JobManagementServiceGrpc; import com.netflix.titus.grpc.protogen.LoadBalancerServiceGrpc; @@ -37,10 +36,6 @@ public interface EmbeddedTitusOperations { JobManagementServiceGrpc.JobManagementServiceBlockingStub getV3BlockingGrpcClient(); - AgentManagementServiceGrpc.AgentManagementServiceStub getV3GrpcAgentClient(); - - AgentManagementServiceGrpc.AgentManagementServiceBlockingStub getV3BlockingGrpcAgentClient(); - LoadBalancerServiceGrpc.LoadBalancerServiceStub getLoadBalancerGrpcClient(); EvictionServiceBlockingStub getBlockingGrpcEvictionClient(); diff --git a/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/cell/EmbeddedCellTitusOperations.java b/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/cell/EmbeddedCellTitusOperations.java index b277ea3418..92bd9782a3 100644 --- a/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/cell/EmbeddedCellTitusOperations.java +++ b/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/cell/EmbeddedCellTitusOperations.java @@ -18,7 +18,6 @@ import java.util.Optional; -import com.netflix.titus.grpc.protogen.AgentManagementServiceGrpc; import com.netflix.titus.grpc.protogen.EvictionServiceGrpc; import com.netflix.titus.grpc.protogen.HealthGrpc; import com.netflix.titus.grpc.protogen.JobManagementServiceGrpc; @@ -70,16 +69,6 @@ public JobManagementServiceGrpc.JobManagementServiceBlockingStub getV3BlockingGr return gateway.map(EmbeddedTitusGateway::getV3BlockingGrpcClient).orElse(master.getV3BlockingGrpcClient()); } - @Override - public AgentManagementServiceGrpc.AgentManagementServiceStub getV3GrpcAgentClient() { - return gateway.map(EmbeddedTitusGateway::getV3GrpcAgentClient).orElse(master.getV3GrpcAgentClient()); - } - - @Override - public AgentManagementServiceGrpc.AgentManagementServiceBlockingStub getV3BlockingGrpcAgentClient() { - return gateway.map(EmbeddedTitusGateway::getV3BlockingGrpcAgentClient).orElse(master.getV3BlockingGrpcAgentClient()); - } - @Override public LoadBalancerServiceGrpc.LoadBalancerServiceStub getLoadBalancerGrpcClient() { return gateway.map(EmbeddedTitusGateway::getLoadBalancerGrpcClient).orElse(master.getLoadBalancerGrpcClient()); diff --git a/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/cell/gateway/EmbeddedTitusGateway.java b/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/cell/gateway/EmbeddedTitusGateway.java index 8154122d98..7080865bc0 100644 --- a/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/cell/gateway/EmbeddedTitusGateway.java +++ b/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/cell/gateway/EmbeddedTitusGateway.java @@ -39,7 +39,6 @@ import com.netflix.titus.common.model.admission.TitusValidatorConfiguration; import com.netflix.titus.gateway.endpoint.v3.grpc.TitusGatewayGrpcServer; import com.netflix.titus.gateway.startup.TitusGatewayModule; -import com.netflix.titus.grpc.protogen.AgentManagementServiceGrpc; import com.netflix.titus.grpc.protogen.AutoScalingServiceGrpc; import com.netflix.titus.grpc.protogen.EvictionServiceGrpc; import com.netflix.titus.grpc.protogen.HealthGrpc; @@ -211,16 +210,6 @@ public JobManagementServiceGrpc.JobManagementServiceBlockingStub getV3BlockingGr return attachCallHeaders(client); } - public AgentManagementServiceGrpc.AgentManagementServiceStub getV3GrpcAgentClient() { - AgentManagementServiceGrpc.AgentManagementServiceStub client = AgentManagementServiceGrpc.newStub(getOrCreateGrpcChannel()); - return attachCallHeaders(client); - } - - public AgentManagementServiceGrpc.AgentManagementServiceBlockingStub getV3BlockingGrpcAgentClient() { - AgentManagementServiceGrpc.AgentManagementServiceBlockingStub client = AgentManagementServiceGrpc.newBlockingStub(getOrCreateGrpcChannel()); - return attachCallHeaders(client); - } - public AutoScalingServiceGrpc.AutoScalingServiceStub getAutoScaleGrpcClient() { AutoScalingServiceGrpc.AutoScalingServiceStub client = AutoScalingServiceGrpc.newStub(getOrCreateGrpcChannel()); return attachCallHeaders(client); @@ -235,10 +224,6 @@ public EvictionServiceGrpc.EvictionServiceBlockingStub getBlockingGrpcEvictionCl return EvictionServiceGrpc.newBlockingStub(getOrCreateGrpcChannel()); } - public MachineServiceGrpc.MachineServiceBlockingStub getBlockingGrpcMachineClient() { - return MachineServiceGrpc.newBlockingStub(getOrCreateGrpcChannel()); - } - public I getInstance(Class instanceType) { return injector.getInstance(instanceType); } diff --git a/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/cell/master/EmbeddedTitusMaster.java b/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/cell/master/EmbeddedTitusMaster.java index aadc90ef1c..0b9e948ea7 100644 --- a/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/cell/master/EmbeddedTitusMaster.java +++ b/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/cell/master/EmbeddedTitusMaster.java @@ -55,7 +55,6 @@ import com.netflix.titus.common.util.archaius2.Archaius2ConfigurationLogger; import com.netflix.titus.common.util.guice.ContainerEventBus; import com.netflix.titus.ext.cassandra.testkit.store.EmbeddedCassandraStoreFactory; -import com.netflix.titus.grpc.protogen.AgentManagementServiceGrpc; import com.netflix.titus.grpc.protogen.AutoScalingServiceGrpc; import com.netflix.titus.grpc.protogen.EvictionServiceGrpc; import com.netflix.titus.grpc.protogen.HealthGrpc; @@ -293,16 +292,6 @@ public JobManagementServiceBlockingStub getV3BlockingGrpcClient() { return TestKitGrpcClientErrorUtils.attachCallHeaders(client); } - public AgentManagementServiceGrpc.AgentManagementServiceStub getV3GrpcAgentClient() { - AgentManagementServiceGrpc.AgentManagementServiceStub client = AgentManagementServiceGrpc.newStub(getOrCreateGrpcChannel()); - return TestKitGrpcClientErrorUtils.attachCallHeaders(client); - } - - public AgentManagementServiceGrpc.AgentManagementServiceBlockingStub getV3BlockingGrpcAgentClient() { - AgentManagementServiceGrpc.AgentManagementServiceBlockingStub client = AgentManagementServiceGrpc.newBlockingStub(getOrCreateGrpcChannel()); - return TestKitGrpcClientErrorUtils.attachCallHeaders(client); - } - public AutoScalingServiceGrpc.AutoScalingServiceStub getAutoScaleGrpcClient() { AutoScalingServiceGrpc.AutoScalingServiceStub client = AutoScalingServiceGrpc.newStub(getOrCreateGrpcChannel()); return TestKitGrpcClientErrorUtils.attachCallHeaders(client); @@ -313,19 +302,10 @@ public LoadBalancerServiceGrpc.LoadBalancerServiceStub getLoadBalancerGrpcClient return TestKitGrpcClientErrorUtils.attachCallHeaders(client); } - public JobActivityHistoryServiceGrpc.JobActivityHistoryServiceStub getJobActivityHistoryGrpcClient() { - JobActivityHistoryServiceGrpc.JobActivityHistoryServiceStub client = JobActivityHistoryServiceGrpc.newStub(getOrCreateGrpcChannel()); - return TestKitGrpcClientErrorUtils.attachCallHeaders(client); - } - public EvictionServiceGrpc.EvictionServiceBlockingStub getBlockingGrpcEvictionClient() { return EvictionServiceGrpc.newBlockingStub(getOrCreateGrpcChannel()); } - public MachineServiceGrpc.MachineServiceBlockingStub getBlockingGrpcMachineClient() { - return MachineServiceGrpc.newBlockingStub(getOrCreateGrpcChannel()); - } - private ManagedChannel getOrCreateGrpcChannel() { if (grpcChannel == null) { this.grpcChannel = ManagedChannelBuilder.forAddress("127.0.0.1", getGrpcPort()) diff --git a/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/federation/EmbeddedFederationTitusOperations.java b/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/federation/EmbeddedFederationTitusOperations.java index 79ecddc34e..2e99d6dc88 100644 --- a/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/federation/EmbeddedFederationTitusOperations.java +++ b/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/federation/EmbeddedFederationTitusOperations.java @@ -16,7 +16,6 @@ package com.netflix.titus.testkit.embedded.federation; -import com.netflix.titus.grpc.protogen.AgentManagementServiceGrpc; import com.netflix.titus.grpc.protogen.EvictionServiceGrpc; import com.netflix.titus.grpc.protogen.HealthGrpc; import com.netflix.titus.grpc.protogen.JobManagementServiceGrpc; @@ -62,22 +61,6 @@ public JobManagementServiceGrpc.JobManagementServiceBlockingStub getV3BlockingGr return federation.getV3BlockingGrpcClient(); } - /** - * FIXME Agent management is at cell level. This API must be changed for multi-cell support. - */ - @Override - public AgentManagementServiceGrpc.AgentManagementServiceStub getV3GrpcAgentClient() { - return federation.getCells().get(0).getTitusOperations().getV3GrpcAgentClient(); - } - - /** - * FIXME Agent management is at cell level. This API must be changed for multi-cell support. - */ - @Override - public AgentManagementServiceGrpc.AgentManagementServiceBlockingStub getV3BlockingGrpcAgentClient() { - return federation.getCells().get(0).getTitusOperations().getV3BlockingGrpcAgentClient(); - } - @Override public LoadBalancerServiceGrpc.LoadBalancerServiceStub getLoadBalancerGrpcClient() { return federation.getLoadBalancerGrpcClient(); diff --git a/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/federation/EmbeddedTitusFederation.java b/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/federation/EmbeddedTitusFederation.java index 030d920099..25b3a93d25 100644 --- a/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/federation/EmbeddedTitusFederation.java +++ b/titus-testkit/src/main/java/com/netflix/titus/testkit/embedded/federation/EmbeddedTitusFederation.java @@ -30,15 +30,12 @@ import com.netflix.governator.LifecycleInjector; import com.netflix.titus.federation.endpoint.grpc.TitusFederationGrpcServer; import com.netflix.titus.federation.startup.TitusFederationModule; -import com.netflix.titus.grpc.protogen.AgentManagementServiceGrpc; import com.netflix.titus.grpc.protogen.AutoScalingServiceGrpc; import com.netflix.titus.grpc.protogen.EvictionServiceGrpc; import com.netflix.titus.grpc.protogen.HealthGrpc; -import com.netflix.titus.grpc.protogen.JobActivityHistoryServiceGrpc; import com.netflix.titus.grpc.protogen.JobManagementServiceGrpc; import com.netflix.titus.grpc.protogen.LoadBalancerServiceGrpc; import com.netflix.titus.grpc.protogen.SchedulerServiceGrpc; -import com.netflix.titus.grpc.protogen.v4.MachineServiceGrpc; import com.netflix.titus.master.TitusMaster; import com.netflix.titus.runtime.endpoint.common.rest.EmbeddedJettyModule; import com.netflix.titus.runtime.endpoint.metadata.V3HeaderInterceptor; @@ -178,16 +175,6 @@ public JobManagementServiceGrpc.JobManagementServiceBlockingStub getV3BlockingGr return attachCallHeaders(client); } - public AgentManagementServiceGrpc.AgentManagementServiceStub getV3GrpcAgentClient() { - AgentManagementServiceGrpc.AgentManagementServiceStub client = AgentManagementServiceGrpc.newStub(getOrCreateGrpcChannel()); - return attachCallHeaders(client); - } - - public AgentManagementServiceGrpc.AgentManagementServiceBlockingStub getV3BlockingGrpcAgentClient() { - AgentManagementServiceGrpc.AgentManagementServiceBlockingStub client = AgentManagementServiceGrpc.newBlockingStub(getOrCreateGrpcChannel()); - return attachCallHeaders(client); - } - public AutoScalingServiceGrpc.AutoScalingServiceStub getAutoScaleGrpcClient() { AutoScalingServiceGrpc.AutoScalingServiceStub client = AutoScalingServiceGrpc.newStub(getOrCreateGrpcChannel()); return attachCallHeaders(client); @@ -202,14 +189,6 @@ public EvictionServiceGrpc.EvictionServiceBlockingStub getBlockingGrpcEvictionCl return EvictionServiceGrpc.newBlockingStub(getOrCreateGrpcChannel()); } - public MachineServiceGrpc.MachineServiceBlockingStub getBlockingGrpcMachineClient() { - return MachineServiceGrpc.newBlockingStub(getOrCreateGrpcChannel()); - } - - JobActivityHistoryServiceGrpc.JobActivityHistoryServiceStub getJobActivityHistoryGrpcClient() { - return JobActivityHistoryServiceGrpc.newStub(getOrCreateGrpcChannel()); - } - private ManagedChannel getOrCreateGrpcChannel() { if (grpcChannel == null) { this.grpcChannel = ManagedChannelBuilder.forAddress("localhost", getGrpcPort())