Preventing scaling when more than 1 database present in sub, deterministic only scale down, health check endpoint

slorello89 · slorello89 · commit 243487e21dbd · 2025-03-19T13:09:50.000-04:00
diff --git a/autoscaler/redis-cloud-autoscaler/src/main/java/com/redis/autoscaler/DatabaseListResponse.java b/autoscaler/redis-cloud-autoscaler/src/main/java/com/redis/autoscaler/DatabaseListResponse.java
@@ -0,0 +1,12 @@
+package com.redis.autoscaler;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class DatabaseListResponse {
+    private int accountId;
+    private Subscripition[] subscription;
+
+}
diff --git a/autoscaler/redis-cloud-autoscaler/src/main/java/com/redis/autoscaler/Subscripition.java b/autoscaler/redis-cloud-autoscaler/src/main/java/com/redis/autoscaler/Subscripition.java
@@ -0,0 +1,12 @@
+package com.redis.autoscaler;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Subscripition {
+    private String subscriptionId;
+    private int numberOfDatabases;
+    private RedisCloudDatabase[] databases;
+}
diff --git a/autoscaler/redis-cloud-autoscaler/src/main/java/com/redis/autoscaler/controllers/HealthController.java b/autoscaler/redis-cloud-autoscaler/src/main/java/com/redis/autoscaler/controllers/HealthController.java
@@ -0,0 +1,13 @@
+package com.redis.autoscaler.controllers;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class HealthController {
+    @GetMapping("/health")
+    public ResponseEntity<String> health() {
+        return ResponseEntity.ok("Healthy");
+    }
+}
diff --git a/autoscaler/redis-cloud-autoscaler/src/main/java/com/redis/autoscaler/controllers/RulesController.java b/autoscaler/redis-cloud-autoscaler/src/main/java/com/redis/autoscaler/controllers/RulesController.java
@@ -1,6 +1,5 @@
 package com.redis.autoscaler.controllers;
 
-import com.redis.autoscaler.documents.RuleType;
 import com.redis.autoscaler.documents.RuleRepository;
 import com.redis.autoscaler.documents.Rule;
 import com.redis.autoscaler.documents.TriggerType;
@@ -14,7 +13,6 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
-import java.util.Objects;
 import java.util.Optional;
 
 @RestController
@@ -31,14 +29,19 @@ public RulesController(RedisCloudDatabaseService redisCloudDatabaseService, Rule
         this.schedulingService = schedulingService;
     }
 
+    @GetMapping("/numDatabases")
+    public HttpEntity<Integer> getNumDatabases() throws IOException, InterruptedException {
+        return ResponseEntity.ok(redisCloudDatabaseService.getDatabaseCount());
+    }
+
+
     @PostMapping
     public HttpEntity<Object> createRule(@RequestBody Rule rule) {
         LOG.info("Received request to create rule: {}", rule);
 
-        if(rule.getRuleType() == RuleType.IncreaseMemory || rule.getRuleType() == RuleType.DecreaseMemory) {
-            if(!rule.isValid()) {
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
-            }
+        String ruleValidityError = rule.getValidationError();
+        if(!ruleValidityError.isEmpty()) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ruleValidityError);
         }
 
         LOG.info("Attempting to create rule: {}", rule);
diff --git a/autoscaler/redis-cloud-autoscaler/src/main/java/com/redis/autoscaler/documents/Rule.java b/autoscaler/redis-cloud-autoscaler/src/main/java/com/redis/autoscaler/documents/Rule.java
@@ -3,11 +3,14 @@
 import com.redis.om.spring.annotations.Document;
 import com.redis.om.spring.annotations.Indexed;
 import lombok.Data;
