Add resource requests to default podspec

Extend the timeout, assuming that we want to let the kubernetes scheduler
start containers when it wants to start them. This allows us to make
resource requests knowing that when some jobs queue up waiting for
resources, they will not get reaped in as short of a
timeout.
This commit is contained in:
Elijah DeLee
2022-01-17 21:16:09 -05:00
parent 696c0b0055
commit 987924cbda
3 changed files with 3 additions and 2 deletions

View File

@@ -381,7 +381,7 @@ class AWXReceptorJob:
self.task.instance.result_traceback = detail
self.task.instance.save(update_fields=['result_traceback'])
else:
logger.warn(f'No result details or output from {self.task.instance.log_format}, status:\n{unit_status}')
logger.warn(f'No result details or output from {self.task.instance.log_format}, status:\n{state_name}')
except Exception:
raise RuntimeError(detail)

View File

@@ -38,6 +38,7 @@ def get_default_pod_spec():
"image": ee.image,
"name": 'worker',
"args": ['ansible-runner', 'worker', '--private-data-dir=/runner'],
"resources": {"requests": {"cpu": "250m", "memory": "100Mi"}},
}
],
},

View File

@@ -71,7 +71,7 @@ IS_K8S = False
AWX_CONTAINER_GROUP_K8S_API_TIMEOUT = 10
AWX_CONTAINER_GROUP_DEFAULT_NAMESPACE = os.getenv('MY_POD_NAMESPACE', 'default')
# Timeout when waiting for pod to enter running state. If the pod is still in pending state , it will be terminated. Valid time units are "s", "m", "h". Example : "5m" , "10s".
AWX_CONTAINER_GROUP_POD_PENDING_TIMEOUT = "5m"
AWX_CONTAINER_GROUP_POD_PENDING_TIMEOUT = "2h"
# Internationalization
# https://docs.djangoproject.com/en/dev/topics/i18n/