Use connection string instead of single host port pair

khorshuheng · khorshuheng · commit bef0cb86676f · 2021-04-08T10:02:05.000+08:00
Signed-off-by: Khor Shu Heng &lt;khor.heng@gojek.com&gt;
diff --git a/serving/src/main/java/feast/serving/config/FeastProperties.java b/serving/src/main/java/feast/serving/config/FeastProperties.java
@@ -319,8 +319,7 @@ public BigTableStoreConfig getBigtableConfig() {
 
     public CassandraStoreConfig getCassandraConfig() {
       return new CassandraStoreConfig(
-          this.config.get("host"),
-          Integer.valueOf(this.config.get("port")),
+          this.config.get("connection_string"),
           this.config.get("data_center"),
           this.config.get("keyspace"));
     }
diff --git a/serving/src/main/java/feast/serving/config/ServingServiceConfigV2.java b/serving/src/main/java/feast/serving/config/ServingServiceConfigV2.java
@@ -32,6 +32,9 @@
 import io.opentracing.Tracer;
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -84,14 +87,24 @@ public ServingServiceV2 servingServiceV2(
         break;
       case CASSANDRA:
         CassandraStoreConfig config = feastProperties.getActiveStore().getCassandraConfig();
-        String host = config.getHost();
-        Integer port = config.getPort();
+        String connectionString = config.getConnectionString();
         String dataCenter = config.getDataCenter();
         String keySpace = config.getKeySpace();
 
+        List<InetSocketAddress> contactPoints =
+            Arrays.stream(connectionString.split(","))
+                .map(String::trim)
+                .map(cs -> cs.split(":"))
+                .map(
+                    hostPort -> {
+                      int port = hostPort.length > 1 ? Integer.parseInt(hostPort[1]) : 9042;
+                      return new InetSocketAddress(hostPort[0], port);
+                    })
+                .collect(Collectors.toList());
+
         CqlSession session =
             new CqlSessionBuilder()
-                .addContactPoint(new InetSocketAddress(host, port))
+                .addContactPoints(contactPoints)
                 .withLocalDatacenter(dataCenter)
                 .withKeyspace(keySpace)
                 .build();
diff --git a/serving/src/test/java/feast/serving/it/BaseAuthIT.java b/serving/src/test/java/feast/serving/it/BaseAuthIT.java
@@ -79,8 +79,6 @@ static void properties(DynamicPropertyRegistry registry) {
           }
         });
     registry.add("feast.stores[0].config.port", () -> REDIS_PORT);
-    registry.add("feast.stores[0].subscriptions[0].name", () -> "*");
-    registry.add("feast.stores[0].subscriptions[0].project", () -> "*");
 
     registry.add("feast.stores[1].name", () -> "bigtable");
     registry.add("feast.stores[1].type", () -> "BIGTABLE");
@@ -99,7 +97,19 @@ static void properties(DynamicPropertyRegistry registry) {
             return "";
           }
         });
-    registry.add("feast.stores[2].config.port", () -> CASSANDRA_PORT);
+
+    registry.add(
+        "feast.stores[2].config.connection_string",
+        () -> {
+          String hostAddress = "";
+          try {
+            hostAddress = InetAddress.getLocalHost().getHostAddress();
+          } catch (UnknownHostException e) {
+            e.printStackTrace();
+          }
+
+          return String.format("%s:%s", hostAddress, CASSANDRA_PORT);
+        });
     registry.add("feast.stores[2].config.data_center", () -> CASSANDRA_DATACENTER);
     registry.add("feast.stores[2].config.keyspace", () -> CASSANDRA_KEYSPACE);
 
diff --git a/storage/connectors/cassandra/src/main/java/feast/storage/connectors/cassandra/retriever/CassandraStoreConfig.java b/storage/connectors/cassandra/src/main/java/feast/storage/connectors/cassandra/retriever/CassandraStoreConfig.java
@@ -18,24 +18,18 @@
 
 public class CassandraStoreConfig {
 
-  private final String host;
-  private final Integer port;
+  private final String connectionString;
   private final String dataCenter;
   private final String keySpace;
 
-  public CassandraStoreConfig(String host, Integer port, String dataCenter, String keySpace) {
-    this.host = host;
-    this.port = port;
+  public CassandraStoreConfig(String connectionString, String dataCenter, String keySpace) {
+    this.connectionString = connectionString;
     this.dataCenter = dataCenter;
     this.keySpace = keySpace;
   }
 
-  public String getHost() {
-    return this.host;
-  }
-
-  public Integer getPort() {
-    return this.port;
+  public String getConnectionString() {
+    return this.connectionString;
   }
 
   public String getDataCenter() {

Original file line number	Diff line number	Diff line change
`@@ -319,8 +319,7 @@ public BigTableStoreConfig getBigtableConfig() {`
`319`	`319`
`320`	`320`	`public CassandraStoreConfig getCassandraConfig() {`
`321`	`321`	`return new CassandraStoreConfig(`
`322`		`- this.config.get("host"),`
`323`		`- Integer.valueOf(this.config.get("port")),`
	`322`	`+ this.config.get("connection_string"),`
`324`	`323`	`this.config.get("data_center"),`
`325`	`324`	`this.config.get("keyspace"));`
`326`	`325`	`}`