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

remove pre-check for softDeactivateGroupOps

Browse source
This commit is contained in:
fanqq 2016-04-25 11:14:11 +08:00
parent 5076319b76
commit ba372da746
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/com/ctrip/zeus/executor/impl/TaskExecutorImpl.java
View file

@ -162,11 +162,6 @@ public class TaskExecutorImpl implements TaskExecutor {
//1.4 offline data check
List<IdVersion> toFetch = new ArrayList<>();
for (OpsTask task : activateGroupOps.values()) {
if (softDeactivateGroupOps.containsKey(task.getGroupId())) {
setTaskFail(task, "Activating Group while soft deactivating group ,groupId[" + task.getGroupId() + "]");
activateGroupOps.remove(task.getGroupId());
continue;
}
if (!offlineGroups.get(task.getGroupId()).getVersion().equals(task.getVersion())) {
toFetch.add(new IdVersion(task.getId(), task.getVersion()));
}
@ -199,11 +194,6 @@ public class TaskExecutorImpl implements TaskExecutor {
for (Long gid : activateGroupOps.keySet()) {
onlineGroups.put(gid, offlineGroups.get(gid));
}
for (Long gid : softDeactivateGroupOps.keySet()) {
if (onlineGroups.containsKey(gid)) {
onlineGroups.remove(gid);
}
}
//2.2 merge on/offline vses
for (Long sid : activateVsOps.keySet()) {
onlineVses.put(sid, offlineVses.get(sid));
@ -273,9 +263,14 @@ public class TaskExecutorImpl implements TaskExecutor {
groupList = new ArrayList<>();
vsGroups.put(gvs.getVirtualServer().getId(), groupList);
}
if (!deactivateGroupOps.containsKey(gid)) {
groupList.add(group);
if (deactivateGroupOps.containsKey(gid)) {
continue;
}
if (softDeactivateGroupOps.containsKey(group.getId())
&& gvs.getVirtualServer().getId().equals(softDeactivateGroupOps.get(group.getId()).getSlbVirtualServerId())) {
continue;
}
groupList.add(group);
vsGroupPriority.put("VS" + gvs.getVirtualServer().getId() + "_" + gid, gvs.getPriority());
hasRelatedVs = true;
}