Some loadtesting improvements to solve common issues (#15360)

fleetdm · Nov 30, 2023 · b31e452 · b31e452
1 parent 837602a
commit b31e452
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 89 deletions.
diff --git a/infrastructure/loadtesting/terraform/.gitignore b/infrastructure/loadtesting/terraform/.gitignore
@@ -1 +1,2 @@
 .external_modules
+.terraform.lock.hcl
diff --git a/infrastructure/loadtesting/terraform/.terraform.lock.hcl b/infrastructure/loadtesting/terraform/.terraform.lock.hcl
diff --git a/infrastructure/loadtesting/terraform/ecs.tf b/infrastructure/loadtesting/terraform/ecs.tf
@@ -12,7 +12,7 @@ resource "aws_ecs_service" "fleet" {
   launch_type                        = "FARGATE"
   cluster                            = aws_ecs_cluster.fleet.id
   task_definition                    = aws_ecs_task_definition.backend.arn
-  desired_count                      = 10
+  desired_count                      = var.fleet_containers
   deployment_minimum_healthy_percent = 100
   deployment_maximum_percent         = 200
   health_check_grace_period_seconds  = 30
@@ -142,7 +142,7 @@ resource "aws_ecs_task_definition" "backend" {
           },
           {
             name  = "FLEET_MYSQL_MAX_OPEN_CONNS"
-            value = "5"
+            value = "10"
           },
           {
             name  = "FLEET_MYSQL_READ_REPLICA_USERNAME"
@@ -158,7 +158,7 @@ resource "aws_ecs_task_definition" "backend" {
           },
           {
             name  = "FLEET_MYSQL_READ_REPLICA_MAX_OPEN_CONNS"
-            value = "5"
+            value = "10"
           },
           {
             name  = "FLEET_REDIS_ADDRESS"
@@ -284,8 +284,8 @@ resource "aws_ecs_task_definition" "migration" {
 }
 
 resource "aws_appautoscaling_target" "ecs_target" {
-  max_capacity       = 10
-  min_capacity       = 10
+  max_capacity       = var.fleet_containers
+  min_capacity       = var.fleet_containers
   resource_id        = "service/${aws_ecs_cluster.fleet.name}/${aws_ecs_service.fleet.name}"
   scalable_dimension = "ecs:service:DesiredCount"
   service_namespace  = "ecs"

diff --git a/infrastructure/loadtesting/terraform/helpers/setup-darwin_arm64.sh b/infrastructure/loadtesting/terraform/helpers/setup-darwin_arm64.sh
@@ -4,6 +4,7 @@ set -e
 
 VERSION="0.1.0"
 PLUGIN_PATH="${HOME}/.terraform.d/plugins/registry.terraform.io/paultyng/git/${VERSION}/darwin_arm64"
+TERRAFORMRC="${HOME}/.terraformrc"
 
 pushd /tmp
 git clone [email protected]:paultyng/terraform-provider-git.git
@@ -16,3 +17,18 @@ mv terraform-provider-git ${PLUGIN_PATH}
 cd ..
 rm -rf /tmp/terraform-provider-git
 popd
+
+if [ -f "${TERRAFORMRC}" ]; then
+	echo "Moving ${TERRAFORMRC} to ${TERRAFORMRC}.old before replacing"
+	mv "${TERRAFORMRC}" "${TERRAFORMRC}.old"
+fi
+cat <<-EOF > "${HOME}/.terraformrc"
+	provider_installation {
+	  filesystem_mirror {
+	    path    = "/Users/$(whoami)/.terraform.d/plugins"
+	  }
+	  direct {
+	    exclude = ["registry.terraform.io/paultyng/*"]
+	  }
+	}
+EOF
diff --git a/infrastructure/loadtesting/terraform/variables.tf b/infrastructure/loadtesting/terraform/variables.tf
@@ -20,6 +20,12 @@ variable "loadtest_containers" {
   default     = 0
 }
 
+variable "fleet_containers" {
+  description = "The number of containers running Fleet"
+  type        = number
+  default     = 10
+}
+
 variable "db_instance_type" {
   description = "The type of the loadtesting db instances.  Default is db.r6g.4xlarge."
   type        = string
@@ -30,4 +36,4 @@ variable "redis_instance_type" {
   description = "the redis instance type to use in loadtesting. default is cache.m6g.large"
   type        = string
   default     = "cache.m6g.large"
-}
+}