Skip to content

Add configurable timeout to redis cluster connection #1356

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 1 commit into from
Feb 24, 2021
Merged

Add configurable timeout to redis cluster connection #1356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions protos/feast/core/Store.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ option java_package = "feast.proto.core";
option java_outer_classname = "StoreProto";
option go_package = "github.com/feast-dev/feast/sdk/go/protos/feast/core";

import "google/protobuf/duration.proto";

// Store provides a location where Feast reads and writes feature values.
// Feature values will be written to the Store in the form of FeatureRow elements.
// The way FeatureRow is encoded and decoded when it is written to and read from
Expand Down Expand Up @@ -86,6 +88,8 @@ message Store {
REPLICA_PREFERRED = 3;
}
ReadFrom read_from = 8;
// Optional. Timeout on waiting response from redis node
google.protobuf.Duration timeout = 9;
}

message Subscription {
Expand Down
9 changes: 8 additions & 1 deletion serving/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,13 @@
<artifactId>feast-common</artifactId>
<version>${project.version}</version>
</dependency>


<dependency>
<groupId>io.lettuce</groupId>
<artifactId>lettuce-core</artifactId>
<version>6.0.2.RELEASE</version>
</dependency>

<!-- TODO: SLF4J is being used via Lombok, but also jog4j - pick one -->
<dependency>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -197,6 +203,7 @@
<artifactId>simpleclient_servlet</artifactId>
<version>0.8.0</version>
</dependency>

<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_spring_boot</artifactId>
Expand Down
1 change: 1 addition & 0 deletions serving/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ feast:
# Connection string specifies the host:port of Redis instances in the redis cluster.
connection_string: "localhost:7000,localhost:7001,localhost:7002,localhost:7003,localhost:7004,localhost:7005"
read_from: MASTER
timeout: 0.5s
subscriptions:
- name: "*"
project: "*"
Expand Down
8 changes: 8 additions & 0 deletions storage/connectors/redis/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@
<dependency>
<groupId>io.lettuce</groupId>
<artifactId>lettuce-core</artifactId>
<version>6.0.2.RELEASE</version>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>4.1.52.Final</version>
<classifier>linux-x86_64</classifier>
</dependency>

<dependency>
Expand Down
31 changes: 25 additions & 6 deletions ...tors/redis/src/main/java/feast/storage/connectors/redis/retriever/RedisClusterClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
import feast.proto.core.StoreProto.Store.RedisClusterConfig;
import feast.storage.connectors.redis.serializer.RedisKeyPrefixSerializerV2;
import feast.storage.connectors.redis.serializer.RedisKeySerializerV2;
import io.lettuce.core.KeyValue;
import io.lettuce.core.ReadFrom;
import io.lettuce.core.RedisFuture;
import io.lettuce.core.RedisURI;
import io.lettuce.core.*;
import io.lettuce.core.cluster.ClusterClientOptions;
import io.lettuce.core.cluster.ClusterTopologyRefreshOptions;
import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
import io.lettuce.core.cluster.api.async.RedisAdvancedClusterAsyncCommands;
import io.lettuce.core.codec.ByteArrayCodec;
import java.time.Duration;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -100,9 +100,28 @@ public static RedisClientAdapter create(StoreProto.Store.RedisClusterConfig conf
return RedisURI.create(hostPortSplit[0], Integer.parseInt(hostPortSplit[1]));
})
.collect(Collectors.toList());
io.lettuce.core.cluster.RedisClusterClient client =
io.lettuce.core.cluster.RedisClusterClient.create(redisURIList);

Duration timeout;
if (config.hasTimeout()) {
timeout =
Duration.ofSeconds(config.getTimeout().getSeconds(), config.getTimeout().getNanos());
} else {
timeout = Duration.ofSeconds(10);
}

client.setOptions(
ClusterClientOptions.builder()
.socketOptions(SocketOptions.builder().keepAlive(true).tcpNoDelay(true).build())
.timeoutOptions(TimeoutOptions.enabled(timeout))
.pingBeforeActivateConnection(true)
.topologyRefreshOptions(
ClusterTopologyRefreshOptions.builder().enableAllAdaptiveRefreshTriggers().build())
.build());

StatefulRedisClusterConnection<byte[], byte[]> connection =
io.lettuce.core.cluster.RedisClusterClient.create(redisURIList)
.connect(new ByteArrayCodec());
client.connect(new ByteArrayCodec());

connection.setReadFrom(PROTO_TO_LETTUCE_TYPES.get(config.getReadFrom()));

Expand Down