fix: Rollback Redis-py to Redis-py-cluster (#2347)

* Roll back redis config and add tests back Signed-off-by: Kevin Zhang <[email protected]> * lint Signed-off-by: Kevin Zhang <[email protected]> * Fix autogenerated import Signed-off-by: Kevin Zhang <[email protected]> * Fix lint Signed-off-by: Kevin Zhang <[email protected]> * Add redis-py-cluster back Signed-off-by: Kevin Zhang <[email protected]> * Fix dask ci Signed-off-by: Kevin Zhang <[email protected]> * Regenerate using respective python 3 versions Signed-off-by: Kevin Zhang <[email protected]> * Change test_entity_ttl test Signed-off-by: Kevin Zhang <[email protected]> * Fix lint Signed-off-by: Kevin Zhang <[email protected]> * Change integration workflow Signed-off-by: Kevin Zhang <[email protected]> * Temporarily disable for testing Signed-off-by: Kevin Zhang <[email protected]> * Continue making work Signed-off-by: Kevin Zhang <[email protected]> * Continue making work Signed-off-by: Kevin Zhang <[email protected]> * Fix workflow Signed-off-by: Kevin Zhang <[email protected]> * Fix workflow Signed-off-by: Kevin Zhang <[email protected]> * Update port numbers Signed-off-by: Kevin Zhang <[email protected]> * Update pr integration tests Signed-off-by: Kevin Zhang <[email protected]> * Reenable rest of tests Signed-off-by: Kevin Zhang <[email protected]> * Update data source creator Signed-off-by: Kevin Zhang <[email protected]> * Fix integration test Signed-off-by: Kevin Zhang <[email protected]> * Clean up code Signed-off-by: Kevin Zhang <[email protected]> * Somehow removed the key components -,- Signed-off-by: Kevin Zhang <[email protected]>
feast-dev · Mar 4, 2022 · 003819b · 003819b
1 parent bd6b44b
commit 003819b
Show file tree

Hide file tree

Showing 10 changed files with 151 additions and 196 deletions.
diff --git a/.github/workflows/pr_integration_tests.yml b/.github/workflows/pr_integration_tests.yml
@@ -84,16 +84,6 @@ jobs:
     env:
       OS: ${{ matrix.os }}
       PYTHON: ${{ matrix.python-version }}
-    services:
-      redis:
-        image: redis
-        ports:
-          - 6379:6379
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/.gitignore b/.gitignore
@@ -54,7 +54,7 @@ vendor
 .terraform/
 *.tfvars
 
-# python 
+# python
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -107,6 +107,7 @@ coverage.xml
 *.cover
 .hypothesis/
 .pytest_cache/
+infra/scripts/*.conf
 
 # Translations
 *.mo

diff --git a/sdk/python/feast/infra/online_stores/redis.py b/sdk/python/feast/infra/online_stores/redis.py
@@ -41,7 +41,7 @@
 
 try:
     from redis import Redis
-    from redis.cluster import ClusterNode, RedisCluster
+    from rediscluster import RedisCluster
 except ImportError as e:
     from feast.errors import FeastExtrasDependencyImportError
 
@@ -163,9 +163,7 @@ def _get_client(self, online_store_config: RedisOnlineStoreConfig):
                 online_store_config.connection_string
             )
             if online_store_config.redis_type == RedisType.redis_cluster:
-                kwargs["startup_nodes"] = [
-                    ClusterNode(**node) for node in startup_nodes
-                ]
+                kwargs["startup_nodes"] = startup_nodes
                 self._client = RedisCluster(**kwargs)
             else:
                 kwargs["host"] = startup_nodes[0]["host"]