Merge branch 'feature/CHINARPA-5155' into feature/uat-tmp

@@ -8,4 +8,6 @@ broker = conf.CELERY_BROKER_URL
 
 
 app = Celery('celery_compare', broker=broker, include=['celery_compare.tasks'])
 app = Celery('celery_compare', broker=broker, include=['celery_compare.tasks'])
 
 
-app.conf.update(worker_max_tasks_per_child=5, timezone='Asia/Shanghai')
+# worker_max_tasks_per_child ,worker执行了几次任务就会死
+#app.conf.update(worker_max_tasks_per_child=10, timezone='Asia/Shanghai')
+app.conf.update(timezone='Asia/Shanghai')

@@ -55,7 +55,7 @@ import threading
 import concurrent.futures
 import concurrent.futures
 from concurrent.futures import ThreadPoolExecutor
 from concurrent.futures import ThreadPoolExecutor
 
 
-pool = ThreadPoolExecutor(max_workers=20, thread_name_prefix="my_thread_")
+pool = ThreadPoolExecutor(max_workers=50, thread_name_prefix="compare_thread_")
 
 
 compare_log = logging.getLogger('compare')
 compare_log = logging.getLogger('compare')
 log_base = '[Compare]'
 log_base = '[Compare]'
@@ -3732,7 +3732,9 @@ def fsm_compare(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=
     #     results = list(executor.map(fsm_compare_thread, application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms))
     #     results = list(executor.map(fsm_compare_thread, application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms))
     
     
     compare_log.info('[fsm thread]')
     compare_log.info('[fsm thread]')
+    #pool = ThreadPoolExecutor(max_workers=6, thread_name_prefix="fsm_thread_")
     pool.submit(fsm_compare_thread, application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms)
     pool.submit(fsm_compare_thread, application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms)
+    #pool.shutdown(wait=True)
     
     
 
 
 def fsm_compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True, is_cms=False):
 def fsm_compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True, is_cms=False):
@@ -3808,7 +3810,9 @@ def compare(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True
     #     results = list(executor.map(compare_thread, application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms))
     #     results = list(executor.map(compare_thread, application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms))
 
 
     compare_log.info('[non fsm thread]')
     compare_log.info('[non fsm thread]')
+    #pool = ThreadPoolExecutor(max_workers=6, thread_name_prefix="non_fsm_thread_")
     pool.submit(compare_thread, application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms)
     pool.submit(compare_thread, application_id, application_entity, uniq_seq, ocr_res_id, is_ca, is_cms)
+    #pool.shutdown(wait=True)
 
 
 def compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True, is_cms=False):
 def compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=True, is_cms=False):
     # POS: application_id, application_entity, uniq_seq, None
     # POS: application_id, application_entity, uniq_seq, None