Skip to content

Add redis timeout configuration option & Serving Configuration Refactoring #8

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

Merged
pyalex merged 6 commits into from
Mar 5, 2021
Merged

Add redis timeout configuration option & Serving Configuration Refactoring #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fd90460
add redis timeout option
pyalex Mar 4, 2021
b311905
fix typo
pyalex Mar 4, 2021
83b4ef1
remove StoreProto.Store
pyalex Mar 4, 2021
b7cfc91
remove StoreProto.Store
pyalex Mar 4, 2021
8ec4861
fix test
pyalex Mar 4, 2021
7eb226d
clean up
pyalex Mar 4, 2021
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
269 changes: 25 additions & 244 deletions serving/src/main/java/feast/serving/config/FeastProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,18 @@
// https://www.baeldung.com/configuration-properties-in-spring-boot
// https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html#boot-features-external-config-typesafe-configuration-properties

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.protobuf.InvalidProtocolBufferException;
import com.google.protobuf.util.JsonFormat;
import feast.common.auth.config.SecurityProperties;
import feast.common.auth.config.SecurityProperties.AuthenticationProperties;
import feast.common.auth.config.SecurityProperties.AuthorizationProperties;
import feast.common.auth.credentials.CoreAuthenticationProperties;
import feast.common.logging.config.LoggingProperties;
import feast.proto.core.StoreProto;
import feast.storage.connectors.redis.retriever.RedisClusterStoreConfig;
import feast.storage.connectors.redis.retriever.RedisStoreConfig;
import io.lettuce.core.ReadFrom;
import java.time.Duration;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
import javax.validation.Validation;
import javax.validation.Validator;
import javax.validation.ValidatorFactory;
import javax.validation.*;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Positive;
Expand Down Expand Up @@ -146,9 +140,6 @@ public void setActiveStore(String activeStore) {
*/
private List<Store> stores = new ArrayList<>();

/* Job Store properties to retain state of async jobs. */
private JobStoreProperties jobStore;

/* Metric tracing properties. */
private TracingProperties tracing;

Expand Down Expand Up @@ -259,8 +250,6 @@ public static class Store {

private Map<String, String> config = new HashMap<>();

private List<Subscription> subscriptions = new ArrayList<>();

/**
* Gets name of this store. This is unique to this specific instance.
*
Expand All @@ -280,12 +269,12 @@ public void setName(String name) {
}

/**
* Gets the store type. Example are REDIS or BIGQUERY
* Gets the store type. Example are REDIS or REDIS_CLUSTER
*
* @return the store type as a String.
*/
public String getType() {
return type;
public StoreType getType() {
return StoreType.valueOf(this.type);
}

/**
Expand All @@ -297,64 +286,6 @@ public void setType(String type) {
this.type = type;
}

/**
* Converts this {@link Store} to a {@link StoreProto.Store}
*
* @return {@link StoreProto.Store} with configuration set
* @throws InvalidProtocolBufferException the invalid protocol buffer exception
* @throws JsonProcessingException the json processing exception
*/
public StoreProto.Store toProto()
throws InvalidProtocolBufferException, JsonProcessingException {
List<Subscription> subscriptions = getSubscriptions();
List<StoreProto.Store.Subscription> subscriptionProtos =
subscriptions.stream().map(Subscription::toProto).collect(Collectors.toList());

StoreProto.Store.Builder storeProtoBuilder =
StoreProto.Store.newBuilder()
.setName(name)
.setType(StoreProto.Store.StoreType.valueOf(type))
.addAllSubscriptions(subscriptionProtos);

ObjectMapper jsonWriter = new ObjectMapper();

// TODO: All of this logic should be moved to the store layer. Only a Map<String, String>
// should be sent to a store and it should do its own validation.
switch (StoreProto.Store.StoreType.valueOf(type)) {
case REDIS_CLUSTER:
StoreProto.Store.RedisClusterConfig.Builder redisClusterConfig =
StoreProto.Store.RedisClusterConfig.newBuilder();
JsonFormat.parser().merge(jsonWriter.writeValueAsString(config), redisClusterConfig);
return storeProtoBuilder.setRedisClusterConfig(redisClusterConfig.build()).build();
case REDIS:
StoreProto.Store.RedisConfig.Builder redisConfig =
StoreProto.Store.RedisConfig.newBuilder();
JsonFormat.parser().merge(jsonWriter.writeValueAsString(config), redisConfig);
return storeProtoBuilder.setRedisConfig(redisConfig.build()).build();
default:
throw new InvalidProtocolBufferException("Invalid store set");
}
}

/**
* Get the subscriptions to this specific store. The subscriptions indicate which feature sets a
* store subscribes to.
*
* @return List of subscriptions.
*/
public List<Subscription> getSubscriptions() {
return subscriptions;
}

/**
* Sets the store specific configuration. See getSubscriptions() for more details.
*
* @param subscriptions the subscriptions list
*/
public void setSubscriptions(List<Subscription> subscriptions) {
this.subscriptions = subscriptions;
}

/**
* Gets the configuration to this specific store. This is a map of strings. These options are
* unique to the store. Please see protos/feast/core/Store.proto for the store specific
Expand All @@ -366,6 +297,20 @@ public Map<String, String> getConfig() {
return config;
}

public RedisClusterStoreConfig getRedisClusterConfig() {
return new RedisClusterStoreConfig(
this.config.get("connection_string"),
ReadFrom.valueOf(this.config.get("read_from")),
Duration.parse(this.config.get("timeout")));
}

public RedisStoreConfig getRedisConfig() {
return new RedisStoreConfig(
this.config.get("host"),
Integer.valueOf(this.config.get("port")),
Boolean.valueOf(this.config.getOrDefault("ssl", "false")));
}

/**
* Sets the store config. Please protos/feast/core/Store.proto for the specific options for each
* store.
Expand All @@ -375,129 +320,11 @@ public Map<String, String> getConfig() {
public void setConfig(Map<String, String> config) {
this.config = config;
}

/**
* The Subscription type.
*
* <p>Note: Please see protos/feast/core/CoreService.proto for details on how to subscribe to
* feature sets.
*/
public static class Subscription {
/** Feast project to subscribe to. */
String project;

/** Feature set to subscribe to. */
String name;

/** Feature set versions to subscribe to. */
String version;

/** Project/Feature set exclude flag to subscribe to. */
boolean exclude;

/**
* Gets Feast project subscribed to.
*
* @return the project string
*/
public String getProject() {
return project;
}

/**
* Sets Feast project to subscribe to for this store.
*
* @param project the project
*/
public void setProject(String project) {
this.project = project;
}

/**
* Gets the feature set name to subscribe to.
*
* @return the name
*/
public String getName() {
return name;
}

/**
* Sets the feature set name to subscribe to.
*
* @param name the name
*/
public void setName(String name) {
this.name = name;
}

/**
* Gets the feature set version that is being subscribed to by this store.
*
* @return the version
*/
public String getVersion() {
return version;
}

/**
* Sets the feature set version that is being subscribed to by this store.
*
* @param version the version
*/
public void setVersion(String version) {
this.version = version;
}

/**
* Gets the exclude flag to subscribe to.
*
* @return the exclude flag
*/
public boolean getExclude() {
return exclude;
}

/**
* Sets the exclude flag to subscribe to.
*
* @param exclude the exclude flag
*/
public void setExclude(boolean exclude) {
this.exclude = exclude;
}

/**
* Convert this {@link Subscription} to a {@link StoreProto.Store.Subscription}.
*
* @return the store proto . store . subscription
*/
public StoreProto.Store.Subscription toProto() {
return StoreProto.Store.Subscription.newBuilder()
.setName(getName())
.setProject(getProject())
.setExclude(getExclude())
.build();
}
}
}

/**
* Gets job store properties
*
* @return the job store properties
*/
public JobStoreProperties getJobStore() {
return jobStore;
}

/**
* Set job store properties
*
* @param jobStore Job store properties to set
*/
public void setJobStore(JobStoreProperties jobStore) {
this.jobStore = jobStore;
public enum StoreType {
REDIS,
REDIS_CLUSTER;
}

/**
Expand Down Expand Up @@ -532,52 +359,6 @@ public void setLogging(LoggingProperties logging) {
this.logging = logging;
}

/** The type Job store properties. */
public static class JobStoreProperties {

/** Job Store Redis Host */
private String redisHost;

/** Job Store Redis Host */
private int redisPort;

/**
* Gets redis host.
*
* @return the redis host
*/
public String getRedisHost() {
return redisHost;
}

/**
* Sets redis host.
*
* @param redisHost the redis host
*/
public void setRedisHost(String redisHost) {
this.redisHost = redisHost;
}

/**
* Gets redis port.
*
* @return the redis port
*/
public int getRedisPort() {
return redisPort;
}

/**
* Sets redis port.
*
* @param redisPort the redis port
*/
public void setRedisPort(int redisPort) {
this.redisPort = redisPort;
}
}

/** Trace metric collection properties */
public static class TracingProperties {

Expand Down
14 changes: 3 additions & 11 deletions serving/src/main/java/feast/serving/config/ServingServiceConfigV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import com.fasterxml.jackson.core.JsonProcessingException;
import com.google.protobuf.InvalidProtocolBufferException;
import feast.proto.core.StoreProto;
import feast.serving.service.OnlineServingServiceV2;
import feast.serving.service.ServingServiceV2;
import feast.serving.specs.CachedSpecService;
Expand All @@ -39,26 +38,19 @@ public ServingServiceV2 servingServiceV2(
throws InvalidProtocolBufferException, JsonProcessingException {
ServingServiceV2 servingService = null;
FeastProperties.Store store = feastProperties.getActiveStore();
StoreProto.Store.StoreType storeType = store.toProto().getType();

switch (storeType) {
switch (store.getType()) {
case REDIS_CLUSTER:
RedisClientAdapter redisClusterClient =
RedisClusterClient.create(store.toProto().getRedisClusterConfig());
RedisClusterClient.create(store.getRedisClusterConfig());
OnlineRetrieverV2 redisClusterRetriever = new OnlineRetriever(redisClusterClient);
servingService = new OnlineServingServiceV2(redisClusterRetriever, specService, tracer);
break;
case REDIS:
RedisClientAdapter redisClient = RedisClient.create(store.toProto().getRedisConfig());
RedisClientAdapter redisClient = RedisClient.create(store.getRedisConfig());
OnlineRetrieverV2 redisRetriever = new OnlineRetriever(redisClient);
servingService = new OnlineServingServiceV2(redisRetriever, specService, tracer);
break;
case UNRECOGNIZED:
case INVALID:
throw new IllegalArgumentException(
String.format(
"Unsupported store type '%s' for store name '%s'",
store.getType(), store.getName()));
}

return servingService;
Expand Down
7 changes: 2 additions & 5 deletions serving/src/main/java/feast/serving/config/SpecServiceConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import com.fasterxml.jackson.core.JsonProcessingException;
import com.google.protobuf.InvalidProtocolBufferException;
import feast.proto.core.StoreProto;
import feast.serving.specs.CachedSpecService;
import feast.serving.specs.CoreSpecService;
import io.grpc.CallCredentials;
Expand Down Expand Up @@ -61,13 +60,11 @@ public ScheduledExecutorService cachedSpecServiceScheduledExecutorService(
}

@Bean
public CachedSpecService specService(
FeastProperties feastProperties, ObjectProvider<CallCredentials> callCredentials)
public CachedSpecService specService(ObjectProvider<CallCredentials> callCredentials)
throws InvalidProtocolBufferException, JsonProcessingException {
CoreSpecService coreService =
new CoreSpecService(feastCoreHost, feastCorePort, callCredentials);
StoreProto.Store storeProto = feastProperties.getActiveStore().toProto();
CachedSpecService cachedSpecStorage = new CachedSpecService(coreService, storeProto);
CachedSpecService cachedSpecStorage = new CachedSpecService(coreService);
try {
cachedSpecStorage.populateCache();
} catch (Exception e) {
Expand Down
Loading