diff --git a/README.md b/README.md index e83dcf5..abe1eae 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,7 @@ Start the server |`JOB_DEFINITIONS_JOB_SWAP_UPDATE` |Job name. |Ingestion_Swap_Update | |`JOB_DEFINITIONS_TASK_INIT` |Task name. |init | |`JOB_DEFINITIONS_TASK_MERGE` |Task name. |merge | +|`JOB_DEFINITIONS_TASK_DELETION` |Task name. |merge | |`JOB_DEFINITIONS_TASK_POLYGON_PARTS`|Task name. |polygon-parts | |`JOB_DEFINITIONS_TASK_FINALIZE` |Task name. |finalize | |`HTTP_RETRY_ATTEMPTS` |How many retries should the service make if a request fails. |5 | diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json index 4bedd2d..811990e 100644 --- a/config/custom-environment-variables.json +++ b/config/custom-environment-variables.json @@ -66,6 +66,7 @@ "init": "JOB_DEFINITIONS_TASK_INIT", "createTasks": "JOB_DEFINITIONS_TASK_CREATE_TASKS", "merge": "JOB_DEFINITIONS_TASK_MERGE", + "tilesDeletion": "JOB_DEFINITIONS_TASK_DELETION", "polygonParts": "JOB_DEFINITIONS_TASK_POLYGON_PARTS", "export": "JOB_DEFINITIONS_TASK_EXPORT", "finalize": "JOB_DEFINITIONS_TASK_FINALIZE", diff --git a/helm/templates/configmap.yaml b/helm/templates/configmap.yaml index d905034..c30b98e 100644 --- a/helm/templates/configmap.yaml +++ b/helm/templates/configmap.yaml @@ -33,6 +33,7 @@ data: JOB_DEFINITIONS_TASK_INIT: {{ $jobDefinitions.tasks.init.type | quote }} JOB_DEFINITIONS_TASK_VALIDATION: {{ $jobDefinitions.tasks.validation.type | quote }} JOB_DEFINITIONS_TASK_MERGE: {{ $jobDefinitions.tasks.merge.type | quote }} + JOB_DEFINITIONS_TASK_DELETION: {{ $jobDefinitions.tasks.deletion.type | quote }} JOB_DEFINITIONS_TASK_POLYGON_PARTS: {{ $jobDefinitions.tasks.polygonParts.type | quote }} JOB_DEFINITIONS_TASK_CREATE_TASKS: {{ $jobDefinitions.tasks.createTasks.type | quote }} JOB_DEFINITIONS_TASK_EXPORT: {{ $jobDefinitions.tasks.export.type | quote }} diff --git a/helm/values.yaml b/helm/values.yaml index e648903..66eb5e2 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -105,6 +105,8 @@ jobDefinitions: type: '' merge: type: '' + tilesDeletion: + type: '' polygonParts: type: '' suspendJobOnFail: false @@ -120,6 +122,7 @@ taskFlowManager: - validation - create-merge-tasks - tilesMerging + - tiles-deletion - finalize exportTasksFlow: - init diff --git a/src/common/interfaces.ts b/src/common/interfaces.ts index a617a04..7cabf72 100644 --- a/src/common/interfaces.ts +++ b/src/common/interfaces.ts @@ -43,6 +43,7 @@ export interface IJobDefinitionsConfig { init: string; export: string; seed: string; + tilesDeletion: string; }; suspendingTaskTypes: string[]; } diff --git a/src/tasks/handlers/ingestion/ingestionHandler.ts b/src/tasks/handlers/ingestion/ingestionHandler.ts index 72c174a..1b52454 100644 --- a/src/tasks/handlers/ingestion/ingestionHandler.ts +++ b/src/tasks/handlers/ingestion/ingestionHandler.ts @@ -33,7 +33,7 @@ export class IngestionJobHandler extends JobHandler { ) { super(logger, config, jobManagerClient, job, task); this.tasksFlow = this.config.get('taskFlowManager.ingestionTasksFlow'); - this.excludedTypes = [this.jobDefinitions.tasks.merge]; + this.excludedTypes = [this.jobDefinitions.tasks.merge, this.jobDefinitions.tasks.tilesDeletion]; this.blockedDuplicationTypes = [this.jobDefinitions.tasks.validation, this.jobDefinitions.tasks.createTasks, this.jobDefinitions.tasks.finalize]; this.initializeTaskOperations();