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

add online validate for policy ops

Browse source
This commit is contained in:
vfqq樊琪琦 2017-01-24 15:09:58 +08:00
parent b1d8c8c6a7
commit 9d4dc719d2
3 changed files with 67 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,12 @@ import com.ctrip.zeus.service.build.BuildService;
import com.ctrip.zeus.service.commit.CommitService;
import com.ctrip.zeus.service.commit.util.CommitType;
import com.ctrip.zeus.service.model.*;
import com.ctrip.zeus.service.model.handler.GroupValidator;
import com.ctrip.zeus.service.model.handler.SlbValidator;
import com.ctrip.zeus.service.model.handler.TrafficPolicyValidator;
import com.ctrip.zeus.service.model.handler.VirtualServerValidator;
import com.ctrip.zeus.service.nginx.NginxService;
import com.ctrip.zeus.service.query.SlbCriteriaQuery;
import com.ctrip.zeus.service.status.StatusOffset;
import com.ctrip.zeus.service.status.StatusService;
import com.ctrip.zeus.service.task.TaskService;
@ -56,6 +61,16 @@ public class TaskExecutorImpl implements TaskExecutor {
@Resource
private NginxService nginxService;
@Resource
private SlbCriteriaQuery slbCriteriaQuery;
@Resource
private SlbValidator slbModelValidator;
@Resource
private GroupValidator groupValidator;
@Resource
private TrafficPolicyValidator trafficPolicyValidator;
@Resource
private VirtualServerValidator virtualServerValidator;
@Resource
private ConfVersionService confVersionService;
@Resource
private CommitService commitService;
@ -236,6 +251,10 @@ public class TaskExecutorImpl implements TaskExecutor {
return;
}
//4. validate
validateModels(nxOnlineSlb, buildingVsIds, nxOnlineGroups, nxOnlineTpes,
nxOnlineVses, groupReferrerOfBuildingVs, policyReferrerOfBuildingVs);
//5.2 push config to all slb servers. reload if needed.
//5.2.1 remove deactivate vs ids from need build vses
Set<Long> cleanVsIds = new HashSet<>();
@ -287,6 +306,51 @@ public class TaskExecutorImpl implements TaskExecutor {
}
private void validateModels(Slb nxOnlineSlb, Set<Long> buildingVsIds, Map<Long, Group> nxOnlineGroups,
Map<Long, TrafficPolicy> nxOnlineTpes, Map<Long, VirtualServer> nxOnlineVses,
Map<Long, List<Group>> groupReferrerOfBuildingVs,
Map<Long, List<TrafficPolicy>> policyReferrerOfBuildingVs) throws Exception {
if (activateSlbOps.size() > 0) {
Set<Long> slbIds = slbCriteriaQuery.queryAll();
ModelStatusMapping<Slb> slbMap = entityFactory.getSlbsByIds(slbIds.toArray(new Long[slbIds.size()]));
Map<Long, Slb> map = slbMap.getOnlineMapping();
map.put(nxOnlineSlb.getId(), nxOnlineSlb);
try {
slbModelValidator.validateForMerge(new Long[]{nxOnlineSlb.getId()}, map);
} catch (Exception e) {
setTaskFail(activateSlbOps.get(nxOnlineSlb.getId()), "Invalidate version for online. SlbId:" + nxOnlineSlb.getId() + ";cause:" + e.getMessage());
logger.error("Invalidate version for online. SlbId:" + nxOnlineSlb.getId() + ";cause:" + e.getMessage(), e);
}
}
if (buildingVsIds.size() > 0) {
for (Long vsId : buildingVsIds) {
List<Group> groups = groupReferrerOfBuildingVs.get(vsId);
List<TrafficPolicy> policies = policyReferrerOfBuildingVs.get(vsId);
if (groups != null && groups.size() > 0) {
Long[] tmp = new Long[groups.size()];
for (int i = 0; i < groups.size(); i++) {
tmp[i] = groups.get(i).getId();
}
groupValidator.validateForMerge(tmp, vsId, nxOnlineGroups, nxOnlineTpes, false);
}
if (policies != null && policies.size() > 0) {
Long[] tmp = new Long[policies.size()];
for (int i = 0; i < policies.size(); i++) {
tmp[i] = policies.get(i).getId();
}
trafficPolicyValidator.validateForMerge(tmp, vsId, nxOnlineGroups, nxOnlineTpes, false);
}
}
}
if (activateVsOps.size() > 0) {
Set<Long> vsIds = new HashSet<>();
for (OpsTask t : activateVsOps.values()) {
vsIds.add(t.getSlbVirtualServerId());
}
virtualServerValidator.validateForMerge(vsIds.toArray(new Long[vsIds.size()]), nxOnlineSlb.getId(), nxOnlineVses);
}
}
private ModelStatusMapping<Slb> mapSlbVersionAndRevise(Long slbId, Collection<OpsTask> activateSlbTask) throws Exception {
ModelStatusMapping<Slb> slbMap = entityFactory.getSlbsByIds(new Long[]{slbId});
Slb offlineSlb = slbMap.getOfflineMapping().get(slbId);
@ -332,7 +396,7 @@ public class TaskExecutorImpl implements TaskExecutor {
}
private ModelStatusMapping<TrafficPolicy> mapPolicyVersionAndRevise(Set<Long> vsIds, Collection<OpsTask> activatePolicyTask) throws Exception {
ModelStatusMapping<TrafficPolicy> tpMap = entityFactory.getTrafficPolicies(vsIds.toArray(new Long[vsIds.size()]));
ModelStatusMapping<TrafficPolicy> tpMap = entityFactory.getPoliciesByVsIds(vsIds.toArray(new Long[vsIds.size()]));
Map<Long, TrafficPolicy> offlineGroups = tpMap.getOfflineMapping();
List<IdVersion> revisedVersion = new ArrayList<>();
for (OpsTask task : activatePolicyTask) {

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

@ -373,7 +373,7 @@ public class ActivateResource {
if (policyId == null || policyId <= 0) {
throw new ValidationException("Invalidate Parameter policy.");
}
ModelStatusMapping<TrafficPolicy> trafficPolicyMap = entityFactory.getTrafficPolicies(new Long[]{policyId});
ModelStatusMapping<TrafficPolicy> trafficPolicyMap = entityFactory.getPoliciesByIds(new Long[]{policyId});
if (trafficPolicyMap.getOfflineMapping().size() == 0) {
throw new ValidationException("Not Found Policy By Id. Policy Id:" + policyId);
}

2
src/main/java/com/ctrip/zeus/restful/resource/DeactivateResource.java
View file

@ -363,7 +363,7 @@ public class DeactivateResource {
@Authorize(name = "deactivate")
public Response deactivatePolicy(@Context HttpServletRequest request, @Context HttpHeaders hh, @QueryParam("policyId") List<Long> policyIds) throws Exception {
ModelStatusMapping<TrafficPolicy> tpMap = entityFactory.getTrafficPolicies(policyIds.toArray(new Long[]{}));
ModelStatusMapping<TrafficPolicy> tpMap = entityFactory.getPoliciesByIds(policyIds.toArray(new Long[]{}));
if (!tpMap.getOnlineMapping().keySet().containsAll(policyIds)) {
throw new ValidationException("Have inactivated policy in " + Joiner.on(",").join(policyIds));