Worker Group display #2627 (#2630) (bb52671f) · Commits · SUMMER2020 / students / proj-2002251

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/WorkerGroupController.java

+0 −51

Original line number	Diff line number	Diff line
		@@ -52,35 +52,7 @@ public class WorkerGroupController extends BaseController {
		WorkerGroupService workerGroupService;


		/**
		* create or update a worker group
		*
		* @param loginUser login user
		* @param id worker group id
		* @param name worker group name
		* @param ipList ip list
		* @return create or update result code
		*/
		@ApiOperation(value = "saveWorkerGroup", notes = "CREATE_WORKER_GROUP_NOTES")
		@ApiImplicitParams({
		@ApiImplicitParam(name = "id", value = "WORKER_GROUP_ID", dataType = "Int", example = "10", defaultValue = "0"),
		@ApiImplicitParam(name = "name", value = "WORKER_GROUP_NAME", required = true, dataType = "String"),
		@ApiImplicitParam(name = "ipList", value = "WORKER_IP_LIST", required = true, dataType = "String")
		})
		@PostMapping(value = "/save")
		@ResponseStatus(HttpStatus.OK)
		@ApiException(SAVE_ERROR)
		public Result saveWorkerGroup(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
		@RequestParam(value = "id", required = false, defaultValue = "0") int id,
		@RequestParam(value = "name") String name,
		@RequestParam(value = "ipList") String ipList
		) {
		logger.info("save worker group: login user {}, id:{}, name: {}, ipList: {} ",
		loginUser.getUserName(), id, name, ipList);

		Map<String, Object> result = workerGroupService.saveWorkerGroup(loginUser, id, name, ipList);
		return returnDataList(result);
		}

		/**
		* query worker groups paging
		@@ -132,28 +104,5 @@ public class WorkerGroupController extends BaseController {
		return returnDataList(result);
		}

		/**
		* delete worker group by id
		*
		* @param loginUser login user
		* @param id group id
		* @return delete result code
		*/
		@ApiOperation(value = "deleteById", notes = "DELETE_WORKER_GROUP_BY_ID_NOTES")
		@ApiImplicitParams({
		@ApiImplicitParam(name = "id", value = "WORKER_GROUP_ID", required = true, dataType = "Int", example = "10"),

		})
		@GetMapping(value = "/delete-by-id")
		@ResponseStatus(HttpStatus.OK)
		@ApiException(DELETE_WORKER_GROUP_FAIL)
		public Result deleteById(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
		@RequestParam("id") Integer id
		) {
		logger.info("delete worker group: login user {}, id:{} ",
		loginUser.getUserName(), id);

		Map<String, Object> result = workerGroupService.deleteWorkerGroupById(id);
		return returnDataList(result);
		}
		}

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java

+20 −23

