Merge pull request #191 from FalkorDB/190-add-aws-support-for-pro-and…

…-enterprise-tiers 190 add aws support for pro and enterprise tiers
FalkorDB · Nov 25, 2024 · ebd0086 · ebd0086
2 parents 0258faa + e095654
commit ebd0086
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 16 deletions.
diff --git a/falkordb-cluster/cluster-entrypoint.sh b/falkordb-cluster/cluster-entrypoint.sh
@@ -147,6 +147,10 @@ create_user() {
   redis-cli -p $NODE_PORT $AUTH_CONNECTION_STRING $TLS_CONNECTION_STRING ACL SETUSER $FALKORDB_USER on ">$FALKORDB_PASSWORD" ~* +INFO +PING +HELLO +AUTH +RESTORE +DUMP +DEL +EXISTS +UNLINK +TYPE +FLUSHALL +TOUCH +EXPIRE +PEXPIREAT +TTL +PTTL +EXPIRETIME +RENAME +RENAMENX +SCAN +DISCARD +EXEC +MULTI +UNWATCH +WATCH +ECHO +SLOWLOG +WAIT +WAITAOF +GRAPH.INFO +GRAPH.LIST +GRAPH.QUERY +GRAPH.RO_QUERY +GRAPH.EXPLAIN +GRAPH.PROFILE +GRAPH.DELETE +GRAPH.CONSTRAINT +GRAPH.SLOWLOG +GRAPH.BULK +GRAPH.CONFIG +CLUSTER +COMMAND
 }
 
