Skip to content

Commit d545d24

Browse files
committed
fix minor
1 parent d96b6ae commit d545d24

5 files changed

Lines changed: 37 additions & 14 deletions

File tree

deployment/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ custom:
126126
# Taskmaster image name
127127
imageName: docker.io/elixircloud/tesk-core-taskmaster
128128
# Taskmaster image version
129-
imageVersion: fix-null-volumes3
129+
imageVersion: fix-null-volumes5
130130
# Filer image name
131131
filerImageName: docker.io/elixircloud/tesk-core-filer
132132
# Filer image version

tesk/api/ga4gh/tes/task/create_task.py

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
from tesk.api.ga4gh.tes.models import TesCreateTaskResponse, TesResources, TesTask
88
from tesk.api.ga4gh.tes.task.task_request import TesTaskRequest
99
from tesk.exceptions import KubernetesError
10-
10+
import os
11+
from datetime import datetime
1112
logger = logging.getLogger(__name__)
1213

1314

@@ -36,7 +37,8 @@ def create_task(self) -> TesCreateTaskResponse:
3637
try:
3738
attempts_no += 1
3839
resources = self.task.resources
39-
40+
limits = self.kubernetes_client_wrapper.list_limits()
41+
print("limits", limits)
4042
minimum_ram_gb = self.kubernetes_client_wrapper.minimum_ram_gb()
4143

4244
if not self.task.resources:
@@ -49,22 +51,40 @@ def create_task(self) -> TesCreateTaskResponse:
4951
# self.user
5052
)
5153

52-
print(taskmaster_job)
5354
taskmaster_config_map = (
5455
self.tes_kubernetes_converter.from_tes_task_to_k8s_config_map(
5556
self.task,
5657
taskmaster_job,
5758
# self.user
5859
)
5960
)
60-
print(taskmaster_config_map)
6161

62-
# Create ConfigMap and Job
63-
_ = self.kubernetes_client_wrapper.create_config_map(
64-
taskmaster_config_map
65-
)
62+
configmap = self.kubernetes_client_wrapper.create_config_map(taskmaster_config_map)
6663
created_job = self.kubernetes_client_wrapper.create_job(taskmaster_job)
6764

65+
os.makedirs("/tmp/tesk", exist_ok=True)
66+
output_log_path = f"/tmp/tesk/output-at-{datetime.now().strftime('%H:%M:%S')}.log"
67+
with open(output_log_path, "w") as f:
68+
f.write("*********************************\n")
69+
f.write(f"Manifest consumed to create taskmaster job as {type(taskmaster_job)}\n")
70+
f.write(str(taskmaster_job) + "\n")
71+
f.write("*********************************\n")
72+
73+
f.write("*********************************\n")
74+
f.write(f"Manifest consumed to create config map as {type(taskmaster_config_map)}\n")
75+
f.write(str(taskmaster_config_map) + "\n")
76+
f.write("*********************************\n")
77+
78+
# Create ConfigMap and Job
79+
f.write("*********************************\n")
80+
f.write(f"Created ConfigMap as {type(configmap)}\n")
81+
f.write(str(configmap) + "\n")
82+
f.write("*********************************\n")
83+
84+
f.write("*********************************\n")
85+
f.write(f"Created taskmaster job as {type(created_job)}\n")
86+
f.write(str(created_job) + "\n")
87+
f.write("*********************************\n")
6888
assert created_job.metadata is not None
6989
assert created_job.metadata.name is not None
7090

tesk/api/kubernetes/convert/executor_command_wrapper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ def get_commands_with_stream_redirects(self) -> List[str]:
5151

5252
result.append(" ".join(command_parts))
5353

54-
return result
54+
return result

tesk/api/kubernetes/convert/template.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,4 +197,6 @@ def get_executor_template_with_value_from_config(self) -> V1Job:
197197
)
198198
]
199199

200+
job.spec.template.spec.containers[0].restart_policy = "Never"
201+
200202
return job

tesk/api/specs/task_execution_service.117cd92.openapi.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ components:
582582
type: integer
583583
description: Requested number of CPUs
584584
format: int32
585-
example: 4
585+
example: 1
586586
preemptible:
587587
type: boolean
588588
description: |-
@@ -595,12 +595,12 @@ components:
595595
type: number
596596
description: Requested RAM required in gigabytes (GB)
597597
format: double
598-
example: 8
598+
example: 1
599599
disk_gb:
600600
type: number
601601
description: Requested disk size in gigabytes (GB)
602602
format: double
603-
example: 40
603+
example: 2
604604
zones:
605605
type: array
606606
description: |-
@@ -610,7 +610,8 @@ components:
610610
priority queue to which the job is assigned.
611611
items:
612612
type: string
613-
example: us-west-1
613+
example:
614+
- us-west-1
614615
backend_parameters:
615616
type: object
616617
additionalProperties:

0 commit comments

Comments
 (0)