@@ -332,7 +332,7 @@ def created_service_account_job(
332
332
schema_mgr = SchemaManager ()
333
333
# Check secret_data by schema
334
334
schema_mgr .validate_secret_data_by_schema_id (
335
- schema_id , domain_id , trusted_secret_data , "TRUSTED_ACCOUNT "
335
+ schema_id , domain_id , trusted_secret_data , "SECRET "
336
336
)
337
337
except Exception as e :
338
338
trusted_secret_data = {}
@@ -404,25 +404,27 @@ def _check_duplicate_job(
404
404
self ,
405
405
domain_id : str ,
406
406
trusted_account_id : str ,
407
- his_job_vo : Job ,
407
+ this_job_vo : Job ,
408
408
) -> bool :
409
409
query = {
410
410
"filter" : [
411
411
{"k" : "trusted_account_id" , "v" : trusted_account_id , "o" : "eq" },
412
- {"k" : "workspace_id" , "v" : his_job_vo .workspace_id , "o" : "eq" },
412
+ {"k" : "workspace_id" , "v" : this_job_vo .workspace_id , "o" : "eq" },
413
413
{"k" : "domain_id" , "v" : domain_id , "o" : "eq" },
414
- {"k" : "status" , "v" : [ "PENDING" , " IN_PROGRESS"] , "o" : "in " },
415
- {"k" : "job_id" , "v" : his_job_vo .job_id , "o" : "not" },
414
+ {"k" : "status" , "v" : " IN_PROGRESS" , "o" : "eq " },
415
+ {"k" : "job_id" , "v" : this_job_vo .job_id , "o" : "not" },
416
416
]
417
417
}
418
418
419
419
job_vos , total_count = self .job_mgr .list_jobs (query )
420
420
421
- if total_count == 0 :
422
- return True
423
- else :
424
- for job_vo in job_vos :
425
- self .job_mgr .make_canceled_by_vo (job_vo )
421
+ duplicate_job_time = datetime .utcnow () - timedelta (minutes = 10 )
422
+
423
+ for job_vo in job_vos :
424
+ if job_vo .created_at > duplicate_job_time :
425
+ return True
426
+ else :
427
+ self .job_mgr .change_canceled_by_vo (job_vo )
426
428
return False
427
429
428
430
def _is_job_failed (
0 commit comments