Original line number	Diff line number	Diff line
		@@ -96,9 +96,6 @@ public class ProcessDefinitionService extends BaseDAGService {
		@Autowired
		private ProcessService processService;

		@Autowired
		private WorkerGroupMapper workerGroupMapper;

		/**
		* create process definition
		*

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -91,8 +91,7 @@ public class ProcessInstanceService extends BaseDAGService {
		@Autowired
		LoggerService loggerService;

		@Autowired
		WorkerGroupMapper workerGroupMapper;


		@Autowired
		UsersService usersService;

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java

+65 −108

Original line number	Diff line number	Diff line
		@@ -16,24 +16,24 @@
		*/
		package org.apache.dolphinscheduler.api.service;

		import com.baomidou.mybatisplus.core.metadata.IPage;
		import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
		import org.apache.dolphinscheduler.api.enums.Status;
		import org.apache.dolphinscheduler.api.utils.PageInfo;
		import org.apache.dolphinscheduler.common.Constants;
		import org.apache.dolphinscheduler.common.utils.CollectionUtils;
		import org.apache.dolphinscheduler.common.utils.DateUtils;
		import org.apache.dolphinscheduler.common.utils.StringUtils;
		import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
		import org.apache.dolphinscheduler.dao.entity.AccessToken;
		import org.apache.dolphinscheduler.dao.entity.User;
		import org.apache.dolphinscheduler.dao.entity.WorkerGroup;
		import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper;
		import org.apache.dolphinscheduler.dao.mapper.WorkerGroupMapper;
		import com.baomidou.mybatisplus.core.metadata.IPage;
		import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
		import org.apache.dolphinscheduler.service.zk.ZookeeperCachedOperator;
		import org.springframework.beans.factory.annotation.Autowired;
		import org.springframework.stereotype.Service;
		import org.springframework.transaction.annotation.Transactional;

		import java.util.*;
		import java.util.stream.Collectors;

		/**
		* work group service
		@@ -42,162 +42,119 @@ import java.util.*;
		public class WorkerGroupService extends BaseService {


		@Autowired
		WorkerGroupMapper workerGroupMapper;

		@Autowired
		ProcessInstanceMapper processInstanceMapper;

		@Autowired
		protected ZookeeperCachedOperator zookeeperCachedOperator;



		/**
		* create or update a worker group
		* query worker group paging
		*
		* @param loginUser login user
		* @param id worker group id
		* @param name worker group name
		* @param ipList ip list
		* @return create or update result code
		* @param pageNo page number
		* @param searchVal search value
		* @param pageSize page size
		* @return worker group list page
		*/
		public Map<String, Object> saveWorkerGroup(User loginUser,int id, String name, String ipList){
		public Map<String,Object> queryAllGroupPaging(User loginUser, Integer pageNo, Integer pageSize, String searchVal) {

		Map<String, Object> result = new HashMap<>(5);
		// list from index
		Integer fromIndex = (pageNo - 1) * pageSize;
		// list to index
		Integer toIndex = (pageNo - 1) * pageSize + pageSize;

		//only admin can operate
		Map<String, Object> result = new HashMap<>(5);
		if (checkAdmin(loginUser, result)) {
		return result;
		}

		if(StringUtils.isEmpty(name)){
		putMsg(result, Status.NAME_NULL);
		return result;
		}
		Date now = new Date();
		WorkerGroup workerGroup = null;
		if(id != 0){
		workerGroup = workerGroupMapper.selectById(id);
		//check exist
		if (workerGroup == null){
		workerGroup = new WorkerGroup();
		workerGroup.setCreateTime(now);
		}
		}else{
		workerGroup = new WorkerGroup();
		workerGroup.setCreateTime(now);
		}
		workerGroup.setName(name);
		workerGroup.setIpList(ipList);
		workerGroup.setUpdateTime(now);
		List<WorkerGroup> workerGroups = getWorkerGroups(true);

		if(checkWorkerGroupNameExists(workerGroup)){
		putMsg(result, Status.NAME_EXIST, workerGroup.getName());
		return result;
		}
		if(workerGroup.getId() != 0 ){
		workerGroupMapper.updateById(workerGroup);
		}else{
		workerGroupMapper.insert(workerGroup);
		}
		putMsg(result, Status.SUCCESS);
		return result;
		}

		/**
		* check worker group name exists
		* @param workerGroup
		* @return
		*/
		private boolean checkWorkerGroupNameExists(WorkerGroup workerGroup) {
		List<WorkerGroup> resultDataList = new ArrayList<>();

		List<WorkerGroup> workerGroupList = workerGroupMapper.queryWorkerGroupByName(workerGroup.getName());
		if (CollectionUtils.isNotEmpty(workerGroups)){
		List<WorkerGroup> searchValDataList = new ArrayList<>();

		if(CollectionUtils.isNotEmpty(workerGroupList)){
		// new group has same name..
		if(workerGroup.getId() == 0){
		return true;
		if (StringUtils.isNotEmpty(searchVal)){
		for (WorkerGroup workerGroup : workerGroups){
		if (workerGroup.getName().contains(searchVal)){
		searchValDataList.add(workerGroup);
		}
		// update group...
		for(WorkerGroup group : workerGroupList){
		if(group.getId() != workerGroup.getId()){
		return true;
		}
		}else {
		searchValDataList = workerGroups;
		}
		}
		return false;
		}

		/**
		* query worker group paging
		*
		* @param loginUser login user
		* @param pageNo page number
		* @param searchVal search value
		* @param pageSize page size
		* @return worker group list page
		*/
		public Map<String,Object> queryAllGroupPaging(User loginUser, Integer pageNo, Integer pageSize, String searchVal) {

		Map<String, Object> result = new HashMap<>(5);
		if (checkAdmin(loginUser, result)) {
		return result;
		if (searchValDataList.size() < pageSize){
		toIndex = (pageNo - 1) * pageSize + searchValDataList.size();
		}
		resultDataList = searchValDataList.subList(fromIndex, toIndex);
		}

		Page<WorkerGroup> page = new Page(pageNo, pageSize);
		IPage<WorkerGroup> workerGroupIPage = workerGroupMapper.queryListPaging(
		page, searchVal);
		PageInfo<WorkerGroup> pageInfo = new PageInfo<>(pageNo, pageSize);
		pageInfo.setTotalCount((int)workerGroupIPage.getTotal());
		pageInfo.setLists(workerGroupIPage.getRecords());
		pageInfo.setTotalCount(resultDataList.size());
		pageInfo.setLists(resultDataList);

		result.put(Constants.DATA_LIST, pageInfo);
		putMsg(result, Status.SUCCESS);
		return result;
		}



		/**
		* delete worker group by id
		* @param id worker group id
		* @return delete result code
		* query all worker group
		*
		* @return all worker group list
		*/
		@Transactional(rollbackFor = Exception.class)
		public Map<String,Object> deleteWorkerGroupById(Integer id) {
		public Map<String,Object> queryAllGroup() {
		Map<String, Object> result = new HashMap<>();

		Map<String, Object> result = new HashMap<>(5);
		List<WorkerGroup> workerGroups = getWorkerGroups(false);

		List<ProcessInstance> processInstances = processInstanceMapper.queryByWorkerGroupIdAndStatus(id, Constants.NOT_TERMINATED_STATES);
		if(CollectionUtils.isNotEmpty(processInstances)){
		putMsg(result, Status.DELETE_WORKER_GROUP_BY_ID_FAIL, processInstances.size());
		return result;
		}
		workerGroupMapper.deleteById(id);
		processInstanceMapper.updateProcessInstanceByWorkerGroupId(id, Constants.DEFAULT_WORKER_ID);
		Set<String> availableWorkerGroupSet = workerGroups.stream()
		.map(workerGroup -> workerGroup.getName())
		.collect(Collectors.toSet());
		result.put(Constants.DATA_LIST, availableWorkerGroupSet);
		putMsg(result, Status.SUCCESS);
		return result;
		}


		/**
		* query all worker group
		* get worker groups
		*
		* @return all worker group list
		* @param isPaging whether paging
		* @return WorkerGroup list
		*/
		public Map<String,Object> queryAllGroup() {
		Map<String, Object> result = new HashMap<>();
		private List<WorkerGroup> getWorkerGroups(boolean isPaging) {
		String workerPath = zookeeperCachedOperator.getZookeeperConfig().getDsRoot()+"/nodes" +"/worker";
		List<String> workerGroupList = zookeeperCachedOperator.getChildrenKeys(workerPath);

		// available workerGroup list
		List<String> availableWorkerGroupList = new ArrayList<>();

		List<WorkerGroup> workerGroups = new ArrayList<>();

		for (String workerGroup : workerGroupList){
		String workerGroupPath= workerPath + "/" + workerGroup;
		List<String> childrenNodes = zookeeperCachedOperator.getChildrenKeys(workerGroupPath);
		if (CollectionUtils.isNotEmpty(childrenNodes)){
		availableWorkerGroupList.add(workerGroup);
		WorkerGroup wg = new WorkerGroup();
		wg.setName(workerGroup);
		if (isPaging){
		wg.setIpList(childrenNodes);
		String registeredIpValue = zookeeperCachedOperator.get(workerGroupPath + "/" + childrenNodes.get(0));
		wg.setCreateTime(DateUtils.stringToDate(registeredIpValue.split(",")[3]));
		wg.setUpdateTime(DateUtils.stringToDate(registeredIpValue.split(",")[4]));
		}
		workerGroups.add(wg);
		}

		result.put(Constants.DATA_LIST, availableWorkerGroupList);
		putMsg(result, Status.SUCCESS);
		return result;
		}
		return workerGroups;
		}
		}

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java

+56 −89

File changed.

Preview size limit exceeded, changes collapsed.