diff --git a/terraform/dev/locals.tf b/terraform/dev/locals.tf index a2e37ba5..178c4378 100644 --- a/terraform/dev/locals.tf +++ b/terraform/dev/locals.tf @@ -42,7 +42,7 @@ locals { dev_instance_definitions = { ami = "ami-012ea6058806ff688" - instance_type = "t3a.small" + instance_type = "t2.micro" role = "dev" iam_instance_profile = data.terraform_remote_state.common.outputs.instance_profile_name["ec2-to-ecs"] key_name = "eatda-ec2-dev-key" @@ -75,13 +75,6 @@ locals { "java", "-Xlog:gc*:stdout:time,uptime,level,tags", "-Xlog:gc*:file=/logs/gc.log:time,uptime,level,tags", - "-XX:+UseG1GC", - "-XX:InitialRAMPercentage=30", - "-XX:MaxRAMPercentage=70", - "-XX:ParallelGCThreads=2", - "-XX:ConcGCThreads=1", - "-XX:MaxDirectMemorySize=128m", - "-Xlog:ergo=trace", "-javaagent:/dd-java-agent.jar", "-Ddd.logs.injection=true", "-Ddd.runtime-metrics.enabled=true", diff --git a/terraform/dev/scripts/user-data.sh b/terraform/dev/scripts/user-data.sh index ad49bffa..e28a9371 100644 --- a/terraform/dev/scripts/user-data.sh +++ b/terraform/dev/scripts/user-data.sh @@ -1,6 +1,12 @@ #!/bin/bash echo ECS_CLUSTER=${ecs_cluster_name} >> /etc/ecs/ecs.config +fallocate -l 2G /swapfile +chmod 600 /swapfile +mkswap /swapfile +swapon /swapfile +echo '/swapfile none swap sw 0 0' >> /etc/fstab + mkdir -p /home/ec2-user/logs/backup mkdir -p /home/ec2-user/mysql mkdir -p /home/ec2-user/scripts diff --git a/terraform/dev/terraform.tfvars b/terraform/dev/terraform.tfvars index 4fd7fb05..beaf5c98 100644 --- a/terraform/dev/terraform.tfvars +++ b/terraform/dev/terraform.tfvars @@ -20,8 +20,8 @@ ecs_services = { ecs_task_definitions_base = { api-dev = { - cpu = 1500 - memory = 1024 + cpu = 500 + memory = 256 network_mode = "host" requires_compatibilities = ["EC2"] @@ -47,7 +47,7 @@ ecs_task_definitions_base = { mysql-dev = { cpu = 256 memoryReservation = 128 - memory = 512 + memory = 256 network_mode = "host" requires_compatibilities = ["EC2"] container_image = "mysql:8"