From 9769f255942c929152dc93049c5a279e13742bf7 Mon Sep 17 00:00:00 2001 From: vladvildanov Date: Tue, 2 Jan 2024 15:49:14 +0200 Subject: [PATCH 1/2] Fixed ENV variable naming typo --- README.md | 2 +- create_db.sh | 2 +- docker-compose.yml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4ec3293..55e1816 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ export $(cat .env.credentials | xargs) ### Build RE cluster ### By default, RE cluster supports single endpoint and relies on DMC proxy to calculate hash slot. -Multiple endpoints (OSS cluster mode) could be enabled by setting env variable `RE_USE_RE_USE_OSS_CLUSTER=true`. +Multiple endpoints (OSS cluster mode) could be enabled by setting env variable `RE_USE_OSS_CLUSTER=true`. All standard RE ports available from your local network: diff --git a/create_db.sh b/create_db.sh index 37d5f51..eb51461 100755 --- a/create_db.sh +++ b/create_db.sh @@ -1,5 +1,5 @@ #!/bin/bash curl -u $RE_USERNAME:$RE_PASS -H "Content-type: application/json" \ - -d '{"name": "db", "port": '$RE_DB_PORT', "memory_size": 1273741824, "replication": false, "eviction_policy": "volatile-lru", "sharding": true, "shards_count": 3, "module_list": [{"module_args": "", "module_name": "ReJSON"},{"module_args": "", "module_name": "search"},{"module_args": "", "module_name": "timeseries"},{"module_args": "", "module_name": "bf"}], "oss_cluster": '$RE_USE_RE_USE_OSS_CLUSTER', "proxy_policy": "all-nodes", "shards_placement": "sparse", "shard_key_regex": [{"regex": ".*\\{(?.*)\\}.*"},{"regex": "(?.*)"}]}' \ + -d '{"name": "db", "port": '$RE_DB_PORT', "memory_size": 1273741824, "replication": false, "eviction_policy": "volatile-lru", "sharding": true, "shards_count": 3, "module_list": [{"module_args": "", "module_name": "ReJSON"},{"module_args": "", "module_name": "search"},{"module_args": "", "module_name": "timeseries"},{"module_args": "", "module_name": "bf"}], "oss_cluster": '$RE_USE_OSS_CLUSTER', "proxy_policy": "all-nodes", "shards_placement": "sparse", "shard_key_regex": [{"regex": ".*\\{(?.*)\\}.*"},{"regex": "(?.*)"}]}' \ -k -X POST https://localhost:9443/v1/bdbs \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index ed3b003..0b3b4c7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,7 +15,7 @@ services: - RE_PASS=${RE_PASS} - RE_CLUSTER_NAME=${RE_CLUSTER_NAME} - RE_DB_PORT=${RE_DB_PORT} - - RE_USE_RE_USE_OSS_CLUSTER=${RE_USE_RE_USE_OSS_CLUSTER} + - RE_USE_OSS_CLUSTER=${RE_USE_OSS_CLUSTER} volumes: - "$PWD/setup_cluster.sh:/opt/setup_cluster.sh" - "$PWD/create_db.sh:/opt/create_db.sh" @@ -39,7 +39,7 @@ services: - RE_PASS=${RE_PASS} - RE_CLUSTER_NAME=${RE_CLUSTER_NAME} - RE_DB_PORT=${RE_DB_PORT} - - RE_USE_RE_USE_OSS_CLUSTER=${RE_USE_RE_USE_OSS_CLUSTER} + - RE_USE_OSS_CLUSTER=${RE_USE_OSS_CLUSTER} volumes: - "$PWD/join_node.sh:/opt/join_node.sh" networks: @@ -62,7 +62,7 @@ services: - RE_PASS=${RE_PASS} - RE_CLUSTER_NAME=${RE_CLUSTER_NAME} - RE_DB_PORT=${RE_DB_PORT} - - RE_USE_RE_USE_OSS_CLUSTER=${RE_USE_RE_USE_OSS_CLUSTER} + - RE_USE_OSS_CLUSTER=${RE_USE_OSS_CLUSTER} volumes: - "$PWD/join_node.sh:/opt/join_node.sh" networks: From ff30ae6a9d32ffda7344b62fd3edf7b5700e174a Mon Sep 17 00:00:00 2001 From: vladvildanov Date: Tue, 2 Jan 2024 15:53:24 +0200 Subject: [PATCH 2/2] Fixed env name --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3fc3d15..5895976 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -41,4 +41,4 @@ jobs: - name: Run PING command run: | - docker-compose exec -T master-node bash -c "/opt/redislabs/bin/redis-cli -p ${{ env.DB_PORT }} ping" \ No newline at end of file + docker-compose exec -T master-node bash -c "/opt/redislabs/bin/redis-cli -p ${{ env.RE_DB_PORT }} ping" \ No newline at end of file