cnpmcore 3.83.2 → 3.83.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -106,6 +106,12 @@ let TaskService = class TaskService extends AbstractService_1.AbstractService {
|
|
|
106
106
|
const tasks = await this.taskRepository.findTimeoutTasks(Task_1.TaskState.Processing, 60000 * 10);
|
|
107
107
|
for (const task of tasks) {
|
|
108
108
|
try {
|
|
109
|
+
// changes_stream 任务只能由开启了 enableChangesStream 的机器重试
|
|
110
|
+
// 否则在多集群 + redis 不共享的场景下，未开启 changesStream 的机器会把任务
|
|
111
|
+
// 重新推入自己的队列，导致任务被无法执行它的机器抢占，且无法被正常调度执行
|
|
112
|
+
if (task.type === Task_1.TaskType.ChangesStream && !this.config.cnpmcore.enableChangesStream) {
|
|
113
|
+
continue;
|
|
114
|
+
}
|
|
109
115
|
// ignore ChangesStream task, it won't timeout
|
|
110
116
|
if (task.attempts >= 3 && task.type !== Task_1.TaskType.ChangesStream) {
|
|
111
117
|
await this.finishTask(task, Task_1.TaskState.Timeout);
|
|
@@ -127,6 +133,10 @@ let TaskService = class TaskService extends AbstractService_1.AbstractService {
|
|
|
127
133
|
const waitingTasks = await this.taskRepository.findTimeoutTasks(Task_1.TaskState.Waiting, 60000 * 30);
|
|
128
134
|
for (const task of waitingTasks) {
|
|
129
135
|
try {
|
|
136
|
+
// 同上，changes_stream 任务只能由开启了 enableChangesStream 的机器重试
|
|
137
|
+
if (task.type === Task_1.TaskType.ChangesStream && !this.config.cnpmcore.enableChangesStream) {
|
|
138
|
+
continue;
|
|
139
|
+
}
|
|
130
140
|
await this.retryTask(task);
|
|
131
141
|
this.logger.warn('[TaskService.retryExecuteTimeoutTasks:retryWaiting] taskType: %s, targetName: %s, taskId: %s waiting too long', task.type, task.targetName, task.taskId);
|
|
132
142
|
}
|
|
@@ -189,4 +199,4 @@ exports.TaskService = TaskService = __decorate([
|
|
|
189
199
|
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
190
200
|
})
|
|
191
201
|
], TaskService);
|
|
192
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
202
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TaskService.js","sourceRoot":"","sources":["../../../../app/core/service/TaskService.ts"],"names":[],"mappings":"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"}
|