refactor:2.5.0
1.优化场景重试数据到达阈值告警和优化场景重试失败数据到达阈值 2.修复查询重试数据无传入namespaceId错误
This commit is contained in:
byteblogs168
parent
b253df6d7f
commit
4d2c1ebfe5
@ -16,22 +16,22 @@ import java.util.List;
|
||||
*/
|
||||
public interface TaskAccess<T> extends Access<T> {
|
||||
|
||||
List<T> list(String groupName, LambdaQueryWrapper<T> query);
|
||||
List<T> list(String groupName, String namespaceId, LambdaQueryWrapper<T> query);
|
||||
|
||||
T one(String groupName, LambdaQueryWrapper<T> query);
|
||||
T one(String groupName, String namespaceId, LambdaQueryWrapper<T> query);
|
||||
|
||||
int update(String groupName, T t, LambdaUpdateWrapper<T> query);
|
||||
int update(String groupName, String namespaceId, T t, LambdaUpdateWrapper<T> query);
|
||||
|
||||
int updateById(String groupName, T t);
|
||||
int updateById(String groupName, String namespaceId, T t);
|
||||
|
||||
int delete(String groupName, LambdaQueryWrapper<T> query);
|
||||
int delete(String groupName, String namespaceId, LambdaQueryWrapper<T> query);
|
||||
|
||||
int insert(String groupName, T t);
|
||||
int insert(String groupName, String namespaceId, T t);
|
||||
|
||||
int batchInsert(String groupName, List<T> list);
|
||||
int batchInsert(String groupName, String namespaceId, List<T> list);
|
||||
|
||||
PageDTO<T> listPage(String groupName, PageDTO<T> iPage, LambdaQueryWrapper<T> query);
|
||||
PageDTO<T> listPage(String groupName, String namespaceId, PageDTO<T> iPage, LambdaQueryWrapper<T> query);
|
||||
|
||||
long count(String groupName, LambdaQueryWrapper<T> query);
|
||||
long count(String groupName, String namespaceId, LambdaQueryWrapper<T> query);
|
||||
|
||||
}
|
||||
|
||||
@ -33,60 +33,61 @@ public abstract class AbstractTaskAccess<T> implements TaskAccess<T> {
|
||||
* 设置分区
|
||||
*
|
||||
* @param groupName 组名称
|
||||
* @param namespaceId 命名空间id
|
||||
*/
|
||||
public void setPartition(String groupName) {
|
||||
RequestDataHelper.setPartition(groupName);
|
||||
public void setPartition(String groupName, String namespaceId) {
|
||||
RequestDataHelper.setPartition(groupName, namespaceId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<T> list(String groupName, LambdaQueryWrapper<T> query) {
|
||||
setPartition(groupName);
|
||||
public List<T> list(String groupName, String namespaceId, LambdaQueryWrapper<T> query) {
|
||||
setPartition(groupName, namespaceId);
|
||||
return doList(query);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int update(String groupName, T t, LambdaUpdateWrapper<T> query) {
|
||||
setPartition(groupName);
|
||||
public int update(String groupName, String namespaceId, T t, LambdaUpdateWrapper<T> query) {
|
||||
setPartition(groupName, namespaceId);
|
||||
return doUpdate(t, query);
|
||||
}
|
||||
|
||||
protected abstract int doUpdate(T t, LambdaUpdateWrapper<T> query);
|
||||
|
||||
@Override
|
||||
public int updateById(String groupName, T t) {
|
||||
setPartition(groupName);
|
||||
public int updateById(String groupName, String namespaceId, T t) {
|
||||
setPartition(groupName, namespaceId);
|
||||
return doUpdateById(t);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int delete(String groupName, LambdaQueryWrapper<T> query) {
|
||||
setPartition(groupName);
|
||||
public int delete(String groupName, String namespaceId, LambdaQueryWrapper<T> query) {
|
||||
setPartition(groupName, namespaceId);
|
||||
return doDelete(query);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int insert(String groupName, T t) {
|
||||
setPartition(groupName);
|
||||
public int insert(String groupName, String namespaceId, T t) {
|
||||
setPartition(groupName, namespaceId);
|
||||
return doInsert(t);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int batchInsert(String groupName, List<T> list) {
|
||||
setPartition(groupName);
|
||||
public int batchInsert(String groupName, String namespaceId, List<T> list) {
|
||||
setPartition(groupName, namespaceId);
|
||||
return doBatchInsert(list);
|
||||
}
|
||||
|
||||
protected abstract int doBatchInsert(List<T> list);
|
||||
|
||||
@Override
|
||||
public PageDTO<T> listPage(final String groupName, final PageDTO<T> iPage, final LambdaQueryWrapper<T> query) {
|
||||
setPartition(groupName);
|
||||
public PageDTO<T> listPage(String groupName, String namespaceId, final PageDTO<T> iPage, final LambdaQueryWrapper<T> query) {
|
||||
setPartition(groupName, namespaceId);
|
||||
return doListPage(iPage, query);
|
||||
}
|
||||
|
||||
@Override
|
||||
public T one(String groupName, LambdaQueryWrapper<T> query) {
|
||||
setPartition(groupName);
|
||||
public T one(String groupName, String namespaceId, LambdaQueryWrapper<T> query) {
|
||||
setPartition(groupName, namespaceId);
|
||||
return doOne(query);
|
||||
}
|
||||
|
||||
@ -95,8 +96,8 @@ public abstract class AbstractTaskAccess<T> implements TaskAccess<T> {
|
||||
protected abstract PageDTO<T> doListPage(final PageDTO<T> iPage, final LambdaQueryWrapper<T> query);
|
||||
|
||||
@Override
|
||||
public long count(final String groupName, final LambdaQueryWrapper<T> query) {
|
||||
setPartition(groupName);
|
||||
public long count(String groupName, String namespaceId, final LambdaQueryWrapper<T> query) {
|
||||
setPartition(groupName, namespaceId);
|
||||
return doCount(query);
|
||||
}
|
||||
|
||||
|
||||
@ -55,15 +55,18 @@ public class RequestDataHelper {
|
||||
*
|
||||
* @param groupName 组名称
|
||||
*/
|
||||
public static void setPartition(String groupName) {
|
||||
public static void setPartition(String groupName, String namespaceId) {
|
||||
|
||||
if (StrUtil.isBlank(groupName)) {
|
||||
throw new EasyRetryDatasourceException("组名称不能为空");
|
||||
if (StrUtil.isBlank(groupName) && StrUtil.isNotBlank(namespaceId)) {
|
||||
throw new EasyRetryDatasourceException("组名称或者命名空间ID不能为空");
|
||||
}
|
||||
|
||||
GroupConfigMapper groupConfigMapper = SpringContext.getBeanByType(GroupConfigMapper.class);
|
||||
|
||||
GroupConfig groupConfig = groupConfigMapper.selectOne(new LambdaQueryWrapper<GroupConfig>()
|
||||
GroupConfig groupConfig = groupConfigMapper.selectOne(
|
||||
new LambdaQueryWrapper<GroupConfig>()
|
||||
.select(GroupConfig::getGroupPartition)
|
||||
.eq(GroupConfig::getNamespaceId, namespaceId)
|
||||
.eq(GroupConfig::getGroupName, groupName));
|
||||
if (Objects.isNull(groupConfig)) {
|
||||
throw new EasyRetryDatasourceException("groupName:[{}]不存在", groupName);
|
||||
@ -105,7 +108,6 @@ public class RequestDataHelper {
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void remove() {
|
||||
REQUEST_DATA.remove();
|
||||
}
|
||||
|
||||
@ -22,10 +22,10 @@
|
||||
insert into server_node (namespace_id, group_name, host_id, host_ip, host_port,
|
||||
expire_at, node_type, ext_attrs, context_path, create_dt)
|
||||
values
|
||||
<foreach collection="records" item="item" index="index" separator="," open="(" close=")">
|
||||
#{item.namespaceId,jdbcType=VARCHAR}, #{item.groupName,jdbcType=VARCHAR}, #{item.hostId,jdbcType=VARCHAR}, #{item.hostIp,jdbcType=VARCHAR},
|
||||
<foreach collection="records" item="item" index="index" separator=",">
|
||||
(#{item.namespaceId,jdbcType=VARCHAR}, #{item.groupName,jdbcType=VARCHAR}, #{item.hostId,jdbcType=VARCHAR}, #{item.hostIp,jdbcType=VARCHAR},
|
||||
#{item.hostPort,jdbcType=INTEGER}, #{item.expireAt,jdbcType=TIMESTAMP}, #{item.nodeType,jdbcType=TINYINT},
|
||||
#{item.extAttrs,jdbcType=VARCHAR}, #{item.contextPath,jdbcType=VARCHAR}, #{item.createDt,jdbcType=TIMESTAMP}
|
||||
#{item.extAttrs,jdbcType=VARCHAR}, #{item.contextPath,jdbcType=VARCHAR}, #{item.createDt,jdbcType=TIMESTAMP})
|
||||
</foreach>
|
||||
ON DUPLICATE KEY UPDATE
|
||||
expire_at = values(`expire_at`)
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
package com.aizuda.easy.retry.server.retry.task.dto;
|
||||
|
||||
import com.aizuda.easy.retry.server.common.dto.PartitionTask;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* @author xiaowoniu
|
||||
* @date 2023-10-25 22:23:24
|
||||
* @since 2.5.0
|
||||
*/
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
public class NotifyConfigPartitionTask extends PartitionTask {
|
||||
|
||||
|
||||
private String namespaceId;
|
||||
|
||||
private String groupName;
|
||||
|
||||
private String sceneName;
|
||||
|
||||
private Integer notifyStatus;
|
||||
|
||||
private Integer notifyType;
|
||||
|
||||
private String notifyAttribute;
|
||||
|
||||
private Integer notifyThreshold;
|
||||
|
||||
private Integer notifyScene;
|
||||
|
||||
private Integer rateLimiterStatus;
|
||||
|
||||
private Integer rateLimiterThreshold;
|
||||
|
||||
}
|
||||
@ -70,8 +70,7 @@ public abstract class AbstractGenerator implements TaskGenerator {
|
||||
TaskAccess<RetryTask> retryTaskAccess = accessTemplate.getRetryTaskAccess();
|
||||
|
||||
// 获取相关的任务，用户幂等校验
|
||||
RequestDataHelper.setPartition(taskContext.getGroupName());
|
||||
List<RetryTask> retryTasks = retryTaskAccess.list(taskContext.getGroupName(),
|
||||
List<RetryTask> retryTasks = retryTaskAccess.list(taskContext.getGroupName(), taskContext.getNamespaceId(),
|
||||
new LambdaQueryWrapper<RetryTask>()
|
||||
.eq(RetryTask::getNamespaceId, taskContext.getNamespaceId())
|
||||
.eq(RetryTask::getGroupName, taskContext.getGroupName())
|
||||
@ -98,7 +97,8 @@ public abstract class AbstractGenerator implements TaskGenerator {
|
||||
}
|
||||
|
||||
Assert.isTrue(
|
||||
waitInsertTasks.size() == retryTaskAccess.batchInsert(taskContext.getGroupName(), waitInsertTasks),
|
||||
waitInsertTasks.size() == retryTaskAccess.batchInsert(taskContext.getGroupName(),
|
||||
taskContext.getNamespaceId(), waitInsertTasks),
|
||||
() -> new EasyRetryServerException("failed to report data"));
|
||||
Assert.isTrue(waitInsertTaskLogs.size() == retryTaskLogMapper.batchInsert(waitInsertTaskLogs),
|
||||
() -> new EasyRetryServerException("新增重试日志失败"));
|
||||
|
||||
@ -17,8 +17,9 @@ public interface RetryService {
|
||||
* 迁移到达最大重试次数到死信队列
|
||||
* 删除重试完成的数据
|
||||
*
|
||||
* @param groupId 组id
|
||||
* @param groupName 组id
|
||||
* @param namespaceId 命名空间id
|
||||
* @return true- 处理成功 false- 处理失败
|
||||
*/
|
||||
Boolean moveDeadLetterAndDelFinish(String groupId);
|
||||
Boolean moveDeadLetterAndDelFinish(String groupName, String namespaceId);
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
package com.aizuda.easy.retry.server.retry.task.service.impl;
|
||||
|
||||
import cn.hutool.core.lang.Assert;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum;
|
||||
@ -20,6 +21,7 @@ import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
@ -42,12 +44,13 @@ public class RetryServiceImpl implements RetryService {
|
||||
|
||||
@Transactional
|
||||
@Override
|
||||
public Boolean moveDeadLetterAndDelFinish(String groupName) {
|
||||
public Boolean moveDeadLetterAndDelFinish(String groupName, String namespaceId) {
|
||||
|
||||
TaskAccess<RetryTask> retryTaskAccess = accessTemplate.getRetryTaskAccess();
|
||||
RequestDataHelper.setPartition(groupName);
|
||||
List<RetryTask> callbackRetryTasks = retryTaskAccess.listPage(groupName, new PageDTO<>(0, 100),
|
||||
RequestDataHelper.setPartition(groupName, namespaceId);
|
||||
List<RetryTask> callbackRetryTasks = retryTaskAccess.listPage(groupName, namespaceId, new PageDTO<>(0, 100),
|
||||
new LambdaQueryWrapper<RetryTask>()
|
||||
.eq(RetryTask::getNamespaceId, namespaceId)
|
||||
.in(RetryTask::getRetryStatus, RetryStatusEnum.MAX_COUNT.getStatus(),
|
||||
RetryStatusEnum.FINISH.getStatus())
|
||||
.eq(RetryTask::getTaskType, TaskTypeEnum.CALLBACK.getType())
|
||||
@ -62,7 +65,9 @@ public class RetryServiceImpl implements RetryService {
|
||||
return callbackTaskUniqueId.substring(callbackTaskUniqueId.lastIndexOf(StrUtil.UNDERLINE) + 1);
|
||||
}).collect(Collectors.toSet());
|
||||
|
||||
List<RetryTask> retryTasks = accessTemplate.getRetryTaskAccess().list(groupName, new LambdaQueryWrapper<RetryTask>()
|
||||
List<RetryTask> retryTasks = accessTemplate.getRetryTaskAccess()
|
||||
.list(groupName, namespaceId, new LambdaQueryWrapper<RetryTask>()
|
||||
.eq(RetryTask::getNamespaceId, namespaceId)
|
||||
.eq(RetryTask::getTaskType, TaskTypeEnum.RETRY.getType())
|
||||
.in(RetryTask::getUniqueId, uniqueIdSet)
|
||||
);
|
||||
@ -84,7 +89,7 @@ public class RetryServiceImpl implements RetryService {
|
||||
waitMoveDeadLetters.addAll(maxCountCallbackRetryTaskList);
|
||||
}
|
||||
|
||||
moveDeadLetters(groupName, waitMoveDeadLetters);
|
||||
moveDeadLetters(groupName, namespaceId, waitMoveDeadLetters);
|
||||
|
||||
// 删除重试完成的数据
|
||||
Set<Long> waitDelRetryFinishSet = new HashSet<>();
|
||||
@ -111,8 +116,10 @@ public class RetryServiceImpl implements RetryService {
|
||||
}
|
||||
|
||||
Assert.isTrue(waitDelRetryFinishSet.size() == accessTemplate.getRetryTaskAccess()
|
||||
.delete(groupName, new LambdaQueryWrapper<RetryTask>()
|
||||
.eq(RetryTask::getGroupName, groupName).in(RetryTask::getId, waitDelRetryFinishSet)),
|
||||
.delete(groupName, namespaceId, new LambdaQueryWrapper<RetryTask>()
|
||||
.eq(RetryTask::getNamespaceId, namespaceId)
|
||||
.eq(RetryTask::getGroupName, groupName)
|
||||
.in(RetryTask::getId, waitDelRetryFinishSet)),
|
||||
() -> new EasyRetryServerException("删除重试数据失败 [{}]", JsonUtil.toJsonString(retryTasks)));
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
@ -123,7 +130,7 @@ public class RetryServiceImpl implements RetryService {
|
||||
* @param groupName 组id
|
||||
* @param retryTasks 待迁移数据
|
||||
*/
|
||||
private void moveDeadLetters(String groupName, List<RetryTask> retryTasks) {
|
||||
private void moveDeadLetters(String groupName, String namespaceId, List<RetryTask> retryTasks) {
|
||||
if (CollectionUtils.isEmpty(retryTasks)) {
|
||||
return;
|
||||
}
|
||||
@ -134,13 +141,16 @@ public class RetryServiceImpl implements RetryService {
|
||||
retryDeadLetter.setCreateDt(now);
|
||||
}
|
||||
Assert.isTrue(retryDeadLetters.size() == accessTemplate
|
||||
.getRetryDeadLetterAccess().batchInsert(groupName, retryDeadLetters),
|
||||
.getRetryDeadLetterAccess().batchInsert(groupName, namespaceId, retryDeadLetters),
|
||||
() -> new EasyRetryServerException("插入死信队列失败 [{}]", JsonUtil.toJsonString(retryDeadLetters)));
|
||||
|
||||
TaskAccess<RetryTask> retryTaskAccess = accessTemplate.getRetryTaskAccess();
|
||||
List<Long> ids = retryTasks.stream().map(RetryTask::getId).collect(Collectors.toList());
|
||||
Assert.isTrue(retryTasks.size() == retryTaskAccess.delete(groupName, new LambdaQueryWrapper<RetryTask>()
|
||||
.eq(RetryTask::getGroupName, groupName).in(RetryTask::getId, ids)),
|
||||
Assert.isTrue(retryTasks.size() == retryTaskAccess.delete(groupName, namespaceId,
|
||||
new LambdaQueryWrapper<RetryTask>()
|
||||
.eq(RetryTask::getNamespaceId, namespaceId)
|
||||
.eq(RetryTask::getGroupName, groupName)
|
||||
.in(RetryTask::getId, ids)),
|
||||
() -> new EasyRetryServerException("删除重试数据失败 [{}]", JsonUtil.toJsonString(retryTasks)));
|
||||
|
||||
context.publishEvent(new RetryTaskFailDeadLetterAlarmEvent(retryDeadLetters));
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
package com.aizuda.easy.retry.server.retry.task.support;
|
||||
|
||||
import com.aizuda.easy.retry.server.model.dto.RetryTaskDTO;
|
||||
import com.aizuda.easy.retry.server.retry.task.dto.NotifyConfigPartitionTask;
|
||||
import com.aizuda.easy.retry.server.retry.task.dto.RetryPartitionTask;
|
||||
import com.aizuda.easy.retry.server.retry.task.generator.task.TaskContext;
|
||||
import com.aizuda.easy.retry.server.retry.task.support.timer.RetryTimerContext;
|
||||
import com.aizuda.easy.retry.template.datasource.persistence.po.NotifyConfig;
|
||||
import com.aizuda.easy.retry.template.datasource.persistence.po.RetryDeadLetter;
|
||||
import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTask;
|
||||
import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTaskLog;
|
||||
@ -41,4 +43,6 @@ public interface RetryTaskConverter {
|
||||
List<RetryPartitionTask> toRetryTaskLogPartitionTasks(List<RetryTaskLog> retryTaskLogList);
|
||||
|
||||
RetryTimerContext toRetryTimerContext(RetryPartitionTask retryPartitionTask);
|
||||
|
||||
List<NotifyConfigPartitionTask> toNotifyConfigPartitionTask(List<NotifyConfig> notifyConfigs);
|
||||
}
|
||||
|
||||
@ -116,7 +116,7 @@ public class ExecCallbackUnitActor extends AbstractActor {
|
||||
String retryTaskUniqueId = callbackRetryTaskHandler.getRetryTaskUniqueId(callbackTask.getUniqueId());
|
||||
|
||||
TaskAccess<RetryTask> retryTaskAccess = accessTemplate.getRetryTaskAccess();
|
||||
RetryTask retryTask = retryTaskAccess.one(callbackTask.getGroupName(),
|
||||
RetryTask retryTask = retryTaskAccess.one(callbackTask.getGroupName(), callbackTask.getNamespaceId(),
|
||||
new LambdaQueryWrapper<RetryTask>()
|
||||
.select(RetryTask::getRetryStatus)
|
||||
.eq(RetryTask::getNamespaceId, serverNode.getNamespaceId())
|
||||
|
||||
@ -87,7 +87,7 @@ public class FailureActor extends AbstractActor {
|
||||
|
||||
retryTask.setUpdateDt(LocalDateTime.now());
|
||||
Assert.isTrue(1 == accessTemplate.getRetryTaskAccess()
|
||||
.updateById(retryTask.getGroupName(), retryTask),
|
||||
.updateById(retryTask.getGroupName(), retryTask.getNamespaceId(), retryTask),
|
||||
() -> new EasyRetryServerException("更新重试任务失败. groupName:[{}] uniqueId:[{}]",
|
||||
retryTask.getGroupName(), retryTask.getUniqueId()));
|
||||
|
||||
|
||||
@ -64,7 +64,7 @@ public class FinishActor extends AbstractActor {
|
||||
|
||||
retryTask.setUpdateDt(LocalDateTime.now());
|
||||
Assert.isTrue(1 == accessTemplate.getRetryTaskAccess()
|
||||
.updateById(retryTask.getGroupName(), retryTask),
|
||||
.updateById(retryTask.getGroupName(), retryTask.getNamespaceId(), retryTask),
|
||||
() -> new EasyRetryServerException("更新重试任务失败. groupName:[{}] uniqueId:[{}]",
|
||||
retryTask.getGroupName(), retryTask.getUniqueId()));
|
||||
|
||||
|
||||
@ -50,7 +50,7 @@ public class NoRetryActor extends AbstractActor {
|
||||
try {
|
||||
retryTask.setUpdateDt(LocalDateTime.now());
|
||||
Assert.isTrue(1 == accessTemplate.getRetryTaskAccess()
|
||||
.updateById(retryTask.getGroupName(),retryTask), () ->
|
||||
.updateById(retryTask.getGroupName(), retryTask.getNamespaceId() , retryTask), () ->
|
||||
new EasyRetryServerException("更新重试任务失败. groupName:[{}] uniqueId:[{}]",
|
||||
retryTask.getGroupName(), retryTask.getUniqueId()));
|
||||
} catch (Exception e) {
|
||||
|
||||
@ -183,7 +183,7 @@ public abstract class AbstractScanGroup extends AbstractActor {
|
||||
|
||||
public List<RetryPartitionTask> listAvailableTasks(String groupName, String namespaceId, Long lastId, Integer taskType) {
|
||||
List<RetryTask> retryTasks = accessTemplate.getRetryTaskAccess()
|
||||
.listPage(groupName, new PageDTO<>(0, systemProperties.getRetryPullPageSize()),
|
||||
.listPage(groupName, namespaceId, new PageDTO<>(0, systemProperties.getRetryPullPageSize()),
|
||||
new LambdaQueryWrapper<RetryTask>()
|
||||
.select(RetryTask::getId, RetryTask::getNextTriggerAt, RetryTask::getUniqueId,
|
||||
RetryTask::getGroupName, RetryTask::getRetryCount, RetryTask::getSceneName,
|
||||
|
||||
@ -81,14 +81,13 @@ public class CallbackRetryTaskHandler {
|
||||
|
||||
try {
|
||||
Assert.isTrue(1 == accessTemplate.getRetryTaskAccess()
|
||||
.insert(callbackRetryTask.getGroupName(), callbackRetryTask),
|
||||
.insert(callbackRetryTask.getGroupName(), callbackRetryTask.getNamespaceId(), callbackRetryTask),
|
||||
() -> new EasyRetryServerException("failed to report data"));
|
||||
} catch (DuplicateKeyException e) {
|
||||
log.warn("回调数据重复新增. [{}]", JsonUtil.toJsonString(retryTask));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// 初始化回调日志
|
||||
RetryTaskLog retryTaskLog = RetryTaskLogConverter.INSTANCE.toRetryTask(callbackRetryTask);
|
||||
// 记录重试日志
|
||||
|
||||
@ -4,22 +4,33 @@ import com.aizuda.easy.retry.common.core.alarm.Alarm;
|
||||
import com.aizuda.easy.retry.common.core.alarm.AlarmContext;
|
||||
import com.aizuda.easy.retry.common.core.alarm.EasyRetryAlarmFactory;
|
||||
import com.aizuda.easy.retry.common.core.enums.NotifySceneEnum;
|
||||
import com.aizuda.easy.retry.common.core.enums.StatusEnum;
|
||||
import com.aizuda.easy.retry.common.core.log.LogUtils;
|
||||
import com.aizuda.easy.retry.common.core.util.EnvironmentUtils;
|
||||
import com.aizuda.easy.retry.common.core.util.HostUtils;
|
||||
import com.aizuda.easy.retry.server.common.Lifecycle;
|
||||
import com.aizuda.easy.retry.server.common.dto.PartitionTask;
|
||||
import com.aizuda.easy.retry.server.common.schedule.AbstractSchedule;
|
||||
import com.aizuda.easy.retry.server.common.util.DateUtils;
|
||||
import com.aizuda.easy.retry.server.common.util.PartitionTaskUtils;
|
||||
import com.aizuda.easy.retry.server.retry.task.dto.NotifyConfigPartitionTask;
|
||||
import com.aizuda.easy.retry.server.retry.task.dto.RetryPartitionTask;
|
||||
import com.aizuda.easy.retry.server.retry.task.support.RetryTaskConverter;
|
||||
import com.aizuda.easy.retry.template.datasource.access.AccessTemplate;
|
||||
import com.aizuda.easy.retry.template.datasource.access.TaskAccess;
|
||||
import com.aizuda.easy.retry.template.datasource.persistence.po.NotifyConfig;
|
||||
import com.aizuda.easy.retry.template.datasource.persistence.po.RetryDeadLetter;
|
||||
import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTaskLog;
|
||||
import com.aizuda.easy.retry.template.datasource.persistence.po.SceneConfig;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
import java.time.LocalDateTime;
|
||||
@ -60,35 +71,51 @@ public class RetryErrorMoreThresholdAlarmSchedule extends AbstractSchedule imple
|
||||
@Override
|
||||
protected void doExecute() {
|
||||
LogUtils.info(log, "retryErrorMoreThreshold time[{}] ip:[{}]", LocalDateTime.now(), HostUtils.getIp());
|
||||
for (SceneConfig sceneConfig : accessTemplate.getSceneConfigAccess().getAllConfigSceneList()) {
|
||||
List<NotifyConfig> notifyConfigs = accessTemplate.getNotifyConfigAccess().getNotifyConfigByGroupNameAndSceneName(sceneConfig.getGroupName(),sceneConfig.getSceneName(), NotifySceneEnum.MAX_RETRY_ERROR.getNotifyScene());
|
||||
if (CollectionUtils.isEmpty(notifyConfigs)) {
|
||||
continue;
|
||||
PartitionTaskUtils.process(this::getNotifyConfigPartitions, this::doHandler, 0);
|
||||
}
|
||||
|
||||
private void doHandler(List<? extends PartitionTask> partitionTasks) {
|
||||
|
||||
for (PartitionTask partitionTask : partitionTasks) {
|
||||
doSendAlarm((NotifyConfigPartitionTask) partitionTask);
|
||||
}
|
||||
}
|
||||
|
||||
private void doSendAlarm(NotifyConfigPartitionTask notifyConfigPartitionTask) {
|
||||
// x分钟内、x组、x场景进入死信队列的数据量
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
TaskAccess<RetryDeadLetter> retryDeadLetterAccess = accessTemplate.getRetryDeadLetterAccess();
|
||||
long count = retryDeadLetterAccess.count(sceneConfig.getGroupName(), new LambdaQueryWrapper<RetryDeadLetter>().
|
||||
long count = retryDeadLetterAccess.count(notifyConfigPartitionTask.getGroupName(), notifyConfigPartitionTask.getNamespaceId(),
|
||||
new LambdaQueryWrapper<RetryDeadLetter>().
|
||||
between(RetryDeadLetter::getCreateDt, now.minusMinutes(30), now)
|
||||
.eq(RetryDeadLetter::getGroupName,sceneConfig.getGroupName())
|
||||
.eq(RetryDeadLetter::getSceneName,sceneConfig.getSceneName()));
|
||||
for (NotifyConfig notifyConfig : notifyConfigs) {
|
||||
if (count > notifyConfig.getNotifyThreshold()) {
|
||||
.eq(RetryDeadLetter::getGroupName, notifyConfigPartitionTask.getGroupName())
|
||||
.eq(RetryDeadLetter::getSceneName, notifyConfigPartitionTask.getSceneName()));
|
||||
if (count > notifyConfigPartitionTask.getNotifyThreshold()) {
|
||||
// 预警
|
||||
AlarmContext context = AlarmContext.build().text(retryErrorMoreThresholdTextMessageFormatter,
|
||||
AlarmContext context = AlarmContext.build()
|
||||
.text(retryErrorMoreThresholdTextMessageFormatter,
|
||||
EnvironmentUtils.getActiveProfile(),
|
||||
sceneConfig.getGroupName(),
|
||||
sceneConfig.getSceneName(),
|
||||
notifyConfigPartitionTask.getGroupName(),
|
||||
notifyConfigPartitionTask.getSceneName(),
|
||||
DateUtils.format(now.minusMinutes(30),
|
||||
DateUtils.NORM_DATETIME_PATTERN),
|
||||
DateUtils.toNowFormat(DateUtils.NORM_DATETIME_PATTERN), count)
|
||||
.title("{}环境 场景重试失败数量超过阈值", EnvironmentUtils.getActiveProfile())
|
||||
.notifyAttribute(notifyConfig.getNotifyAttribute());
|
||||
Alarm<AlarmContext> alarmType = easyRetryAlarmFactory.getAlarmType(notifyConfig.getNotifyType());
|
||||
.notifyAttribute(notifyConfigPartitionTask.getNotifyAttribute());
|
||||
Alarm<AlarmContext> alarmType = easyRetryAlarmFactory.getAlarmType(notifyConfigPartitionTask.getNotifyType());
|
||||
alarmType.asyncSendMessage(context);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private List<NotifyConfigPartitionTask> getNotifyConfigPartitions(Long startId) {
|
||||
|
||||
List<NotifyConfig> notifyConfigs = accessTemplate.getNotifyConfigAccess()
|
||||
.listPage(new PageDTO<>(startId, 1000), new LambdaQueryWrapper<NotifyConfig>()
|
||||
.eq(NotifyConfig::getNotifyStatus, StatusEnum.YES.getStatus())
|
||||
.eq(NotifyConfig::getNotifyScene, NotifySceneEnum.MAX_RETRY_ERROR.getNotifyScene()))
|
||||
.getRecords();
|
||||
|
||||
return RetryTaskConverter.INSTANCE.toNotifyConfigPartitionTask(notifyConfigs);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -5,17 +5,23 @@ import com.aizuda.easy.retry.common.core.alarm.AlarmContext;
|
||||
import com.aizuda.easy.retry.common.core.alarm.EasyRetryAlarmFactory;
|
||||
import com.aizuda.easy.retry.common.core.enums.NotifySceneEnum;
|
||||
import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum;
|
||||
import com.aizuda.easy.retry.common.core.enums.StatusEnum;
|
||||
import com.aizuda.easy.retry.common.core.log.LogUtils;
|
||||
import com.aizuda.easy.retry.common.core.util.EnvironmentUtils;
|
||||
import com.aizuda.easy.retry.common.core.util.HostUtils;
|
||||
import com.aizuda.easy.retry.server.common.Lifecycle;
|
||||
import com.aizuda.easy.retry.server.common.dto.PartitionTask;
|
||||
import com.aizuda.easy.retry.server.common.schedule.AbstractSchedule;
|
||||
import com.aizuda.easy.retry.server.common.util.DateUtils;
|
||||
import com.aizuda.easy.retry.server.common.util.PartitionTaskUtils;
|
||||
import com.aizuda.easy.retry.server.retry.task.dto.NotifyConfigPartitionTask;
|
||||
import com.aizuda.easy.retry.server.retry.task.support.RetryTaskConverter;
|
||||
import com.aizuda.easy.retry.template.datasource.access.AccessTemplate;
|
||||
import com.aizuda.easy.retry.template.datasource.persistence.po.NotifyConfig;
|
||||
import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTask;
|
||||
import com.aizuda.easy.retry.template.datasource.persistence.po.SceneConfig;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Component;
|
||||
@ -60,32 +66,48 @@ public class RetryTaskMoreThresholdAlarmSchedule extends AbstractSchedule implem
|
||||
@Override
|
||||
protected void doExecute() {
|
||||
LogUtils.info(log, "retryTaskMoreThreshold time[{}] ip:[{}]", LocalDateTime.now(), HostUtils.getIp());
|
||||
for (SceneConfig sceneConfig : accessTemplate.getSceneConfigAccess().getAllConfigSceneList()) {
|
||||
List<NotifyConfig> notifyConfigs = accessTemplate.getNotifyConfigAccess().getNotifyConfigByGroupNameAndSceneName(sceneConfig.getGroupName(),sceneConfig.getSceneName(), NotifySceneEnum.MAX_RETRY.getNotifyScene());
|
||||
if (CollectionUtils.isEmpty(notifyConfigs)) {
|
||||
continue;
|
||||
PartitionTaskUtils.process(this::getNotifyConfigPartitions, this::doHandler, 0);
|
||||
}
|
||||
long count = accessTemplate.getRetryTaskAccess().count(sceneConfig.getGroupName(), new LambdaQueryWrapper<RetryTask>()
|
||||
.eq(RetryTask::getGroupName, sceneConfig.getGroupName())
|
||||
.eq(RetryTask::getSceneName,sceneConfig.getSceneName())
|
||||
|
||||
private void doHandler(List<? extends PartitionTask> partitionTasks) {
|
||||
for (PartitionTask partitionTask : partitionTasks) {
|
||||
doSendAlarm((NotifyConfigPartitionTask) partitionTask);
|
||||
}
|
||||
}
|
||||
|
||||
private void doSendAlarm(NotifyConfigPartitionTask partitionTask) {
|
||||
long count = accessTemplate.getRetryTaskAccess()
|
||||
.count(partitionTask.getGroupName(), partitionTask.getNamespaceId(),
|
||||
new LambdaQueryWrapper<RetryTask>()
|
||||
.eq(RetryTask::getNamespaceId, partitionTask.getNamespaceId())
|
||||
.eq(RetryTask::getGroupName, partitionTask.getGroupName())
|
||||
.eq(RetryTask::getSceneName, partitionTask.getSceneName())
|
||||
.eq(RetryTask::getRetryStatus, RetryStatusEnum.RUNNING.getStatus()));
|
||||
for (NotifyConfig notifyConfig : notifyConfigs) {
|
||||
if (count > notifyConfig.getNotifyThreshold()) {
|
||||
if (count > partitionTask.getNotifyThreshold()) {
|
||||
// 预警
|
||||
AlarmContext context = AlarmContext.build()
|
||||
.text(retryTaskMoreThresholdTextMessageFormatter,
|
||||
EnvironmentUtils.getActiveProfile(),
|
||||
sceneConfig.getGroupName(),
|
||||
sceneConfig.getSceneName(),
|
||||
partitionTask.getGroupName(),
|
||||
partitionTask.getSceneName(),
|
||||
DateUtils.toNowFormat(DateUtils.NORM_DATETIME_PATTERN),
|
||||
count)
|
||||
.title("{}环境 场景重试数量超过阈值", EnvironmentUtils.getActiveProfile())
|
||||
.notifyAttribute(notifyConfig.getNotifyAttribute());
|
||||
Alarm<AlarmContext> alarmType = easyRetryAlarmFactory.getAlarmType(notifyConfig.getNotifyType());
|
||||
.notifyAttribute(partitionTask.getNotifyAttribute());
|
||||
Alarm<AlarmContext> alarmType = easyRetryAlarmFactory.getAlarmType(partitionTask.getNotifyType());
|
||||
alarmType.asyncSendMessage(context);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private List<NotifyConfigPartitionTask> getNotifyConfigPartitions(Long startId) {
|
||||
|
||||
List<NotifyConfig> notifyConfigs = accessTemplate.getNotifyConfigAccess()
|
||||
.listPage(new PageDTO<>(startId, 1000), new LambdaQueryWrapper<NotifyConfig>()
|
||||
.eq(NotifyConfig::getNotifyStatus, StatusEnum.YES.getStatus())
|
||||
.eq(NotifyConfig::getNotifyScene, NotifySceneEnum.MAX_RETRY.getNotifyScene()))
|
||||
.getRecords();
|
||||
|
||||
return RetryTaskConverter.INSTANCE.toNotifyConfigPartitionTask(notifyConfigs);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.aizuda.easy.retry.server.retry.task.support.schedule;
|
||||
|
||||
import cn.hutool.core.lang.Pair;
|
||||
import com.aizuda.easy.retry.common.core.enums.StatusEnum;
|
||||
import com.aizuda.easy.retry.common.core.log.LogUtils;
|
||||
import com.aizuda.easy.retry.server.common.Lifecycle;
|
||||
@ -47,14 +48,18 @@ public class RetryTaskSchedule extends AbstractSchedule implements Lifecycle {
|
||||
@Override
|
||||
protected void doExecute() {
|
||||
try {
|
||||
Set<String> groupNameList = accessTemplate.getGroupConfigAccess()
|
||||
Set<Pair<String/*groupName*/, String/*namespaceId*/>> groupNameList = accessTemplate.getGroupConfigAccess()
|
||||
.list(new LambdaQueryWrapper<GroupConfig>()
|
||||
.select(GroupConfig::getGroupName)
|
||||
.select(GroupConfig::getGroupName, GroupConfig::getNamespaceId)
|
||||
.eq(GroupConfig::getGroupStatus, StatusEnum.YES.getStatus()))
|
||||
.stream().map(GroupConfig::getGroupName).collect(Collectors.toSet());
|
||||
.stream().map(groupConfig -> {
|
||||
|
||||
for (String groupName : groupNameList) {
|
||||
retryService.moveDeadLetterAndDelFinish(groupName);
|
||||
|
||||
return Pair.of(groupConfig.getGroupName(), groupConfig.getNamespaceId());
|
||||
}).collect(Collectors.toSet());
|
||||
|
||||
for (Pair<String/*groupName*/, String/*namespaceId*/> pair : groupNameList) {
|
||||
retryService.moveDeadLetterAndDelFinish(pair.getKey(), pair.getValue());
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
|
||||
@ -36,7 +36,8 @@ public class CallbackTimerTask extends AbstractTimerTask {
|
||||
log.info("回调任务执行 {}", LocalDateTime.now());
|
||||
AccessTemplate accessTemplate = SpringContext.getBeanByType(AccessTemplate.class);
|
||||
TaskAccess<RetryTask> retryTaskAccess = accessTemplate.getRetryTaskAccess();
|
||||
RetryTask retryTask = retryTaskAccess.one(context.getGroupName(), new LambdaQueryWrapper<RetryTask>()
|
||||
RetryTask retryTask = retryTaskAccess.one(context.getGroupName(), context.getNamespaceId(),
|
||||
new LambdaQueryWrapper<RetryTask>()
|
||||
.eq(RetryTask::getNamespaceId, context.getNamespaceId())
|
||||
.eq(RetryTask::getGroupName, context.getGroupName())
|
||||
.eq(RetryTask::getUniqueId, context.getUniqueId())
|
||||
|
||||
@ -34,7 +34,8 @@ public class RetryTimerTask extends AbstractTimerTask {
|
||||
public void doRun(final Timeout timeout) {
|
||||
AccessTemplate accessTemplate = SpringContext.getBeanByType(AccessTemplate.class);
|
||||
TaskAccess<RetryTask> retryTaskAccess = accessTemplate.getRetryTaskAccess();
|
||||
RetryTask retryTask = retryTaskAccess.one(context.getGroupName(), new LambdaQueryWrapper<RetryTask>()
|
||||
RetryTask retryTask = retryTaskAccess.one(context.getGroupName(), context.getNamespaceId(),
|
||||
new LambdaQueryWrapper<RetryTask>()
|
||||
.eq(RetryTask::getNamespaceId, context.getNamespaceId())
|
||||
.eq(RetryTask::getGroupName, context.getGroupName())
|
||||
.eq(RetryTask::getUniqueId, context.getUniqueId())
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -13,6 +13,6 @@ import lombok.EqualsAndHashCode;
|
||||
@Data
|
||||
public class NamespaceQueryVO extends BaseQueryVO {
|
||||
|
||||
private String name;
|
||||
private String keyword;
|
||||
|
||||
}
|
||||
|
||||
@ -69,6 +69,7 @@ public class GroupConfigServiceImpl implements GroupConfigService {
|
||||
|
||||
ConfigAccess<GroupConfig> groupConfigAccess = accessTemplate.getGroupConfigAccess();
|
||||
Assert.isTrue(groupConfigAccess.count(new LambdaQueryWrapper<GroupConfig>()
|
||||
.eq(GroupConfig::getNamespaceId, systemUser.getNamespaceId())
|
||||
.eq(GroupConfig::getGroupName, groupConfigRequestVO.getGroupName())) == 0,
|
||||
() -> new EasyRetryServerException("GroupName已经存在 {}", groupConfigRequestVO.getGroupName()));
|
||||
|
||||
@ -107,7 +108,9 @@ public class GroupConfigServiceImpl implements GroupConfigService {
|
||||
|
||||
ConfigAccess<GroupConfig> groupConfigAccess = accessTemplate.getGroupConfigAccess();
|
||||
long count = groupConfigAccess.count(
|
||||
new LambdaQueryWrapper<GroupConfig>().eq(GroupConfig::getGroupName, groupName));
|
||||
new LambdaQueryWrapper<GroupConfig>()
|
||||
.eq(GroupConfig::getNamespaceId, namespaceId)
|
||||
.eq(GroupConfig::getGroupName, groupName));
|
||||
if (count <= 0) {
|
||||
return false;
|
||||
}
|
||||
@ -122,8 +125,7 @@ public class GroupConfigServiceImpl implements GroupConfigService {
|
||||
() -> new EasyRetryServerException("分区不能是负数."));
|
||||
|
||||
// 校验retry_task_x和retry_dead_letter_x是否存在
|
||||
checkGroupPartition(groupConfig);
|
||||
|
||||
checkGroupPartition(groupConfig, namespaceId);
|
||||
|
||||
Assert.isTrue(1 == groupConfigAccess.update(groupConfig,
|
||||
new LambdaUpdateWrapper<GroupConfig>()
|
||||
@ -218,16 +220,16 @@ public class GroupConfigServiceImpl implements GroupConfigService {
|
||||
() -> new EasyRetryServerException("新增组异常异常 groupConfigVO[{}]", groupConfigRequestVO));
|
||||
|
||||
// 校验retry_task_x和retry_dead_letter_x是否存在
|
||||
checkGroupPartition(groupConfig);
|
||||
checkGroupPartition(groupConfig, systemUser.getNamespaceId());
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验retry_task_x和retry_dead_letter_x是否存在
|
||||
*/
|
||||
private void checkGroupPartition(GroupConfig groupConfig) {
|
||||
private void checkGroupPartition(GroupConfig groupConfig, String namespaceId) {
|
||||
try {
|
||||
TaskAccess<RetryTask> retryTaskAccess = accessTemplate.getRetryTaskAccess();
|
||||
retryTaskAccess.one(groupConfig.getGroupName(),
|
||||
retryTaskAccess.count(groupConfig.getGroupName(), namespaceId,
|
||||
new LambdaQueryWrapper<RetryTask>().eq(RetryTask::getId, 1));
|
||||
} catch (BadSqlGrammarException e) {
|
||||
Optional.ofNullable(e.getMessage()).ifPresent(s -> {
|
||||
@ -240,7 +242,7 @@ public class GroupConfigServiceImpl implements GroupConfigService {
|
||||
|
||||
try {
|
||||
TaskAccess<RetryDeadLetter> retryTaskAccess = accessTemplate.getRetryDeadLetterAccess();
|
||||
retryTaskAccess.one(groupConfig.getGroupName(),
|
||||
retryTaskAccess.one(groupConfig.getGroupName(), groupConfig.getNamespaceId(),
|
||||
new LambdaQueryWrapper<RetryDeadLetter>().eq(RetryDeadLetter::getId, 1));
|
||||
} catch (BadSqlGrammarException e) {
|
||||
Optional.ofNullable(e.getMessage()).ifPresent(s -> {
|
||||
@ -257,7 +259,9 @@ public class GroupConfigServiceImpl implements GroupConfigService {
|
||||
|
||||
ConfigAccess<GroupConfig> groupConfigAccess = accessTemplate.getGroupConfigAccess();
|
||||
GroupConfig groupConfig = groupConfigAccess.one(
|
||||
new LambdaQueryWrapper<GroupConfig>().eq(GroupConfig::getGroupName, groupName));
|
||||
new LambdaQueryWrapper<GroupConfig>()
|
||||
.eq(GroupConfig::getNamespaceId, UserSessionUtils.currentUserSession().getNamespaceId())
|
||||
.eq(GroupConfig::getGroupName, groupName));
|
||||
|
||||
GroupConfigResponseVO groupConfigResponseVO = GroupConfigResponseVOConverter.INSTANCE.toGroupConfigResponseVO(
|
||||
groupConfig);
|
||||
|
||||
@ -67,8 +67,10 @@ public class NamespaceServiceImpl implements NamespaceService {
|
||||
PageDTO<Namespace> pageDTO = new PageDTO<>(queryVO.getPage(), queryVO.getSize());
|
||||
|
||||
LambdaQueryWrapper<Namespace> queryWrapper = new LambdaQueryWrapper<>();
|
||||
if (StrUtil.isNotBlank(queryVO.getName())) {
|
||||
queryWrapper.like(Namespace::getName, queryVO.getName() + "%");
|
||||
if (StrUtil.isNotBlank(queryVO.getKeyword())) {
|
||||
queryWrapper.like(Namespace::getName, queryVO.getKeyword().trim() + "%")
|
||||
.or().like(Namespace::getUniqueId, queryVO.getKeyword().trim() + "%")
|
||||
;
|
||||
}
|
||||
|
||||
queryWrapper.eq(Namespace::getDeleted, StatusEnum.NO);
|
||||
|
||||
@ -67,8 +67,9 @@ public class RetryDeadLetterServiceImpl implements RetryDeadLetterService {
|
||||
return new PageResult<>(pageDTO, new ArrayList<>());
|
||||
}
|
||||
|
||||
String namespaceId = UserSessionUtils.currentUserSession().getNamespaceId();
|
||||
LambdaQueryWrapper<RetryDeadLetter> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(RetryDeadLetter::getNamespaceId, UserSessionUtils.currentUserSession().getNamespaceId());
|
||||
queryWrapper.eq(RetryDeadLetter::getNamespaceId, namespaceId);
|
||||
queryWrapper.eq(RetryDeadLetter::getGroupName, queryVO.getGroupName());
|
||||
|
||||
if (StrUtil.isNotBlank(queryVO.getSceneName())) {
|
||||
@ -88,7 +89,7 @@ public class RetryDeadLetterServiceImpl implements RetryDeadLetterService {
|
||||
}
|
||||
|
||||
PageDTO<RetryDeadLetter> retryDeadLetterPageDTO = accessTemplate.getRetryDeadLetterAccess()
|
||||
.listPage(queryVO.getGroupName(), pageDTO, queryWrapper);
|
||||
.listPage(queryVO.getGroupName(), namespaceId, pageDTO, queryWrapper);
|
||||
|
||||
return new PageResult<>(retryDeadLetterPageDTO,
|
||||
RetryDeadLetterResponseVOConverter.INSTANCE.batchConvert(retryDeadLetterPageDTO.getRecords()));
|
||||
@ -96,8 +97,10 @@ public class RetryDeadLetterServiceImpl implements RetryDeadLetterService {
|
||||
|
||||
@Override
|
||||
public RetryDeadLetterResponseVO getRetryDeadLetterById(String groupName, Long id) {
|
||||
String namespaceId = UserSessionUtils.currentUserSession().getNamespaceId();
|
||||
|
||||
TaskAccess<RetryDeadLetter> retryDeadLetterAccess = accessTemplate.getRetryDeadLetterAccess();
|
||||
RetryDeadLetter retryDeadLetter = retryDeadLetterAccess.one(groupName,
|
||||
RetryDeadLetter retryDeadLetter = retryDeadLetterAccess.one(groupName, namespaceId,
|
||||
new LambdaQueryWrapper<RetryDeadLetter>().eq(RetryDeadLetter::getId, id));
|
||||
return RetryDeadLetterResponseVOConverter.INSTANCE.convert(retryDeadLetter);
|
||||
}
|
||||
@ -106,16 +109,16 @@ public class RetryDeadLetterServiceImpl implements RetryDeadLetterService {
|
||||
@Transactional
|
||||
public int rollback(BatchRollBackRetryDeadLetterVO rollBackRetryDeadLetterVO) {
|
||||
|
||||
String namespaceId = UserSessionUtils.currentUserSession().getNamespaceId();
|
||||
|
||||
String groupName = rollBackRetryDeadLetterVO.getGroupName();
|
||||
List<Long> ids = rollBackRetryDeadLetterVO.getIds();
|
||||
TaskAccess<RetryDeadLetter> retryDeadLetterAccess = accessTemplate.getRetryDeadLetterAccess();
|
||||
List<RetryDeadLetter> retryDeadLetterList = retryDeadLetterAccess.list(groupName,
|
||||
List<RetryDeadLetter> retryDeadLetterList = retryDeadLetterAccess.list(groupName, namespaceId,
|
||||
new LambdaQueryWrapper<RetryDeadLetter>().in(RetryDeadLetter::getId, ids));
|
||||
|
||||
Assert.notEmpty(retryDeadLetterList, () -> new EasyRetryServerException("数据不存在"));
|
||||
|
||||
String namespaceId = UserSessionUtils.currentUserSession().getNamespaceId();
|
||||
|
||||
ConfigAccess<SceneConfig> sceneConfigAccess = accessTemplate.getSceneConfigAccess();
|
||||
Set<String> sceneNameSet = retryDeadLetterList.stream().map(RetryDeadLetter::getSceneName)
|
||||
.collect(Collectors.toSet());
|
||||
@ -148,12 +151,12 @@ public class RetryDeadLetterServiceImpl implements RetryDeadLetterService {
|
||||
}
|
||||
|
||||
TaskAccess<RetryTask> retryTaskAccess = accessTemplate.getRetryTaskAccess();
|
||||
Assert.isTrue(waitRollbackList.size() == retryTaskAccess.batchInsert(groupName, waitRollbackList),
|
||||
Assert.isTrue(waitRollbackList.size() == retryTaskAccess.batchInsert(groupName, namespaceId, waitRollbackList),
|
||||
() -> new EasyRetryServerException("新增重试任务失败"));
|
||||
|
||||
Set<Long> waitDelRetryDeadLetterIdSet = retryDeadLetterList.stream().map(RetryDeadLetter::getId)
|
||||
.collect(Collectors.toSet());
|
||||
Assert.isTrue(waitDelRetryDeadLetterIdSet.size() == retryDeadLetterAccess.delete(groupName,
|
||||
Assert.isTrue(waitDelRetryDeadLetterIdSet.size() == retryDeadLetterAccess.delete(groupName, namespaceId,
|
||||
new LambdaQueryWrapper<RetryDeadLetter>()
|
||||
.eq(RetryDeadLetter::getGroupName, groupName)
|
||||
.in(RetryDeadLetter::getId, waitDelRetryDeadLetterIdSet)),
|
||||
@ -179,7 +182,7 @@ public class RetryDeadLetterServiceImpl implements RetryDeadLetterService {
|
||||
public int batchDelete(BatchDeleteRetryDeadLetterVO deadLetterVO) {
|
||||
TaskAccess<RetryDeadLetter> retryDeadLetterAccess = accessTemplate.getRetryDeadLetterAccess();
|
||||
String namespaceId = UserSessionUtils.currentUserSession().getNamespaceId();
|
||||
return retryDeadLetterAccess.delete(deadLetterVO.getGroupName(),
|
||||
return retryDeadLetterAccess.delete(deadLetterVO.getGroupName(), namespaceId,
|
||||
new LambdaQueryWrapper<RetryDeadLetter>()
|
||||
.eq(RetryDeadLetter::getNamespaceId, namespaceId)
|
||||
.eq(RetryDeadLetter::getGroupName, deadLetterVO.getGroupName())
|
||||
|
||||
@ -119,13 +119,13 @@ public class RetryTaskServiceImpl implements RetryTaskService {
|
||||
retryTaskLambdaQueryWrapper.eq(RetryTask::getRetryStatus, queryVO.getRetryStatus());
|
||||
}
|
||||
|
||||
RequestDataHelper.setPartition(queryVO.getGroupName());
|
||||
|
||||
retryTaskLambdaQueryWrapper.select(RetryTask::getId, RetryTask::getBizNo, RetryTask::getIdempotentId,
|
||||
RetryTask::getGroupName, RetryTask::getNextTriggerAt, RetryTask::getRetryCount,
|
||||
RetryTask::getRetryStatus, RetryTask::getUpdateDt, RetryTask::getSceneName, RetryTask::getUniqueId,
|
||||
RetryTask::getTaskType);
|
||||
pageDTO = accessTemplate.getRetryTaskAccess().listPage(queryVO.getGroupName(), pageDTO,
|
||||
pageDTO = accessTemplate.getRetryTaskAccess()
|
||||
.listPage(queryVO.getGroupName(), namespaceId,
|
||||
pageDTO,
|
||||
retryTaskLambdaQueryWrapper.orderByDesc(RetryTask::getCreateDt));
|
||||
return new PageResult<>(pageDTO,
|
||||
RetryTaskResponseVOConverter.INSTANCE.toRetryTaskResponseVO(pageDTO.getRecords()));
|
||||
@ -133,35 +133,35 @@ public class RetryTaskServiceImpl implements RetryTaskService {
|
||||
|
||||
@Override
|
||||
public RetryTaskResponseVO getRetryTaskById(String groupName, Long id) {
|
||||
RequestDataHelper.setPartition(groupName);
|
||||
TaskAccess<RetryTask> retryTaskAccess = accessTemplate.getRetryTaskAccess();
|
||||
RetryTask retryTask = retryTaskAccess.one(groupName,
|
||||
new LambdaQueryWrapper<RetryTask>().eq(RetryTask::getId, id));
|
||||
RetryTask retryTask = retryTaskAccess.one(groupName, UserSessionUtils.currentUserSession().getNamespaceId(),
|
||||
new LambdaQueryWrapper<RetryTask>()
|
||||
.eq(RetryTask::getId, id));
|
||||
return RetryTaskResponseVOConverter.INSTANCE.toRetryTaskResponseVO(retryTask);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public int updateRetryTaskStatus(RetryTaskUpdateStatusRequestVO retryTaskUpdateStatusRequestVO) {
|
||||
public int updateRetryTaskStatus(RetryTaskUpdateStatusRequestVO requestVO) {
|
||||
|
||||
RetryStatusEnum retryStatusEnum = RetryStatusEnum.getByStatus(retryTaskUpdateStatusRequestVO.getRetryStatus());
|
||||
RetryStatusEnum retryStatusEnum = RetryStatusEnum.getByStatus(requestVO.getRetryStatus());
|
||||
if (Objects.isNull(retryStatusEnum)) {
|
||||
throw new EasyRetryServerException("重试状态错误. [{}]", retryTaskUpdateStatusRequestVO.getRetryStatus());
|
||||
throw new EasyRetryServerException("重试状态错误. [{}]", requestVO.getRetryStatus());
|
||||
}
|
||||
|
||||
String namespaceId = UserSessionUtils.currentUserSession().getNamespaceId();
|
||||
|
||||
TaskAccess<RetryTask> retryTaskAccess = accessTemplate.getRetryTaskAccess();
|
||||
RetryTask retryTask = retryTaskAccess.one(retryTaskUpdateStatusRequestVO.getGroupName(),
|
||||
RetryTask retryTask = retryTaskAccess.one(requestVO.getGroupName(), namespaceId,
|
||||
new LambdaQueryWrapper<RetryTask>()
|
||||
.eq(RetryTask::getNamespaceId, namespaceId)
|
||||
.eq(RetryTask::getId, retryTaskUpdateStatusRequestVO.getId()));
|
||||
.eq(RetryTask::getId, requestVO.getId()));
|
||||
if (Objects.isNull(retryTask)) {
|
||||
throw new EasyRetryServerException("未查询到重试任务");
|
||||
}
|
||||
|
||||
retryTask.setRetryStatus(retryTaskUpdateStatusRequestVO.getRetryStatus());
|
||||
retryTask.setGroupName(retryTaskUpdateStatusRequestVO.getGroupName());
|
||||
retryTask.setRetryStatus(requestVO.getRetryStatus());
|
||||
retryTask.setGroupName(requestVO.getGroupName());
|
||||
|
||||
// 若恢复重试则需要重新计算下次触发时间
|
||||
if (RetryStatusEnum.RUNNING.getStatus().equals(retryStatusEnum.getStatus())) {
|
||||
@ -194,7 +194,7 @@ public class RetryTaskServiceImpl implements RetryTaskService {
|
||||
}
|
||||
|
||||
retryTask.setUpdateDt(LocalDateTime.now());
|
||||
return retryTaskAccess.updateById(retryTaskUpdateStatusRequestVO.getGroupName(), retryTask);
|
||||
return retryTaskAccess.updateById(requestVO.getGroupName(), namespaceId, retryTask);
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -273,7 +273,7 @@ public class RetryTaskServiceImpl implements RetryTaskService {
|
||||
String namespaceId = UserSessionUtils.currentUserSession().getNamespaceId();
|
||||
// 根据重试数据id，更新执行器名称
|
||||
TaskAccess<RetryTask> retryTaskAccess = accessTemplate.getRetryTaskAccess();
|
||||
return retryTaskAccess.update(requestVO.getGroupName(), retryTask,
|
||||
return retryTaskAccess.update(requestVO.getGroupName(), namespaceId, retryTask,
|
||||
new LambdaUpdateWrapper<RetryTask>()
|
||||
.eq(RetryTask::getNamespaceId, namespaceId)
|
||||
.eq(RetryTask::getGroupName, requestVO.getGroupName())
|
||||
@ -284,7 +284,7 @@ public class RetryTaskServiceImpl implements RetryTaskService {
|
||||
public Integer deleteRetryTask(final BatchDeleteRetryTaskVO requestVO) {
|
||||
TaskAccess<RetryTask> retryTaskAccess = accessTemplate.getRetryTaskAccess();
|
||||
String namespaceId = UserSessionUtils.currentUserSession().getNamespaceId();
|
||||
return retryTaskAccess.delete(requestVO.getGroupName(),
|
||||
return retryTaskAccess.delete(requestVO.getGroupName(), namespaceId,
|
||||
new LambdaQueryWrapper<RetryTask>()
|
||||
.eq(RetryTask::getNamespaceId, namespaceId)
|
||||
.eq(RetryTask::getGroupName, requestVO.getGroupName())
|
||||
@ -355,7 +355,8 @@ public class RetryTaskServiceImpl implements RetryTaskService {
|
||||
List<String> uniqueIds = requestVO.getUniqueIds();
|
||||
|
||||
String namespaceId = UserSessionUtils.currentUserSession().getNamespaceId();
|
||||
List<RetryTask> list = accessTemplate.getRetryTaskAccess().list(requestVO.getGroupName(),
|
||||
List<RetryTask> list = accessTemplate.getRetryTaskAccess().list(
|
||||
requestVO.getGroupName(), namespaceId,
|
||||
new LambdaQueryWrapper<RetryTask>()
|
||||
.eq(RetryTask::getNamespaceId, namespaceId)
|
||||
.eq(RetryTask::getTaskType, TaskTypeEnum.RETRY.getType())
|
||||
@ -379,7 +380,7 @@ public class RetryTaskServiceImpl implements RetryTaskService {
|
||||
|
||||
String namespaceId = UserSessionUtils.currentUserSession().getNamespaceId();
|
||||
|
||||
List<RetryTask> list = accessTemplate.getRetryTaskAccess().list(requestVO.getGroupName(),
|
||||
List<RetryTask> list = accessTemplate.getRetryTaskAccess().list(requestVO.getGroupName(), namespaceId,
|
||||
new LambdaQueryWrapper<RetryTask>()
|
||||
.eq(RetryTask::getNamespaceId, namespaceId)
|
||||
.eq(RetryTask::getTaskType, TaskTypeEnum.CALLBACK.getType())
|
||||
|
||||
@ -79,13 +79,19 @@ public class SceneConfigServiceImpl implements SceneConfigService {
|
||||
public Boolean saveSceneConfig(SceneConfigRequestVO requestVO) {
|
||||
|
||||
checkExecuteInterval(requestVO);
|
||||
|
||||
String namespaceId = UserSessionUtils.currentUserSession().getNamespaceId();
|
||||
ConfigAccess<SceneConfig> sceneConfigAccess = accessTemplate.getSceneConfigAccess();
|
||||
Assert.isTrue(0 == sceneConfigAccess.count(
|
||||
new LambdaQueryWrapper<SceneConfig>()
|
||||
.eq(SceneConfig::getNamespaceId, namespaceId)
|
||||
.eq(SceneConfig::getGroupName, requestVO.getGroupName())
|
||||
.eq(SceneConfig::getSceneName, requestVO.getSceneName())
|
||||
|
||||
), () -> new EasyRetryServerException("场景名称重复. {}", requestVO.getSceneName()));
|
||||
|
||||
SceneConfig sceneConfig = SceneConfigConverter.INSTANCE.toSceneConfigRequestVO(requestVO);
|
||||
sceneConfig.setCreateDt(LocalDateTime.now());
|
||||
sceneConfig.setNamespaceId(namespaceId);
|
||||
ConfigAccess<SceneConfig> sceneConfigAccess = accessTemplate.getSceneConfigAccess();
|
||||
Assert.isTrue(1 == sceneConfigAccess.insert(sceneConfig),
|
||||
() -> new EasyRetryServerException("failed to insert scene. sceneConfig:[{}]",
|
||||
JsonUtil.toJsonString(sceneConfig)));
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
:disabled="isEdit"
|
||||
v-decorator="[
|
||||
'uniqueId',
|
||||
{rules: [{ required: false, message: '请输入空间名称', whitespace: true},{required: true, max: 64, message: '最多支持64个字符！'}, {validator: validate, trigger: ['change', 'blur']}]}
|
||||
{rules: [{ required: false, message: '请输入空间名称', whitespace: true},{required: false, max: 64, message: '最多支持64个字符！'}, {validator: validate, trigger: ['change', 'blur']}]}
|
||||
]" />
|
||||
</a-form-item>
|
||||
<a-form-item
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<a-row :gutter="48">
|
||||
<a-col :md="8" :sm="24">
|
||||
<a-form-item label="用户名">
|
||||
<a-input v-model="queryParam.name" placeholder="请输入空间名称" allowClear/>
|
||||
<a-input v-model="queryParam.keyword" placeholder="请输入空间名称/唯一标识" allowClear/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :md="!advanced && 8 || 24" :sm="24">
|
||||
@ -36,12 +36,6 @@
|
||||
<span slot="serial" slot-scope="record">
|
||||
{{ record.id }}
|
||||
</span>
|
||||
<!-- <span slot="groupNameList" slot-scope="text, record">-->
|
||||
<!-- {{ record.role === 2 ? '所有组' : text.toString() }}-->
|
||||
<!-- </span>-->
|
||||
<!-- <span slot="role" slot-scope="text, record">-->
|
||||
<!-- {{ record.role === 2 ? '管理员' : '普通用户' }}-->
|
||||
<!-- </span>-->
|
||||
<span slot="action" slot-scope="text, record">
|
||||
<template>
|
||||
<a @click="handleEdit(record)">编辑</a>
|
||||
|
||||
@ -81,7 +81,7 @@
|
||||
>
|
||||
<a-descriptions :column="8" bordered>
|
||||
<a-descriptions-item :label="item.namespaceName + ' (' + item.namespaceId + ')'" :key="item.namespaceId" :span="8" v-for="item in systemPermissions">
|
||||
<a-tag v-for="item in item.groupNames" :key="item">
|
||||
<a-tag color="#64a6ea" v-for="item in item.groupNames" :key="item">
|
||||
{{ item }}
|
||||
</a-tag>
|
||||
</a-descriptions-item>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user