ctripcorp/zeus
1
1
Fork 0
mirror of https://github.com/ctripcorp/zeus.git synced 2024-09-21 08:06:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

update activate slb

Browse source
This commit is contained in:
fanqq 2015-12-11 17:57:11 +08:00
parent 8c08aa07e4
commit a1afa92ac4
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/com/ctrip/zeus/restful/resource/ActivateResource.java
View file

@ -114,17 +114,20 @@ public class ActivateResource {
tasks.add(task); tasks.add(task);
Set<Long> vsIds = virtualServerCriteriaQuery.queryBySlbId(id); Set<Long> vsIds = virtualServerCriteriaQuery.queryBySlbId(id);
for (Long vsId : vsIds){ Map<Long,VirtualServer> activatedVses = activateService.getActivatedVirtualServerBySlb(id);
task = new OpsTask(); List<Archive> list = archiveService.getLastestVsArchives(vsIds.toArray(new Long[]{}));
task.setSlbVirtualServerId(vsId); for (Archive a : list){
task.setOpsType(TaskOpsType.ACTIVATE_VS); if (activatedVses.containsKey(a.getId()) && !activatedVses.get(a.getId()).getVersion().equals(a.getVersion())
task.setTargetSlbId(id); || !activatedVses.containsKey(a.getId())){
archive = archiveService.getLatestVsArchive(vsId); task = new OpsTask();
task.setVersion(archive.getVersion()); task.setSlbVirtualServerId(a.getId());
task.setCreateTime(new Date()); task.setOpsType(TaskOpsType.ACTIVATE_VS);
tasks.add(task); task.setTargetSlbId(id);
task.setVersion(a.getVersion());
task.setCreateTime(new Date());
tasks.add(task);
}
} }
} }
List<Long> taskIds = taskManager.addTask(tasks); List<Long> taskIds = taskManager.addTask(tasks);