From 6b70f46789e4f995ddf1b23c2ce7860fa3574882 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 12 Oct 2021 18:06:59 +0200 Subject: [PATCH 1/5] handle multi worker --- run.py | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/run.py b/run.py index 8b41d32..622ab1f 100644 --- a/run.py +++ b/run.py @@ -351,11 +351,41 @@ async def launch_monthly_job(): await create_job(repo.name, repo.url) +async def ensure_workers_count(): + if Worker.select().count() < app.config.WORKER_COUNT: + for _ in range(app.config.WORKER_COUNT - Worker.select().count()): + Worker.create(state="available") + elif Worker.select().count() > app.config.WORKER_COUNT: + workers_to_remove = Worker.select().count() - app.config.WORKER_COUNT + workers = Worker.select().where(Worker.state == "available") + for worker in workers: + if workers_to_remove == 0: + break + worker.delete_instance() + workers_to_remove -= 1 + + jobs_to_stop = workers_to_remove + for job_id in jobs_in_memory_state: + if jobs_to_stop == 0: + break + await stop_job(job_id) + jobs_to_stop -= 1 + job = Job.select().where(Job.id == job_id)[0] + job.state = "scheduled" + job.log = "" + job.save() + + workers = Worker.select().where(Worker.state == "available") + for worker in workers: + if workers_to_remove == 0: + break + worker.delete_instance() + workers_to_remove -= 1 + + @always_relaunch(sleep=3) async def jobs_dispatcher(): - if Worker.select().count() == 0: - for i in range(1): - Worker.create(state="available") + await ensure_workers_count() workers = Worker.select().where(Worker.state == "available") @@ -400,7 +430,7 @@ async def run_job(worker, job): task_logger.info(f"Starting job '{job.name}' #{job.id}...") cwd = os.path.split(path_to_analyseCI)[0] - arguments = f' {job.url_or_path} "{job.name}" {job.id}' + arguments = f' {job.url_or_path} "{job.name}" {job.id} {worker.id}' task_logger.info(f"Launch command: /bin/bash " + path_to_analyseCI + arguments) try: command = await asyncio.create_subprocess_shell("/bin/bash " + path_to_analyseCI + arguments, @@ -1173,6 +1203,7 @@ def main(config="./config.py"): "MONITOR_GIT": False, "MONITOR_ONLY_GOOD_QUALITY_APPS": False, "MONTHLY_JOBS": False, + "WORKER_COUNT": 1, } app.config.update_config(default_config) From 0395d4349e538632f3425c4f46922aaf797ea35b Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 13 Oct 2021 16:10:10 +0200 Subject: [PATCH 2/5] Restart jobs when the server stop --- run.py | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/run.py b/run.py index 622ab1f..926dd8e 100644 --- a/run.py +++ b/run.py @@ -1192,6 +1192,37 @@ def format_frame(f): return dict([(k, str(getattr(f, k))) for k in keys]) +@app.listener("before_server_start") +async def listener_before_server_start(*args, **kwargs): + task_logger.info("before_server_start") + reset_pending_jobs() + reset_busy_workers() + merge_jobs_on_startup() + + set_random_day_for_monthy_job() + + +@app.listener("after_server_start") +async def listener_after_server_start(*args, **kwargs): + task_logger.info("after_server_start") + + +@app.listener("before_server_stop") +async def listener_before_server_stop(*args, **kwargs): + task_logger.info("before_server_stop") + + +@app.listener("after_server_stop") +async def listener_after_server_stop(*args, **kwargs): + task_logger.info("after_server_stop") + for job_id in jobs_in_memory_state: + await stop_job(job_id) + job = Job.select().where(Job.id == job_id)[0] + job.state = "scheduled" + job.log = "" + job.save() + + def main(config="./config.py"): default_config = { @@ -1213,12 +1244,6 @@ def main(config="./config.py"): print(f"Error: analyzer script doesn't exist at '{app.config.PATH_TO_ANALYZER}'. Please fix the configuration in {config}") sys.exit(1) - reset_pending_jobs() - reset_busy_workers() - merge_jobs_on_startup() - - set_random_day_for_monthy_job() - if app.config.MONITOR_APPS_LIST: app.add_task(monitor_apps_lists(monitor_git=app.config.MONITOR_GIT, monitor_only_good_quality_apps=app.config.MONITOR_ONLY_GOOD_QUALITY_APPS)) From 0353307716a600e22741acb12d3e8d879762e4ec Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 14 Oct 2021 17:40:35 +0200 Subject: [PATCH 3/5] Create a custom json dumps for datetime convertion/fix ciclic list --- run.py | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/run.py b/run.py index 926dd8e..0fd4b20 100644 --- a/run.py +++ b/run.py @@ -82,10 +82,20 @@ LOGGING_CONFIG_DEFAULTS["formatters"] = { }, } + +def datetime_to_epoch_json_converter(o): + if isinstance(o, datetime): + return o.strftime('%s') + +# define a custom json dumps to convert datetime +def my_json_dumps(o): + json.dumps(o, default=datetime_to_epoch_json_converter) + + task_logger = logging.getLogger("task") api_logger = logging.getLogger("api") -app = Sanic(__name__) +app = Sanic(__name__, dumps=my_json_dumps) app.static('/static', './static/') loader = FileSystemLoader(os.path.abspath(os.path.dirname(__file__)) + '/templates', encoding='utf8') @@ -110,11 +120,6 @@ subscriptions = defaultdict(list) jobs_in_memory_state = {} -def datetime_to_epoch_json_converter(o): - if isinstance(o, datetime): - return o.strftime('%s') - - async def wait_closed(self): """ Wait until the connection is closed. @@ -513,7 +518,7 @@ async def broadcast(message, channels): for ws in ws_list: try: - await ws.send(json.dumps(message, default=datetime_to_epoch_json_converter)) + await ws.send(my_json_dumps(message)) except ConnectionClosed: dead_ws.append(ws) @@ -605,16 +610,16 @@ async def ws_index(request, websocket): first_chunck = next(data) - await websocket.send(json.dumps({ + await websocket.send(my_json_dumps({ "action": "init_jobs", "data": first_chunck, # send first chunk - }, default=datetime_to_epoch_json_converter)) + })) for chunk in data: - await websocket.send(json.dumps({ + await websocket.send(my_json_dumps({ "action": "init_jobs_stream", "data": chunk, - }, default=datetime_to_epoch_json_converter)) + })) await websocket.wait_closed() @@ -631,10 +636,10 @@ async def ws_job(request, websocket, job_id): subscribe(websocket, f"job-{job.id}") - await websocket.send(json.dumps({ + await websocket.send(my_json_dumps({ "action": "init_job", "data": model_to_dict(job), - }, default=datetime_to_epoch_json_converter)) + })) await websocket.wait_closed() @@ -731,10 +736,10 @@ async def ws_apps(request, websocket): repos = sorted(repos, key=lambda x: x["name"]) - await websocket.send(json.dumps({ + await websocket.send(my_json_dumps({ "action": "init_apps", "data": repos, - }, default=datetime_to_epoch_json_converter)) + })) await websocket.wait_closed() @@ -749,10 +754,10 @@ async def ws_app(request, websocket, app_name): subscribe(websocket, f"app-jobs-{app.url}") job = list(Job.select().where(Job.url_or_path == app.url).order_by(-Job.id).dicts()) - await websocket.send(json.dumps({ + await websocket.send(my_json_dumps({ "action": "init_jobs", "data": job, - }, default=datetime_to_epoch_json_converter)) + })) await websocket.wait_closed() @@ -1150,7 +1155,7 @@ async def github(request): token = open("./github_bot_token").read().strip() async with aiohttp.ClientSession(headers={"Authorization": f"token {token}"}) as session: - async with session.post(comments_url, data=json.dumps({"body": body}, default=datetime_to_epoch_json_converter)) as resp: + async with session.post(comments_url, data=my_json_dumps({"body": body})) as resp: api_logger.info("Added comment %s" % resp.json()["html_url"]) catchphrases = ["Alrighty!", "Fingers crossed!", "May the CI gods be with you!", ":carousel_horse:", ":rocket:", ":sunflower:", "Meow :cat2:", ":v:", ":stuck_out_tongue_winking_eye:" ] From 4a15903d3d9432d8b9973accf30e45b1950b413a Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 14 Oct 2021 17:41:17 +0200 Subject: [PATCH 4/5] add a try catch to avoid a dumb error --- run.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/run.py b/run.py index 0fd4b20..0d2a3ff 100644 --- a/run.py +++ b/run.py @@ -523,7 +523,10 @@ async def broadcast(message, channels): dead_ws.append(ws) for to_remove in dead_ws: - ws_list.remove(to_remove) + try: + ws_list.remove(to_remove) + except ValueError: + pass def subscribe(ws, channel): subscriptions[channel].append(ws) From 3de369eaf6da2e55148afccde1966c17345d6dae Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 14 Oct 2021 19:24:03 +0200 Subject: [PATCH 5/5] fix the custom json dumps function --- run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.py b/run.py index 0d2a3ff..3134a01 100644 --- a/run.py +++ b/run.py @@ -89,7 +89,7 @@ def datetime_to_epoch_json_converter(o): # define a custom json dumps to convert datetime def my_json_dumps(o): - json.dumps(o, default=datetime_to_epoch_json_converter) + return json.dumps(o, default=datetime_to_epoch_json_converter) task_logger = logging.getLogger("task")