Skip to content

Commit b95a030

Browse files
committed
feat: add job error message (#199)
Signed-off-by: ImMin5 <[email protected]>
1 parent 1f5390e commit b95a030

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

src/spaceone/identity/manager/job_manager.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def list_jobs(self, query: dict) -> Tuple[QuerySet, int]:
7070
def stat_jobs(self, query: dict) -> dict:
7171
return self.job_model.stat(**query)
7272

73-
def make_canceled_by_vo(self, job_vo: Job) -> None:
73+
def change_canceled_by_vo(self, job_vo: Job) -> None:
7474
_LOGGER.debug(f"[make_canceled_by_vo] cancel job: {job_vo.job_id}")
7575
self.update_job_by_vo(
7676
{"status": "CANCELED", "finished_at": datetime.utcnow()}, job_vo
@@ -130,7 +130,7 @@ def change_error_status(
130130
job_vo.update(
131131
{
132132
"status": "FAILURE",
133-
# "error": error.to_dict(),
133+
"error_message": error.message,
134134
"finished_at": datetime.utcnow(),
135135
}
136136
)

src/spaceone/identity/service/job_service.py

+12-10
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ def created_service_account_job(
332332
schema_mgr = SchemaManager()
333333
# Check secret_data by schema
334334
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"
336336
)
337337
except Exception as e:
338338
trusted_secret_data = {}
@@ -404,25 +404,27 @@ def _check_duplicate_job(
404404
self,
405405
domain_id: str,
406406
trusted_account_id: str,
407-
his_job_vo: Job,
407+
this_job_vo: Job,
408408
) -> bool:
409409
query = {
410410
"filter": [
411411
{"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"},
413413
{"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"},
416416
]
417417
}
418418

419419
job_vos, total_count = self.job_mgr.list_jobs(query)
420420

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)
426428
return False
427429

428430
def _is_job_failed(

0 commit comments

Comments
 (0)