Skip to content

fix: bump RAM for listed-building #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tombrooks248 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: bump RAM for listed-building #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions dags/collection_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,16 @@ def configure_dag(**kwargs):
dag=dag,
)

# listed-building / tree-preservation-order need a bigger Fargate TASK (not just the container)
task_size_override = (
{
"cpu": '{{ task_instance.xcom_pull(task_ids="configure-dag", key="cpu") | string }}',
"memory": '{{ task_instance.xcom_pull(task_ids="configure-dag", key="memory") | string }}',
}
if collection in ("listed-building", "tree-preservation-order")
else {}
)

collect_ecs_task = EcsRunTaskOperator(
task_id=f"{collection}-collect",
dag=dag,
Expand All @@ -123,6 +133,7 @@ def configure_dag(**kwargs):
task_definition=collection_task_name,
launch_type="FARGATE",
overrides={
**task_size_override,
"containerOverrides": [
{
"name": collection_task_name,
Expand Down Expand Up @@ -151,7 +162,7 @@ def configure_dag(**kwargs):
{"name": "REPROCESS", "value": '\'{{ task_instance.xcom_pull(task_ids="configure-dag", key="force-reprocessing") }}\''},
],
},
]
],
},
network_configuration={"awsvpcConfiguration": '{{ task_instance.xcom_pull(task_ids="configure-dag", key="aws_vpc_config") }}'},
awslogs_group='{{ task_instance.xcom_pull(task_ids="configure-dag", key="collection-task-log-group") }}',
Expand Down Expand Up @@ -198,6 +209,7 @@ def configure_dag(**kwargs):
task_definition=collection_task_name,
launch_type="FARGATE",
overrides={
**task_size_override,
"containerOverrides": [
{
"name": collection_task_name,
Expand Down Expand Up @@ -226,7 +238,7 @@ def configure_dag(**kwargs):
{"name": "REGENERATE_LOG_OVERRIDE", "value": '\'{{ task_instance.xcom_pull(task_ids="configure-dag", key="regenerate-log-override") | string }}\''},
],
},
]
],
},
network_configuration={"awsvpcConfiguration": '{{ task_instance.xcom_pull(task_ids="configure-dag", key="aws_vpc_config") }}'},
awslogs_group='{{ task_instance.xcom_pull(task_ids="configure-dag", key="collection-task-log-group") }}',
Expand Down
8 changes: 4 additions & 4 deletions dags/dag_triggers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ def collection_selected(collection_name, configuration):
if collection not in ["organisation"]:

if collection_selected(collection, config):
# Set custom CPU for listed-building collection
conf = {"cpu": 16384, "transformed-jobs": 16} if collection in ("listed-building", "tree-preservation-order") else {}
# Set custom CPU and RAM for listed-building collection
conf = {"cpu": 16384, "memory": 65536, "transformed-jobs": 16} if collection in ("listed-building", "tree-preservation-order") else {}

collection_dag = TriggerDagRunOperator(
task_id=f"trigger-{collection}-collection-dag",
Expand Down Expand Up @@ -98,8 +98,8 @@ def collection_selected(collection_name, configuration):
for collection, datasets in collections.items():
if collection not in ["organisation"]:

# Set custom CPU for listed-building collection
conf = {"cpu": 16384, "transformed-jobs": 16} if collection in ("listed-building", "tree-preservation-order") else {}
# Set custom CPU and RAM for listed-building collection
conf = {"cpu": 16384, "memory": 65536, "transformed-jobs": 16} if collection in ("listed-building", "tree-preservation-order") else {}

collection_dag = TriggerDagRunOperator(task_id=f"trigger-{collection}-collection-dag", trigger_dag_id=f"{collection}-collection", wait_for_completion=True, conf=conf)
collection_tasks.append(collection_dag)
Expand Down