+get_default_memory_limit() {
+  echo "$(awk '/MemTotal/ {printf "%d\n", (($2 / 1024 - 2330) > 100 ? ($2 / 1024 - 2330) : 100)}' /proc/meminfo)MB"
+}
+
 set_memory_limit() {
   declare -A memory_limit_instance_type_map
   memory_limit_instance_type_map=(
@@ -164,16 +168,16 @@ set_memory_limit() {
   )
   if [[ -z $INSTANCE_TYPE ]]; then
     echo "INSTANCE_TYPE is not set"
-    return
+    MEMORY_LIMIT=$(get_default_memory_limit)
   fi
 
   instance_size_in_map=${memory_limit_instance_type_map[$INSTANCE_TYPE]}
 
   if [[ -n $instance_size_in_map && -z $MEMORY_LIMIT ]];then
     MEMORY_LIMIT=$instance_size_in_map
   elif [[ -z $instance_size_in_map && -z $MEMORY_LIMIT ]];then
-    echo "INSTANCE_TYPE is not set. Setting 100MB"
-    MEMORY_LIMIT="100MB"
+    MEMORY_LIMIT=$(get_default_memory_limit)
+    echo "INSTANCE_TYPE is not set. Setting to default memory limit"
   fi
 
   echo "Setting maxmemory to $MEMORY_LIMIT"

diff --git a/falkordb-node/node-entrypoint.sh b/falkordb-node/node-entrypoint.sh
@@ -194,6 +194,10 @@ get_self_host_ip() {
   fi
 }
 
+get_default_memory_limit() {
+  echo "$(awk '/MemTotal/ {printf "%d\n", (($2 / 1024 - 2330) > 100 ? ($2 / 1024 - 2330) : 100)}' /proc/meminfo)MB"
+}
+
 get_memory_limit() {
 
   declare -A memory_limit_instance_type_map
@@ -213,16 +217,16 @@ get_memory_limit() {
 
   if [[ -z $INSTANCE_TYPE ]]; then
     echo "INSTANCE_TYPE is not set"
-    return
+    MEMORY_LIMIT=$(get_default_memory_limit)
   fi
 
   instance_size_in_map=${memory_limit_instance_type_map[$INSTANCE_TYPE]}
 
   if [[ -n $instance_size_in_map && -z $MEMORY_LIMIT ]];then
     MEMORY_LIMIT=$instance_size_in_map
   elif [[ -z $instance_size_in_map && -z $MEMORY_LIMIT ]];then
-    echo "INSTANCE_TYPE is not set. Setting 100MB"
-    MEMORY_LIMIT="100MB"
+    MEMORY_LIMIT=$(get_default_memory_limit)
+    echo "INSTANCE_TYPE is not set. Setting to default memory limit"
   fi
 
   echo "Memory Limit: $MEMORY_LIMIT"

diff --git a/omnistrate.enterprise.yaml b/omnistrate.enterprise.yaml
@@ -484,8 +484,8 @@ services:
           node-s: maxMemory
     x-omnistrate-capabilities:
       backupConfiguration:
-        backupRetentionInDays: 7
-        backupPeriodInHours: 12
+        backupRetentionInDays: 2
+        backupPeriodInHours: 2
     depends_on:
       - node-s
 
@@ -497,6 +497,8 @@ services:
       instanceTypes:
         - cloudProvider: gcp
           apiParam: nodeInstanceType
+        - cloudProvider: aws
+          apiParam: nodeInstanceType
     x-omnistrate-api-params:
       - key: nodeInstanceType
         description: The size of the node instance. Check the documentation for more information.
@@ -873,8 +875,8 @@ services:
 
     x-omnistrate-capabilities:
       backupConfiguration:
-        backupRetentionInDays: 7
-        backupPeriodInHours: 12
+        backupRetentionInDays: 2
+        backupPeriodInHours: 2
     depends_on:
       - node-sz
 
@@ -886,6 +888,8 @@ services:
       instanceTypes:
         - cloudProvider: gcp
           apiParam: nodeInstanceType
+        - cloudProvider: aws
+          apiParam: nodeInstanceType
     x-omnistrate-api-params:
       - key: nodeInstanceType
         description: The size of the node instance. Check the documentation for more information.
@@ -1373,8 +1377,8 @@ services:
           node-mz: maxMemory
     x-omnistrate-capabilities:
       backupConfiguration:
-        backupRetentionInDays: 7
-        backupPeriodInHours: 12
+        backupRetentionInDays: 2
+        backupPeriodInHours: 2
     depends_on:
       - node-mz
 
@@ -1386,6 +1390,8 @@ services:
       instanceTypes:
         - cloudProvider: gcp
           apiParam: nodeInstanceType
+        - cloudProvider: aws
+          apiParam: nodeInstanceType
     x-omnistrate-api-params:
       - key: nodeInstanceType
         description: The size of the node instance. Check the documentation for more information.
@@ -1859,8 +1865,8 @@ services:
           cluster-sz: maxMemory
     x-omnistrate-capabilities:
       backupConfiguration:
-        backupRetentionInDays: 7
-        backupPeriodInHours: 12
+        backupRetentionInDays: 2
+        backupPeriodInHours: 2
     depends_on:
       - cluster-sz
       - cluster-sz-rebalance
@@ -1873,6 +1879,8 @@ services:
       instanceTypes:
         - cloudProvider: gcp
           apiParam: nodeInstanceType
+        - cloudProvider: aws
+          apiParam: nodeInstanceType
     <<: *clusterparam
     volumes:
       - source: ./data
@@ -2167,8 +2175,8 @@ services:
           cluster-mz: maxMemory
     x-omnistrate-capabilities:
       backupConfiguration:
-        backupRetentionInDays: 7
-        backupPeriodInHours: 12
+        backupRetentionInDays: 2
+        backupPeriodInHours: 2
     depends_on:
       - cluster-mz
       - cluster-mz-rebalance
@@ -2181,6 +2189,8 @@ services:
       instanceTypes:
         - cloudProvider: gcp
           apiParam: nodeInstanceType
+        - cloudProvider: aws
+          apiParam: nodeInstanceType
     <<: *clusterparam
     volumes:
       - source: ./data
@@ -2299,6 +2309,8 @@ services:
       instanceTypes:
         - cloudProvider: gcp
           apiParam: nodeInstanceType
+        - cloudProvider: aws
+          apiParam: nodeInstanceType
     x-omnistrate-api-params:
       - key: nodeInstanceType
         description: The instance type.

diff --git a/omnistrate.pro.yaml b/omnistrate.pro.yaml
@@ -1958,6 +1958,8 @@ services:
       instanceTypes:
         - cloudProvider: gcp
           apiParam: nodeInstanceType
+        - cloudProvider: aws
+          apiParam: nodeInstanceType
     <<: *clusterparam
     volumes:
       - source: ./data
@@ -2270,6 +2272,8 @@ services:
       instanceTypes:
         - cloudProvider: gcp
           apiParam: nodeInstanceType
+        - cloudProvider: aws
+          apiParam: nodeInstanceType
     <<: *clusterparam
     volumes:
       - source: ./data