Skip to content

Commit 4a0d8d9

Browse files
committed
forcing round up to nearest 10th gb for all memory operations
1 parent c4eb93b commit 4a0d8d9

File tree

8 files changed

+10
-15
lines changed

8 files changed

+10
-15
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,5 @@ out
4444
.classpath
4545
build
4646
*.terraform
47-
.gradle
47+
.gradle/
48+
.idea
-17 Bytes
Binary file not shown.
-19.1 KB
Binary file not shown.

.gradle/file-system.probe

-8 Bytes
Binary file not shown.

.idea/modules/autoscaler/redis-cloud-autoscaler/redis-cloud-autoscaler.redis-cloud-autoscaler.main.iml

Lines changed: 0 additions & 8 deletions
This file was deleted.

autoscaler/redis-cloud-autoscaler/src/main/java/com/redis/autoscaler/services/RedisCloudDatabaseService.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ public Optional<Task> applyRule(Rule rule) throws IOException, InterruptedExcept
105105
return Optional.empty();
106106
}
107107

108+
newDatasetSizeInGb = roundUpToNearestTenth(newDatasetSizeInGb); // round up to nearest 0.1gb for Redis Cloud
109+
108110
scaleRequest = ScaleRequest.builder().datasetSizeInGb(newDatasetSizeInGb).build();
109111
}
110112
case IncreaseThroughput, DecreaseThroughput -> {
@@ -196,10 +198,10 @@ private static double getNewDatasetSizeInGb(Rule rule, RedisCloudDatabase db) {
196198
} else if(rule.getRuleType() == RuleType.DecreaseMemory){
197199
switch (rule.getScaleType()){
198200
case Step -> {
199-
newDatasetSizeInGb = roundUpToNearestTenth(db.getDatasetSizeInGb() - rule.getScaleValue());
201+
newDatasetSizeInGb = db.getDatasetSizeInGb() - rule.getScaleValue();
200202
}
201203
case Exponential -> {
202-
newDatasetSizeInGb = roundUpToNearestTenth(db.getDatasetSizeInGb() * rule.getScaleValue());
204+
newDatasetSizeInGb = db.getDatasetSizeInGb() * rule.getScaleValue();
203205
}
204206
case Deterministic -> {
205207
newDatasetSizeInGb = rule.getScaleValue();

main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ resource "null_resource" "build_app" {
183183
}
184184

185185
provisioner "file" {
186-
source = "./autoscaler/redis-cloud-autoscaler/build/libs/redis-cloud-autoscaler-0.0.3.jar"
186+
source = "./autoscaler/redis-cloud-autoscaler/build/libs/redis-cloud-autoscaler-0.0.4.jar"
187187
destination = "autoscaler.jar"
188188
}
189189

@@ -235,7 +235,7 @@ resource "null_resource" "build_app" {
235235

236236
resource "google_dns_record_set" "autoscaler_dns" {
237237
managed_zone = var.dns-zone-name
238-
name = "autoscaler.autoscale.${var.subdomain}."
238+
name = "autoscaler.${var.subdomain}."
239239
type = "A"
240240
ttl = 300
241241
rrdatas = [google_compute_instance.autoscaler-vm.network_interface[0].access_config[0].nat_ip]
@@ -418,7 +418,7 @@ resource "google_compute_instance" "autoscale-vm-prometheus" {
418418

419419
resource "google_dns_record_set" "autoscale_prometheus_dns" {
420420
managed_zone = var.dns-zone-name
421-
name = "prometheus.autoscale.${var.subdomain}."
421+
name = "prometheus.autoscaler.${var.subdomain}."
422422
type = "A"
423423
ttl = 300
424424
rrdatas = [google_compute_instance.autoscale-vm-prometheus.network_interface[0].access_config[0].nat_ip]

redeploy-autoscaler.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

33
./gradlew clean bootjar
4-
gcloud compute scp ./autoscaler/redis-cloud-autoscaler/build/libs/redis-cloud-autoscaler-0.0.3.jar autoscaler-vm:~/autoscaler.jar --zone=us-east1-b
4+
gcloud compute scp ./autoscaler/redis-cloud-autoscaler/build/libs/redis-cloud-autoscaler-0.0.4.jar autoscaler-vm:~/autoscaler.jar --zone=us-east1-b
55
# run command to move the jar to /usr/local/bin/autoscaler.jar, change owner to autoscaler, and restart the autoscaler service
66
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"

0 commit comments

Comments
 (0)