Skip to content

Commit 54a205e

Browse files
committed
fix: JVM 실행 옵션 추가
1 parent 5ac2eb9 commit 54a205e

File tree

2 files changed

+47
-33
lines changed

2 files changed

+47
-33
lines changed

terraform/dev/locals.tf

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,27 @@ locals {
6565
container_definitions_map = {
6666
for svc, def in local.task_definitions_with_roles : svc => [
6767
{
68-
name = svc
69-
image = svc == "api-dev" ? "${local.ecr_repo_urls["dev"]}:placeholder" : def.container_image
70-
cpu = def.cpu
71-
memory = def.memory
72-
essential = true
68+
name = svc
69+
image = svc == "api-dev" ? "${local.ecr_repo_urls["dev"]}:placeholder" : def.container_image
70+
cpu = def.cpu
71+
memory = def.memory
72+
essential = true
7373
stopTimeout = lookup(def, "stop_timeout", 30)
74-
command = svc == "api-dev" ? [
74+
command = svc == "api-dev" ? [
7575
"java",
7676
"-Xlog:gc*:stdout:time,uptime,level,tags",
7777
"-Xlog:gc*:file=/logs/gc.log:time,uptime,level,tags",
78+
"-XX:+UseG1GC",
79+
"-XX:InitialRAMPercentage=30",
80+
"-XX:MaxRAMPercentage=70",
81+
"-XX:ParallelGCThreads=2",
82+
"-XX:ConcGCThreads=1",
83+
"-XX:MaxDirectMemorySize=128m",
84+
"-Xlog:ergo=trace",
7885
"-javaagent:/dd-java-agent.jar",
7986
"-Ddd.logs.injection=true",
8087
"-Ddd.runtime-metrics.enabled=true",
81-
"-Ddd.service=eatda-api",
88+
"-Ddd.service=eatda-api-dev",
8289
"-Ddd.env=dev",
8390
"-Ddd.version=v1",
8491
"-Ddd.agent.host=127.0.0.1",
@@ -95,17 +102,17 @@ locals {
95102
}
96103
]
97104
environment = [for k, v in lookup(def, "environment", {}) : { name = k, value = v }]
98-
secrets = svc == "datadog-agent-task" ? [
105+
secrets = svc == "datadog-agent-task" ? [
99106
{ name = "DD_API_KEY", valueFrom = "/dev/DD_API_KEY" }
100-
] : (svc == "mysql-dev" ? [
101-
{ name = "MYSQL_USER", valueFrom = "/dev/MYSQL_USER_NAME" },
102-
{ name = "MYSQL_ROOT_PASSWORD", valueFrom = "/dev/MYSQL_ROOT_PASSWORD" },
103-
{ name = "MYSQL_PASSWORD", valueFrom = "/dev/MYSQL_PASSWORD" }
104-
] : [
105-
for s in lookup(def, "secrets", []) : {
106-
name = s.name
107-
valueFrom = s.valueFrom
108-
}
107+
] : (svc == "mysql-dev" ? [
108+
{ name = "MYSQL_USER", valueFrom = "/dev/MYSQL_USER_NAME" },
109+
{ name = "MYSQL_ROOT_PASSWORD", valueFrom = "/dev/MYSQL_ROOT_PASSWORD" },
110+
{ name = "MYSQL_PASSWORD", valueFrom = "/dev/MYSQL_PASSWORD" }
111+
] : [
112+
for s in lookup(def, "secrets", []) : {
113+
name = s.name
114+
valueFrom = s.valueFrom
115+
}
109116
])
110117
mountPoints = [
111118
for vol in lookup(def, "volumes", []) : {

terraform/prod/ecs/locals.tf

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ locals {
1717
container_image = "${var.ecr_repo_urls["prod"]}:placeholder"
1818
task_role_arn = def.task_role_arn
1919
execution_role_arn = def.execution_role_arn
20-
environment = {}
21-
secrets = []
22-
}) : name == "datadog" ? merge(def, {
20+
environment = {}
21+
secrets = []
22+
}) : name == "datadog" ? merge(def, {
2323
task_definition_name = "datadog-agent"
2424
container_image = "public.ecr.aws/datadog/agent:latest"
2525
task_role_arn = def.task_role_arn
@@ -42,12 +42,12 @@ locals {
4242
valueFrom = "/prod/DD_API_KEY"
4343
}
4444
]
45-
}) : merge(def, {
45+
}) : merge(def, {
4646
task_definition_name = "dummy"
4747
container_image = "dummy"
4848
task_role_arn = def.task_role_arn
4949
execution_role_arn = def.execution_role_arn
50-
environment = {}
50+
environment = {}
5151
secrets = [
5252
{
5353
name = "DUMMY_${name}"
@@ -59,30 +59,37 @@ locals {
5959

6060
resolved_ecs_services = {
6161
for name, def in var.ecs_services : name => {
62-
name = name
63-
iam_role_arn = var.ecs_task_definitions[name].task_role_arn
62+
name = name
63+
iam_role_arn = var.ecs_task_definitions[name].task_role_arn
6464
load_balancer = try(def.load_balancer, null)
6565
}
6666
}
6767

6868
container_definitions_map = {
6969
for svc, def in local.resolved_task_definitions : svc => [
7070
{
71-
name = def.task_definition_name
72-
image = def.container_image
73-
cpu = def.cpu
74-
memory = def.memory
75-
essential = true
71+
name = def.task_definition_name
72+
image = def.container_image
73+
cpu = def.cpu
74+
memory = def.memory
75+
essential = true
7676
stopTimeout = lookup(def, "stop_timeout", var.default_stop_timeout)
7777

7878
command = svc == "api-prod" ? [
7979
"java",
8080
"-Xlog:gc*:time,uptime,level,tags",
81+
"-XX:+UseG1GC",
82+
"-XX:InitialRAMPercentage=30",
83+
"-XX:MaxRAMPercentage=70",
84+
"-XX:ParallelGCThreads=2",
85+
"-XX:ConcGCThreads=1",
86+
"-XX:MaxDirectMemorySize=128m",
87+
"-Xlog:ergo=trace",
8188
"-javaagent:/dd-java-agent.jar",
8289
"-Ddd.logs.injection=true",
8390
"-Ddd.runtime-metrics.enabled=true",
84-
"-Ddd.service=eatda-api",
85-
"-Ddd.env=dev",
91+
"-Ddd.service=eatda-api-prod",
92+
"-Ddd.env=prod",
8693
"-Ddd.version=v1",
8794
"-Ddd.agent.host=127.0.0.1",
8895
"-Dspring.profiles.active=prod",
@@ -95,7 +102,7 @@ locals {
95102
name = "${svc}-${port}-tcp"
96103
containerPort = port
97104
hostPort = def.host_port[idx]
98-
protocol = lookup(def, "protocol", var.default_protocol)
105+
protocol = lookup(def, "protocol", var.default_protocol)
99106
}
100107
]
101108

@@ -114,7 +121,7 @@ locals {
114121
]
115122

116123
mountPoints = [
117-
for vol in (def.volumes != null ? def.volumes : []) : {
124+
for vol in(def.volumes != null ? def.volumes : []) : {
118125
sourceVolume = vol.name
119126
containerPath = vol.host_path
120127
readOnly = false

0 commit comments

Comments
 (0)