Unverified Commit 0f6f138d authored by JinyLeeChina's avatar JinyLeeChina Committed by GitHub
Browse files

[BugFixed] issue #3258 (#3265) 



* 'ExecutionStatus'

* '3258'

* Update WorkerGroupServiceTest.java

* Delete UserState.java

* Delete ResourceSyncService.java

* Delete core-site.xml

* Delete hdfs-site.xml

Co-authored-by: default avatardailidong <dailidong66@gmail.com>
Co-authored-by: default avatarqiaozhanwei <qiaozhanwei@outlook.com>
parent ed7ac40b

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

+2 −5
Original line number Diff line number Diff line
@@ -16,15 +16,12 @@ 
 */

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.AccessToken;

import org.apache.dolphinscheduler.dao.entity.User;

import org.apache.dolphinscheduler.dao.entity.WorkerGroup;

import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper;
@@ -149,8 +146,8 @@ public class WorkerGroupService extends BaseService { 
                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]));

                    wg.setCreateTime(DateUtils.stringToDate(registeredIpValue.split(",")[6]));

                    wg.setUpdateTime(DateUtils.stringToDate(registeredIpValue.split(",")[7]));

                }

                workerGroups.add(wg);

            }

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

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ public class WorkerGroupServiceTest { 


        Mockito.when(zookeeperCachedOperator.getChildrenKeys(workerPath + "/default")).thenReturn(defaultIpList);



        Mockito.when(zookeeperCachedOperator.get(workerPath + "/default" + "/" + defaultIpList.get(0))).thenReturn("0.02,0.23,0.03,2020-05-08 11:24:14,2020-05-08 14:22:24");

        Mockito.when(zookeeperCachedOperator.get(workerPath + "/default" + "/" + defaultIpList.get(0))).thenReturn("0.01,0.17,0.03,25.83,8.0,1.0,2020-07-21 11:17:59,2020-07-21 14:39:20,0,13238");

    }



    /**