Skip to content

谢明辉 / fanxing3

Go to a project
Commit 2b39aaf6 by xmh
Options

<fix> 任务处理添加分布式锁,防止互相干扰

1 parent 3778ad59
Inline Side-by-side
Showing 4 changed files with 33 additions and 2 deletions
fanxing-task/src/main/java/com/viontech/fanxing/task/repository/TaskDataRedisRepository.java
package com.viontech.fanxing.task.repository; package com.viontech.fanxing.task.repository;
import com.viontech.fanxing.commons.constant.RedisKeys; import com.viontech.fanxing.commons.constant.RedisKeys;
import com.viontech.fanxing.task.model.TaskData;
import com.viontech.fanxing.commons.service.RedisService; import com.viontech.fanxing.commons.service.RedisService;
import com.viontech.fanxing.task.model.TaskData;
import org.redisson.api.RLock;
import org.redisson.api.RMap; import org.redisson.api.RMap;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
...@@ -37,4 +38,8 @@ public class TaskDataRedisRepository { ...@@ -37,4 +38,8 @@ public class TaskDataRedisRepository {
return taskDataRMap.remove(unid); return taskDataRMap.remove(unid);
} }
public RLock getTaskLock(String unid) {
return redisService.getLockMust("lock:task:" + unid);
}
} }
fanxing-task/src/main/java/com/viontech/fanxing/task/runner/TaskRunner.java
...@@ -54,6 +54,8 @@ public class TaskRunner { ...@@ -54,6 +54,8 @@ public class TaskRunner {
Collection<String> entryCollection = set.valueRange(0, true, System.currentTimeMillis(), true); Collection<String> entryCollection = set.valueRange(0, true, System.currentTimeMillis(), true);
for (String taskUnid : entryCollection) { for (String taskUnid : entryCollection) {
RLock taskLock = taskDataService.getRepository().getTaskLock(taskUnid);
try {
TaskData taskData = taskDataService.getRepository().getTaskDataByUnid(taskUnid); TaskData taskData = taskDataService.getRepository().getTaskDataByUnid(taskUnid);
if (taskData == null) { if (taskData == null) {
log.info("找不到对应任务,移除所有:{}", taskUnid); log.info("找不到对应任务,移除所有:{}", taskUnid);
...@@ -113,7 +115,9 @@ public class TaskRunner { ...@@ -113,7 +115,9 @@ public class TaskRunner {
taskService.updateStatus(task.getId(), TaskStatus.RUNNING.val); taskService.updateStatus(task.getId(), TaskStatus.RUNNING.val);
// 移除任务 // 移除任务
set.remove(taskUnid); set.remove(taskUnid);
} finally {
taskLock.forceUnlock();
}
} }
} catch (Exception e) { } catch (Exception e) {
log.error("", e); log.error("", e);
......
fanxing-task/src/main/java/com/viontech/fanxing/task/service/VAServerService.java
...@@ -3,6 +3,7 @@ package com.viontech.fanxing.task.service; ...@@ -3,6 +3,7 @@ package com.viontech.fanxing.task.service;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.viontech.fanxing.commons.config.VionConfig; import com.viontech.fanxing.commons.config.VionConfig;
import com.viontech.fanxing.commons.constant.RedisKeys; import com.viontech.fanxing.commons.constant.RedisKeys;
import com.viontech.fanxing.commons.constant.TaskStatus;
import com.viontech.fanxing.commons.exception.FanXingException; import com.viontech.fanxing.commons.exception.FanXingException;
import com.viontech.fanxing.commons.model.Task; import com.viontech.fanxing.commons.model.Task;
import com.viontech.fanxing.commons.service.RedisService; import com.viontech.fanxing.commons.service.RedisService;
...@@ -177,6 +178,9 @@ public class VAServerService { ...@@ -177,6 +178,9 @@ public class VAServerService {
if (taskData == null) { if (taskData == null) {
throw new FanXingException("找不到对应的任务"); throw new FanXingException("找不到对应的任务");
} }
if (!TaskStatus.RUNNING.valEqual(taskData.getTask().getStatus())) {
throw new FanXingException("任务不在运行状态");
}
VaServerInfo vaServerInfo = taskDataService.taskRunOn(taskUnid); VaServerInfo vaServerInfo = taskDataService.taskRunOn(taskUnid);
if (vaServerInfo != null) { if (vaServerInfo != null) {
if (vaServerInfo.getStatus() == 0) { if (vaServerInfo.getStatus() == 0) {
......
fanxing-task/src/main/java/com/viontech/fanxing/task/service/impl/TaskServiceImpl.java
...@@ -26,6 +26,7 @@ import com.viontech.fanxing.task.service.VAServerService; ...@@ -26,6 +26,7 @@ import com.viontech.fanxing.task.service.VAServerService;
import com.viontech.fanxing.task.service.adapter.TaskService; import com.viontech.fanxing.task.service.adapter.TaskService;
import com.viontech.fanxing.task.utils.SceneUtils; import com.viontech.fanxing.task.utils.SceneUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.redisson.api.RLock;
import org.redisson.api.RMap; import org.redisson.api.RMap;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -179,8 +180,13 @@ public class TaskServiceImpl extends BaseServiceImpl<Task> implements TaskServic ...@@ -179,8 +180,13 @@ public class TaskServiceImpl extends BaseServiceImpl<Task> implements TaskServic
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void removeTask(Long id) { public void removeTask(Long id) {
Task task = selectByPrimaryKey(id); Task task = selectByPrimaryKey(id);
RLock taskLock = taskDataService.getRepository().getTaskLock(task.getUnid());
try {
taskDataService.deleteTask(task.getUnid()); taskDataService.deleteTask(task.getUnid());
deleteByPrimaryKey(id); deleteByPrimaryKey(id);
} finally {
taskLock.forceUnlock();
}
} }
/** /**
...@@ -208,9 +214,16 @@ public class TaskServiceImpl extends BaseServiceImpl<Task> implements TaskServic ...@@ -208,9 +214,16 @@ public class TaskServiceImpl extends BaseServiceImpl<Task> implements TaskServic
if (task.getStoreConfigId() == null) { if (task.getStoreConfigId() == null) {
throw new IllegalArgumentException("存储配置为空,无法执行"); throw new IllegalArgumentException("存储配置为空,无法执行");
} }
RLock taskLock = taskDataService.getRepository().getTaskLock(task.getUnid());
try {
updateStatus(id, TaskStatus.PAUSE.val); updateStatus(id, TaskStatus.PAUSE.val);
taskDataService.addTask(task); taskDataService.addTask(task);
opsClientService.addLog("启动任务:" + task.getName()); opsClientService.addLog("启动任务:" + task.getName());
} finally {
taskLock.forceUnlock();
}
} }
/** /**
...@@ -220,9 +233,14 @@ public class TaskServiceImpl extends BaseServiceImpl<Task> implements TaskServic ...@@ -220,9 +233,14 @@ public class TaskServiceImpl extends BaseServiceImpl<Task> implements TaskServic
@Override @Override
public void stopTask(Long id) { public void stopTask(Long id) {
Task task = selectByPrimaryKey(id); Task task = selectByPrimaryKey(id);
RLock taskLock = taskDataService.getRepository().getTaskLock(task.getUnid());
try {
taskDataService.deleteTask(task.getUnid()); taskDataService.deleteTask(task.getUnid());
updateStatus(id, TaskStatus.PAUSE.val); updateStatus(id, TaskStatus.PAUSE.val);
opsClientService.addLog("停止任务:" + task.getName()); opsClientService.addLog("停止任务:" + task.getName());
} finally {
taskLock.forceUnlock();
}
} }
@Override @Override
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!