github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

perf(celery-task): 优化检查节点资产数量的 Celery 任务 (#5052) 

Co-authored-by: xinwen <coderWen@126.com>
pull/5106/head
fit2bot 2020-11-20 20:23:09 +08:00 committed by Jiangjie.Bai
parent a4667f3312
commit f26b7a470a
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/tasks/nodes_amount.py
View File

@ -8,6 +8,6 @@ logger = get_logger(__file__)
@register_as_period_task(crontab='0 2 * * *') @register_as_period_task(crontab='0 2 * * *')
@shared_task(queue='node_assets_amount') @shared_task(queue='celery_heavy_tasks')
def check_node_assets_amount_celery_task(): def check_node_assets_amount_celery_task():
check_node_assets_amount() check_node_assets_amount()

2
apps/assets/utils.py
View File

@ -25,7 +25,7 @@ def check_node_assets_amount():
node.assets_amount = assets_amount node.assets_amount = assets_amount
node.save() node.save()
# 防止自检程序给数据库的压力太大 # 防止自检程序给数据库的压力太大
time.sleep(2) time.sleep(0.1)
def is_asset_exists_in_node(asset_pk, node_key): def is_asset_exists_in_node(asset_pk, node_key):

10
jms
View File

@ -158,7 +158,7 @@ def parse_service(s):
web_services = ['gunicorn', 'flower', 'daphne'] web_services = ['gunicorn', 'flower', 'daphne']
celery_services = [ celery_services = [
"celery_ansible", "celery_default", "celery_node_tree", "celery_ansible", "celery_default", "celery_node_tree",
"celery_check_asset_perm_expired", "celery_node_assets_amount" "celery_check_asset_perm_expired", "celery_heavy_tasks"
] ]
task_services = celery_services + ['beat'] task_services = celery_services + ['beat']
all_services = web_services + task_services all_services = web_services + task_services
@ -228,9 +228,9 @@ def get_start_celery_node_tree_kwargs():
return get_start_worker_kwargs('node_tree', 2) return get_start_worker_kwargs('node_tree', 2)
def get_start_celery_node_assets_amount_kwargs(): def get_start_celery_heavy_tasks_kwargs():
print("\n- Start Celery as Distributed Task Queue: NodeAssetsAmount") print("\n- Start Celery as Distributed Task Queue: HeavyTasks")
return get_start_worker_kwargs('celery_node_assets_amount', 1) return get_start_worker_kwargs('celery_heavy_tasks', 1)
def get_start_celery_check_asset_perm_expired_kwargs(): def get_start_celery_check_asset_perm_expired_kwargs():
@ -374,7 +374,7 @@ def start_service(s):
"celery_ansible": get_start_celery_ansible_kwargs, "celery_ansible": get_start_celery_ansible_kwargs,
"celery_default": get_start_celery_default_kwargs, "celery_default": get_start_celery_default_kwargs,
"celery_node_tree": get_start_celery_node_tree_kwargs, "celery_node_tree": get_start_celery_node_tree_kwargs,
"celery_node_assets_amount": get_start_celery_node_assets_amount_kwargs, "celery_heavy_tasks": get_start_celery_heavy_tasks_kwargs,
"celery_check_asset_perm_expired": get_start_celery_check_asset_perm_expired_kwargs, "celery_check_asset_perm_expired": get_start_celery_check_asset_perm_expired_kwargs,
"beat": get_start_beat_kwargs, "beat": get_start_beat_kwargs,
"flower": get_start_flower_kwargs, "flower": get_start_flower_kwargs,