Merge pull request #152 from YAPP-Github/refactor/latency

[Refactor] API 지연 개선을 위한 인스턴스 스케일업 및 동작 방식 변경 -1

Author: lvalentine6

terraform/common/locals.tf

@@ -31,6 +31,22 @@ locals {
         "arn:aws:iam::aws:policy/AmazonS3FullAccess",
         "arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"
       ]
+      custom_inline_policies = {
+        ssm_mysql_url_access = {
+          name        = "ssm-mysql-url-access"
+          description = "Allow reading MySQL URL parameter from SSM"
+          policy_document = {
+            Version = "2012-10-17"
+            Statement = [
+              {
+                Effect   = "Allow"
+                Action   = ["ssm:GetParameter"]
+                Resource = "arn:aws:ssm:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:parameter/dev/MYSQL_URL"
+              }
+            ]
+          }
+        }
+      }
       tags = {
         Purpose = "ECS EC2 Registration"
       }

terraform/dev/locals.tf

@@ -42,7 +42,7 @@ locals {
 
   dev_instance_definitions = {
     ami                  = "ami-012ea6058806ff688"
-    instance_type        = "t2.micro"
+    instance_type        = "t3a.small"
     role                 = "dev"
     iam_instance_profile = data.terraform_remote_state.common.outputs.instance_profile_name["ec2-to-ecs"]
     key_name             = "eatda-ec2-dev-key"
@@ -81,7 +81,7 @@ locals {
           "-Ddd.service=eatda-api",
           "-Ddd.env=dev",
           "-Ddd.version=v1",
-          "-Ddd.agent.host=10.0.7.245",
+          "-Ddd.agent.host=127.0.0.1",
           "-Dspring.profiles.active=dev",
           "-jar",
           "/api.jar"

terraform/dev/scripts/user-data.sh

@@ -7,10 +7,12 @@ mkswap /swapfile
 swapon /swapfile
 echo '/swapfile none swap sw 0 0' >> /etc/fstab
 
-mkdir -p /home/ec2-user/logs
+mkdir -p /home/ec2-user/logs/backup
 mkdir -p /home/ec2-user/mysql
 mkdir -p /home/ec2-user/scripts
 
+chown -R ec2-user:ec2-user /home/ec2-user/logs /home/ec2-user/mysql /home/ec2-user/scripts
+
 aws s3 cp s3://eatda-storage-dev/scripts/app-backup-dev-logs.sh /home/ec2-user/scripts/app-backup-dev-logs.sh
 chmod +x /home/ec2-user/scripts/app-backup-dev-logs.sh
 
@@ -27,7 +29,7 @@ done
 
 (
   sudo crontab -u ec2-user -l 2>/dev/null || true
-  echo "0 0 * * 0 /home/ec2-user/scripts/app-backup-dev-logs.sh >> /var/log/app-backup.log 2>&1"
-  echo "30 0 * * 0 /home/ec2-user/scripts/mysql-backup.sh >> /var/log/mysql-backup.log 2>&1"
+  echo "0 0 * * 0 /home/ec2-user/scripts/app-backup-dev-logs.sh >> /home/ec2-user/logs/backup/app-backup.log 2>&1"
+  echo "30 0 * * 0 /home/ec2-user/scripts/mysql-backup.sh >> /home/ec2-user/logs/backup/mysql-backup.log 2>&1"
 ) | sudo crontab -u ec2-user -
 

terraform/dev/terraform.tfvars

@@ -21,8 +21,8 @@ ecs_services = {
 ecs_task_definitions_base = {
   api-dev = {
     cpu          = 256
-    memory       = 256
-    network_mode = "bridge"
+    memory       = 1024
+    network_mode = "host"
     requires_compatibilities = ["EC2"]
 
     port_mappings = [
@@ -48,7 +48,7 @@ ecs_task_definitions_base = {
     cpu               = 256
     memoryReservation = 128
     memory            = 512
-    network_mode      = "bridge"
+    network_mode      = "host"
     requires_compatibilities = ["EC2"]
     container_image   = "mysql:8"
 
@@ -89,8 +89,8 @@ ecs_task_definitions_base = {
 
   "datadog-agent-task" = {
     cpu             = 256
-    memory          = 128
-    network_mode    = "bridge"
+    memory          = 256
+    network_mode    = "host"
     requires_compatibilities = ["EC2"]
     container_image = "public.ecr.aws/datadog/agent:latest"
 

terraform/prod/ecs/locals.tf

@@ -78,16 +78,16 @@ locals {
         command = svc == "api-prod" ? [
           "java",
           "-Xlog:gc*:time,uptime,level,tags",
-          "-javaagent:/app/dd-java-agent.jar",
+          "-javaagent:/dd-java-agent.jar",
           "-Ddd.logs.injection=true",
           "-Ddd.runtime-metrics.enabled=true",
           "-Ddd.service=eatda-api",
           "-Ddd.env=dev",
           "-Ddd.version=v1",
-          "-Ddd.agent.host=10.0.7.245",
+          "-Ddd.agent.host=127.0.0.1",
           "-Dspring.profiles.active=prod",
           "-jar",
-          "/app/api.jar"
+          "/api.jar"
         ] : null
 
         portMappings = [

terraform/prod/locals.tf

@@ -50,7 +50,7 @@ locals {
 locals {
   prod_instance_definitions = {
     ami                  = "ami-012ea6058806ff688"
-    instance_type        = "t3.micro"
+    instance_type        = "t3a.small"
     role                 = "prod"
     iam_instance_profile = "ec2-to-ecs"
     key_name             = "eatda-ec2-prod-key"

terraform/prod/scripts/user-data.sh

@@ -7,9 +7,11 @@ mkswap /swapfile
 swapon /swapfile
 echo '/swapfile none swap sw 0 0' >> /etc/fstab
 
-mkdir -p /home/ec2-user/logs
+mkdir -p /home/ec2-user/logs/backup
 mkdir -p /home/ec2-user/scripts
 
+chown -R ec2-user:ec2-user /home/ec2-user/logs /home/ec2-user/scripts
+
 aws s3 cp s3://eatda-storage-prod/scripts/app-backup-prod-logs.sh /home/ec2-user/scripts/app-backup-prod-logs.sh
 chmod +x /home/ec2-user/scripts/app-backup-prod-logs.sh
 
@@ -23,5 +25,5 @@ done
 
 (
   sudo crontab -u ec2-user -l 2>/dev/null || true
-  echo "0 0 * * 0 /home/ec2-user/scripts/app-backup-prod-logs.sh >> /home/ec2-user/logs/app-backup.log 2>&1"
+    echo "0 0 * * 0 /home/ec2-user/scripts/app-backup-prod-logs.sh >> /home/ec2-user/logs/backup/app-backup.log 2>&1"
 ) | sudo crontab -u ec2-user -

terraform/prod/terraform.tfvars

@@ -18,26 +18,26 @@ ecs_services = {
 ecs_task_definitions_base = {
   api-prod = {
     cpu          = 256
-    memory       = 256
-    network_mode = "bridge"
+    memory       = 1024
+    network_mode = "host"
     container_port = [8080]
     host_port = [0]
     log_group    = "/ecs/eatda-api"
     environment = {}
     volumes = [
       {
-        name      = "prod-api-volume"
-        host_path = "/home/ec2-user/api"
+        name          = "prod-api-volume"
+        host_path     = "/home/ec2-user/logs/"
       }
     ]
   }
 
   datadog = {
     container_image   = "public.ecr.aws/datadog/agent:latest"
     cpu               = 256
-    memoryReservation = 128
+    memoryReservation = 256
     memory            = 512
-    network_mode      = "bridge"
+    network_mode      = "host"
     container_port = [8125, 8126]
     host_port = [8125, 8126]
     requires_compatibilities = ["EC2"]