Skip to content

Commit e231a0c

Browse files
noahchiwyyalt
authored andcommitted
feat: 829错误强制标记为成功 (closed #380)
1 parent 9992565 commit e231a0c

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

.github/workflows/codecov.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: CodeCov
22
on: [push, pull_request]
33
jobs:
44
run:
5-
runs-on: ubuntu-20.04
5+
runs-on: ubuntu-22.04
66
env:
7-
OS: ubuntu-20.04
7+
OS: ubuntu-22.04
88
PYTHON: "3.6"
99
DJANGO_SETTINGS_MODULE: "settings"
1010
DEBUG: true

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
jobs:
2626
analyze:
2727
name: Analyze
28-
runs-on: ubuntu-20.04
28+
runs-on: ubuntu-22.04
2929
permissions:
3030
actions: read
3131
contents: read

.github/workflows/python-app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on: [push, pull_request]
88
jobs:
99
build:
1010

11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212

1313
steps:
1414
- uses: actions/checkout@v2

.github/workflows/release_1_push_rc_tag.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
build:
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-22.04
1414
env:
1515
# 构建环境的Python版本
1616
PYTHON_VERSION: "3.7"

.github/workflows/release_2_create_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
jobs:
1313
build:
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-22.04
1515
env:
1616
# 构建环境的Python版本
1717
PYTHON_VERSION: "3.7"

apps/gsekit/pipeline_plugins/components/collections/gse.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def need_ignore_err_code(cls, op_type: int, error_code: int) -> bool:
9292
return True
9393

9494
# 对于已停止的进程执行【停止】命令,结果是执行成功,已停止的进程实例可以标记成忽略
95-
if op_type == GseOpType.STOP and error_code == cls.PROC_NO_RUNNING:
95+
if op_type in [GseOpType.STOP, GseOpType.FORCE_STOP] and error_code == cls.PROC_NO_RUNNING:
9696
# 停止进程,但进程本身未运行
9797
return True
9898

@@ -392,7 +392,7 @@ def _schedule(self, data, parent_data, common_data, callback_data=None):
392392
continue
393393

394394
data.outputs.proc_op_status_map[str(job_task.id)] = error_code
395-
if error_code == GseDataErrorCode.SUCCESS:
395+
if error_code in [GseDataErrorCode.SUCCESS, GseDataErrorCode.PROC_NO_RUNNING]:
396396
process_inst = ProcessInst.objects.get(
397397
bk_process_id=job_task.bk_process_id, local_inst_id=local_inst_id
398398
)

0 commit comments

Comments
 (0)