tea/browsertrix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backend: k8s: list running jobs tweak: if succeeded jobs == number of parallel jobs, filter out from list, assume finished and not stopping

Browse Source
This commit is contained in:
Ilya Kreymer 2022-02-01 00:03:46 -08:00
parent 2b2e6fedfa
commit b3f21932fc
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
backend/k8sman.py
View File

@ -273,12 +273,16 @@ class K8SManager:
field_selector="status.successful=0", field_selector="status.successful=0",
) )
return [ crawls = []
self._make_crawl_for_job(
job, "running" if job.status.active else "stopping", False, CrawlOut for job in jobs.items:
) status = self._get_crawl_state(job)
for job in jobs.items if not status:
] continue
crawls.append(self._make_crawl_for_job(job, status, False, CrawlOut))
return crawls
async def init_crawl_screencast(self, crawl_id, aid): async def init_crawl_screencast(self, crawl_id, aid):
""" Init service for this job/crawl_id to support screencasting """ """ Init service for this job/crawl_id to support screencasting """
@ -388,9 +392,11 @@ class K8SManager:
if not job or job.metadata.labels["btrix.archive"] != aid: if not job or job.metadata.labels["btrix.archive"] != aid:
return None return None
return self._make_crawl_for_job( status = self._get_crawl_state(job)
job, "running" if job.status.active else "stopping", False, CrawlOut if not status:
) return None
return self._make_crawl_for_job(job, status, False, CrawlOut)
# pylint: disable=broad-except # pylint: disable=broad-except
except Exception: except Exception:
@ -486,6 +492,18 @@ class K8SManager:
# ======================================================================== # ========================================================================
# Internal Methods # Internal Methods
def _get_crawl_state(self, job):
if job.status.active:
return "running"
# not all pods have succeeded yet
if job.status.succeeded < (job.spec.parallelism or 1):
return "stopping"
# job fully done, do not treat as running or stopping
return None
# pylint: disable=no-self-use # pylint: disable=no-self-use
def _make_crawl_for_job(self, job, state, finish_now=False, crawl_cls=Crawl): def _make_crawl_for_job(self, job, state, finish_now=False, crawl_cls=Crawl):
""" Make a crawl object from a job""" """ Make a crawl object from a job"""