Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Config circular bug #210

Merged
merged 2 commits into from
Aug 29, 2018
Merged

Config circular bug #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c1e94a
fix circular dependency
ukclivecox Aug 29, 2018
ff8e55e
Merge branch 'master' into config_circular_bug
ukclivecox Aug 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions engine/src/main/java/io/seldon/engine/grpc/SeldonGrpcServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class SeldonGrpcServer {
private final static String ENGINE_SERVER_PORT_KEY = "ENGINE_SERVER_GRPC_PORT";
public static final int SERVER_PORT = 5000;

private final String ANNOTATION_MAX_MESSAGE_SIZE = "seldon.io/grpc-max-message-size";
public final static String ANNOTATION_MAX_MESSAGE_SIZE = "seldon.io/grpc-max-message-size";

private final int port;
private final Server server;
Expand Down Expand Up @@ -124,7 +124,4 @@ private void blockUntilShutdown() throws InterruptedException {
}
}

public int getMaxMessageSize() {
return maxMessageSize;
}
}
64 changes: 38 additions & 26 deletions engine/src/main/java/io/seldon/engine/service/InternalPredictionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

import io.grpc.ManagedChannel;
import io.grpc.ManagedChannelBuilder;
import io.seldon.engine.config.AnnotationsConfig;
import io.seldon.engine.exception.APIException;
import io.seldon.engine.grpc.SeldonGrpcServer;
import io.seldon.engine.pb.ProtoBufUtils;
Expand Down Expand Up @@ -77,13 +78,24 @@ public class InternalPredictionService {
ObjectMapper mapper = new ObjectMapper();

RestTemplate restTemplate;
SeldonGrpcServer grpcServer;

private int maxMessageSize = io.grpc.internal.GrpcUtil.DEFAULT_MAX_MESSAGE_SIZE;

@Autowired
public InternalPredictionService(RestTemplate restTemplate,SeldonGrpcServer grpcServer){
public InternalPredictionService(RestTemplate restTemplate,AnnotationsConfig annotations){
this.restTemplate = restTemplate;
this.grpcServer = grpcServer;
if (annotations.has(SeldonGrpcServer.ANNOTATION_MAX_MESSAGE_SIZE))
{
try
{
maxMessageSize =Integer.parseInt(annotations.get(SeldonGrpcServer.ANNOTATION_MAX_MESSAGE_SIZE));
logger.info("Setting max message to {}",maxMessageSize);
}
catch(NumberFormatException e)
{
logger.warn("Failed to parse {} with value {}",SeldonGrpcServer.ANNOTATION_MAX_MESSAGE_SIZE,annotations.get(SeldonGrpcServer.ANNOTATION_MAX_MESSAGE_SIZE),e);
}
}
}

public SeldonMessage route(SeldonMessage input, PredictiveUnitState state) throws InvalidProtocolBufferException
Expand All @@ -98,15 +110,15 @@ public SeldonMessage route(SeldonMessage input, PredictiveUnitState state) throw
if (state.type==PredictiveUnitType.UNKNOWN_TYPE){
GenericBlockingStub stub = GenericGrpc.newBlockingStub(getChannel(endpoint))
.withDeadlineAfter(TIMEOUT, TimeUnit.SECONDS)
.withMaxInboundMessageSize(grpcServer.getMaxMessageSize())
.withMaxOutboundMessageSize(grpcServer.getMaxMessageSize());
.withMaxInboundMessageSize(maxMessageSize)
.withMaxOutboundMessageSize(maxMessageSize);
return stub.route(input);
}
else {
RouterBlockingStub stub = RouterGrpc.newBlockingStub(getChannel(endpoint))
.withDeadlineAfter(TIMEOUT, TimeUnit.SECONDS)
.withMaxInboundMessageSize(grpcServer.getMaxMessageSize())
.withMaxOutboundMessageSize(grpcServer.getMaxMessageSize());
.withMaxInboundMessageSize(maxMessageSize)
.withMaxOutboundMessageSize(maxMessageSize);
return stub.route(input);
}
}
Expand All @@ -125,15 +137,15 @@ public SeldonMessage sendFeedback(Feedback feedback, PredictiveUnitState state)
if (state.type==PredictiveUnitType.UNKNOWN_TYPE){
GenericBlockingStub stub = GenericGrpc.newBlockingStub(getChannel(endpoint))
.withDeadlineAfter(TIMEOUT, TimeUnit.SECONDS)
.withMaxInboundMessageSize(grpcServer.getMaxMessageSize())
.withMaxOutboundMessageSize(grpcServer.getMaxMessageSize());
.withMaxInboundMessageSize(maxMessageSize)
.withMaxOutboundMessageSize(maxMessageSize);
return stub.sendFeedback(feedback);
}
else {
RouterBlockingStub routerStub = RouterGrpc.newBlockingStub(getChannel(endpoint))
.withDeadlineAfter(TIMEOUT, TimeUnit.SECONDS)
.withMaxInboundMessageSize(grpcServer.getMaxMessageSize())
.withMaxOutboundMessageSize(grpcServer.getMaxMessageSize());
.withMaxInboundMessageSize(maxMessageSize)
.withMaxOutboundMessageSize(maxMessageSize);
return routerStub.sendFeedback(feedback);
}
}
Expand All @@ -158,20 +170,20 @@ public SeldonMessage transformInput(SeldonMessage input, PredictiveUnitState sta
case UNKNOWN_TYPE:
GenericBlockingStub genStub = GenericGrpc.newBlockingStub(getChannel(endpoint))
.withDeadlineAfter(TIMEOUT, TimeUnit.SECONDS)
.withMaxInboundMessageSize(grpcServer.getMaxMessageSize())
.withMaxOutboundMessageSize(grpcServer.getMaxMessageSize());
.withMaxInboundMessageSize(maxMessageSize)
.withMaxOutboundMessageSize(maxMessageSize);
return genStub.transformInput(input);
case MODEL:
ModelBlockingStub modelStub = ModelGrpc.newBlockingStub(getChannel(endpoint))
.withDeadlineAfter(TIMEOUT, TimeUnit.SECONDS)
.withMaxInboundMessageSize(grpcServer.getMaxMessageSize())
.withMaxOutboundMessageSize(grpcServer.getMaxMessageSize());
.withMaxInboundMessageSize(maxMessageSize)
.withMaxOutboundMessageSize(maxMessageSize);
return modelStub.predict(input);
case TRANSFORMER:
TransformerBlockingStub transformerStub = TransformerGrpc.newBlockingStub(getChannel(endpoint))
.withDeadlineAfter(TIMEOUT, TimeUnit.SECONDS)
.withMaxInboundMessageSize(grpcServer.getMaxMessageSize())
.withMaxOutboundMessageSize(grpcServer.getMaxMessageSize());
.withMaxInboundMessageSize(maxMessageSize)
.withMaxOutboundMessageSize(maxMessageSize);
return transformerStub.transformInput(input);
default:
throw new APIException(APIException.ApiExceptionType.ENGINE_MICROSERVICE_ERROR,"Unhandled type");
Expand All @@ -192,15 +204,15 @@ public SeldonMessage transformOutput(SeldonMessage output, PredictiveUnitState s
if (state.type==PredictiveUnitType.UNKNOWN_TYPE){
GenericBlockingStub stub = GenericGrpc.newBlockingStub(getChannel(endpoint))
.withDeadlineAfter(TIMEOUT, TimeUnit.SECONDS)
.withMaxInboundMessageSize(grpcServer.getMaxMessageSize())
.withMaxOutboundMessageSize(grpcServer.getMaxMessageSize());
.withMaxInboundMessageSize(maxMessageSize)
.withMaxOutboundMessageSize(maxMessageSize);
return stub.transformOutput(output);
}
else {
OutputTransformerBlockingStub stub = OutputTransformerGrpc.newBlockingStub(getChannel(endpoint))
.withDeadlineAfter(TIMEOUT, TimeUnit.SECONDS)
.withMaxInboundMessageSize(grpcServer.getMaxMessageSize())
.withMaxOutboundMessageSize(grpcServer.getMaxMessageSize());
.withMaxInboundMessageSize(maxMessageSize)
.withMaxOutboundMessageSize(maxMessageSize);
return stub.transformOutput(output);
}
}
Expand All @@ -219,15 +231,15 @@ public SeldonMessage aggregate(List<SeldonMessage> outputs, PredictiveUnitState
if (state.type==PredictiveUnitType.UNKNOWN_TYPE){
GenericBlockingStub stub = GenericGrpc.newBlockingStub(getChannel(endpoint))
.withDeadlineAfter(TIMEOUT, TimeUnit.SECONDS)
.withMaxInboundMessageSize(grpcServer.getMaxMessageSize())
.withMaxOutboundMessageSize(grpcServer.getMaxMessageSize());
.withMaxInboundMessageSize(maxMessageSize)
.withMaxOutboundMessageSize(maxMessageSize);
return stub.aggregate(outputsList);
}
else {
CombinerBlockingStub stub = CombinerGrpc.newBlockingStub(getChannel(endpoint))
.withDeadlineAfter(TIMEOUT, TimeUnit.SECONDS)
.withMaxInboundMessageSize(grpcServer.getMaxMessageSize())
.withMaxOutboundMessageSize(grpcServer.getMaxMessageSize());
.withMaxInboundMessageSize(maxMessageSize)
.withMaxOutboundMessageSize(maxMessageSize);
return stub.aggregate(outputsList);
}
}
Expand Down