+import org.slf4j.Logger;
 import org.springframework.data.annotation.Id;
 
 @Document
 @Data
 public class Rule {
+    private static final Logger LOG = org.slf4j.LoggerFactory.getLogger(Rule.class);
+
     @Indexed
     protected String dbId;
 
@@ -37,40 +40,60 @@ public String toString(){
     }
 
 
-    public boolean isValid(){
+    public String getValidationError(){
+        LOG.info("Validating rule: {}", this);
+
         if(this.ruleType == RuleType.IncreaseMemory){
             if(scaleType == ScaleType.Deterministic || scaleType == ScaleType.Step){
                 if(scaleValue > scaleCeiling){
-                    return false;
+                    return "Scale value is greater than scale ceiling";
                 }
 
             }
 
             if(scaleType == ScaleType.Deterministic) {
                 if(!isMultipleOfPointOne()){
-                    return false;
+                    return "Memory Scale must be a multiple of 0.1";
                 }
             }
         }
 
         if(this.ruleType == RuleType.DecreaseMemory){
             if(scaleType == ScaleType.Deterministic){
                 if(scaleValue < scaleFloor){
-                    return false;
+                    return "Scale value is less than scale floor";
                 }
+            } else {
+                return "Non-deterministic Scale in Operations are not supported"; // non-deterministic decrease rules are not allowed
             }
 
-            if(scaleType == ScaleType.Deterministic) {
-                if(!isMultipleOfPointOne()){
-                    return false;
+
+        }
+
+        if(this.ruleType == RuleType.IncreaseThroughput){
+            if(scaleType == ScaleType.Deterministic || scaleType == ScaleType.Step){
+                if(scaleValue > scaleCeiling){
+                    return "Scale value is greater than scale ceiling";
+                }
+            }
+        }
+
+        if(this.ruleType == RuleType.DecreaseThroughput){
+            if(scaleType == ScaleType.Deterministic ){
+                if(scaleValue < scaleFloor){
+                    return "Scale value is less than scale floor";
                 }
+            } else {
+                LOG.info("Non-deterministic decrease rules are not allowed: rule type: {}", ruleType);
+                return "Non-deterministic Scale in Operations are not supported"; // non-deterministic decrease rules are not allowed
             }
         }
 
-        return true;
+        return "";
     }
 
     protected boolean isMultipleOfPointOne() {
+        LOG.info("Validating scale value: {}", scaleValue);
         double compValue = scaleValue - Math.floor(scaleValue);
         double epsilon = 1e-9; // Small tolerance for floating-point precision
         return Math.abs(compValue % 0.1) < epsilon;
diff --git a/autoscaler/redis-cloud-autoscaler/src/main/java/com/redis/autoscaler/services/RedisCloudDatabaseService.java b/autoscaler/redis-cloud-autoscaler/src/main/java/com/redis/autoscaler/services/RedisCloudDatabaseService.java
@@ -36,6 +36,27 @@ public RedisCloudDatabaseService(HttpClient httpClient, HttpClientConfig httpReq
         this.config = config;
     }
 
+    public int getDatabaseCount() throws IOException, InterruptedException {
+        URI uri = URI.create(String.format("%s/subscriptions/%s/databases", Constants.REDIS_CLOUD_URI_BASE, config.getSubscriptionId()));
+        HttpRequest request = httpClientConfig.requestBuilder()
+                .uri(uri)
+                .GET().build();
+
+        HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+
+        if(response.statusCode() != 200){
+            throw new RuntimeException(String.format("Failed to fetch database count on %s", uri.toString()));
+        }
+
+        DatabaseListResponse databaseListResponse = objectMapper.readValue(response.body(), DatabaseListResponse.class);
+        if(databaseListResponse.getSubscription().length == 0){
+            LOG.warn("No subscriptions found for subscription id: {}", config.getSubscriptionId());
+            return 0;
+        }
+
+        return databaseListResponse.getSubscription()[0].getDatabases().length;
+    }
+
     public RedisCloudDatabase getDatabase(String dbId) throws IOException, InterruptedException {
 
         URI uri = URI.create(String.format("%s/subscriptions/%s/databases/%s", Constants.REDIS_CLOUD_URI_BASE, config.getSubscriptionId(), dbId));
@@ -63,6 +84,13 @@ public Optional<Task> applyRule(Rule rule) throws IOException, InterruptedExcept
             return Optional.empty();
         }
 
+        int numDatabases = getDatabaseCount();
+        if(numDatabases > 1){
+            LOG.warn("Database count for subscription {} is greater than 1, using autoscaler is not supported, skipping rule: {}", config.getSubscriptionId(), rule);
+            return Optional.empty();
+        }
+
+
         ScaleRequest scaleRequest;
         switch (rule.getRuleType()){
             case IncreaseMemory, DecreaseMemory -> {
diff --git a/main.tf b/main.tf
@@ -183,7 +183,7 @@ resource "null_resource" "build_app" {
     }
 
     provisioner "file" {
-        source = "./autoscaler/redis-cloud-autoscaler/build/libs/redis-cloud-autoscaler.jar"
+        source = "./autoscaler/redis-cloud-autoscaler/build/libs/redis-cloud-autoscaler-0.0.2.jar"
         destination = "autoscaler.jar"      
     }
 
@@ -212,7 +212,7 @@ resource "null_resource" "build_app" {
             "echo 'Environment=REDIS_PASSWORD=${rediscloud_subscription_database.autoscale-database.password}' | sudo tee -a /etc/systemd/system/autoscaler.service > /dev/null",
             "echo 'Environment=REDIS_CLOUD_API_KEY=${var.redis_cloud_api_key}' | sudo tee -a /etc/systemd/system/autoscaler.service > /dev/null",
             "echo 'Environment=REDIS_CLOUD_ACCOUNT_KEY=${var.redis_cloud_account_key}' | sudo tee -a /etc/systemd/system/autoscaler.service > /dev/null",
-            "echo 'Environment=REDIS_CLOUD_SUBSCRIPTION_ID=${rediscloud_subscription_database.autoscale-database.id}' | sudo tee -a /etc/systemd/system/autoscaler.service > /dev/null",
+            "echo 'Environment=REDIS_CLOUD_SUBSCRIPTION_ID=${rediscloud_subscription.autoscaling_sub.id}' | sudo tee -a /etc/systemd/system/autoscaler.service > /dev/null",
             "echo 'Environment=ALERT_MANAGER_HOST=${google_compute_instance.autoscale-vm-prometheus.network_interface[0].access_config[0].nat_ip}' | sudo tee -a /etc/systemd/system/autoscaler.service > /dev/null",
             "echo 'Environment=ALERT_MANAGER_PORT=9093' | sudo tee -a /etc/systemd/system/autoscaler.service > /dev/null",
             "echo 'ExecStart=/usr/bin/java -jar /usr/local/bin/autoscaler.jar' | sudo tee -a /etc/systemd/system/autoscaler.service > /dev/null",
diff --git a/quickstart/docker/docker-compose.yml b/quickstart/docker/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - autoscaler
     env_file:
       - .env
-    volumes:
+    volumes: 
       - ./prometheus/alertmanager.yml:/etc/alertmanager/alertmanager.yml
     ports:
       - 9093:9093
diff --git a/redeploy-autoscaler.sh b/redeploy-autoscaler.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 ./gradlew clean bootjar
-gcloud compute scp ./autoscaler/redis-cloud-autoscaler/build/libs/redis-cloud-autoscaler.jar autoscaler-vm:~/autoscaler.jar --zone=us-east1-b
+gcloud compute scp ./autoscaler/redis-cloud-autoscaler/build/libs/redis-cloud-autoscaler-0.0.2.jar autoscaler-vm:~/autoscaler.jar --zone=us-east1-b
 # run command to move the jar to /usr/local/bin/autoscaler.jar, change owner to autoscaler, and restart the autoscaler service
 gcloud compute ssh --zone=us-east1-b autoscaler-vm --command "sudo cp ~/autoscaler.jar /usr/local/bin/autoscaler.jar && sudo chown autoscaler:autoscaler /usr/local/bin/autoscaler.jar && sudo systemctl restart autoscaler"
