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

update op resources

Browse source
This commit is contained in:
fanqq 2015-11-30 16:13:37 +08:00
parent 3235ef4771
commit 4a5b8f255c
4 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -322,7 +322,7 @@ public class GroupResource {
failedIds.add(group.getId());
}
}
if (groupIds.size() == 0)
if (failedIds.size() == 0)
return responseHandler.handle("Successfully synced all group statuses.", hh.getMediaType());
else
return responseHandler.handle("Error occurs when syncing group statuses on id " + Joiner.on(',').join(groupIds) + ".", hh.getMediaType());

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

@ -7,6 +7,7 @@ import com.ctrip.zeus.exceptions.ValidationException;
import com.ctrip.zeus.executor.TaskManager;
import com.ctrip.zeus.model.entity.*;
import com.ctrip.zeus.restful.message.ResponseHandler;
import com.ctrip.zeus.service.activate.ActivateService;
import com.ctrip.zeus.service.activate.ActiveConfService;
import com.ctrip.zeus.service.model.GroupRepository;
import com.ctrip.zeus.service.model.SlbRepository;
@ -37,10 +38,7 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.*;
/**
* @author:xingchaowang
@ -76,6 +74,8 @@ public class OperationResource {
private CertificateService certificateService;
@Resource
private CertificateInstaller certificateInstaller;
@Resource
private ActivateService activateService;
@GET
@ -94,14 +94,19 @@ public class OperationResource {
private Response serverOps(HttpHeaders hh, String serverip, boolean up) throws Exception {
//get slb by serverip
List<Slb> slblist = slbRepository.listByGroupServer(serverip);
AssertUtils.assertNotNull(slblist, "[UpServer/DownServer] Can not find slb by server ip :[" + serverip + "],Please check the configuration and server ip!");
Set<Long> groupIds = statusService.findGroupIdByIp(serverip);
Set<Long> slbIds = activeConfService.getSlbIdsByGroupIds(groupIds.toArray(new Long[]{}));
Set<Long> slbIdsOffLine = slbCriteriaQuery.queryByGroups(groupIds.toArray(new Long[]{}));
slbIds.addAll(slbIdsOffLine);
if (slbIds == null || slbIds.size() == 0 ){
throw new ValidationException("Not found Server Ip.");
}
List<OpsTask> tasks = new ArrayList<>();
for (Slb slb : slblist) {
for (Long slbId : slbIds) {
OpsTask task = new OpsTask();
task.setIpList(serverip);
task.setOpsType(TaskOpsType.SERVER_OPS);
task.setTargetSlbId(slb.getId());
task.setTargetSlbId(slbId);
task.setUp(up);
tasks.add(task);
}
@ -119,7 +124,7 @@ public class OperationResource {
throw new Exception(failCause);
}
ServerStatus ss = new ServerStatus().setIp(serverip).setUp(statusService.getServerStatus(serverip));
List<Group> groupList = groupRepository.listGroupsByGroupServer(serverip);
List<Group> groupList = groupRepository.list(groupIds.toArray(new Long[]{}));
if (groupList != null) {
for (Group group : groupList) {

1
src/main/java/com/ctrip/zeus/service/activate/ActiveConfService.java
View file

@ -11,6 +11,7 @@ import java.util.Set;
public interface ActiveConfService extends Repository {
public Set<Long> getSlbIdsByGroupId(Long groupId)throws Exception;
public Set<Long> getSlbIdsByGroupIds(Long[] groupId)throws Exception;
public Set<Long> getGroupIdsBySlbId(Long slbId) throws Exception;
public Set<Long> getVsIdsBySlbId(Long slbId) throws Exception;
}

15
src/main/java/com/ctrip/zeus/service/activate/impl/ActiveConfServiceImpl.java
View file

@ -43,6 +43,21 @@ public class ActiveConfServiceImpl implements ActiveConfService {
return slbIds;
}
@Override
public Set<Long> getSlbIdsByGroupIds(Long[] groupId) throws Exception {
Set<Long> slbIds = new HashSet<>();
List<ConfGroupActiveDo> groupActiveDos = confGroupActiveDao.findAllByGroupIds(groupId,ConfGroupActiveEntity.READSET_FULL);
List<Long> vsIds = new ArrayList<>();
for (ConfGroupActiveDo c : groupActiveDos){
vsIds.add(c.getSlbVirtualServerId());
}
List<ConfSlbVirtualServerActiveDo> vsActiveDos = confSlbVirtualServerActiveDao.findBySlbVirtualServerIds(vsIds.toArray(new Long[]{}),ConfSlbVirtualServerActiveEntity.READSET_FULL);
for (ConfSlbVirtualServerActiveDo c : vsActiveDos){
slbIds.add(c.getSlbId());
}
return slbIds;
}
@Override
public Set<Long> getGroupIdsBySlbId(Long slbId) throws Exception {
Set<Long> groupIds = new HashSet<>();
List<ConfSlbVirtualServerActiveDo> vsActiveDos = confSlbVirtualServerActiveDao.findBySlbId(slbId,ConfSlbVirtualServerActiveEntity.READSET_FULL);