Commit fd89dff3 authored by lenboo's avatar lenboo
Browse files

refactor ResInfo

parent beaa6c6a

escheduler-api/src/test/java/cn/escheduler/api/utils/ZookeeperMonitorUtilsTest.java

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ public class ZookeeperMonitorUtilsTest { 


        List<MasterServer> workerServerList = zookeeperMonitor.getWorkerServers();



        System.out.println("master:" + masterServerList);

        System.out.println("worker:" + workerServerList);

        Assert.assertEquals(masterServerList.size(), 1);

        Assert.assertEquals(workerServerList.size(), 1);

escheduler-common/src/main/java/cn/escheduler/common/utils/IpUtils.java

+0 −6
Original line number Diff line number Diff line
@@ -61,10 +61,4 @@ public class IpUtils { 
    return sb.toString();

  }







  public static void main(String[] args){

    long ipLong = ipToLong("11.3.4.5");

    logger.info(longToIp(ipLong));

  }

}

escheduler-common/src/test/java/cn/escheduler/common/queue/TaskQueueImplTest.java

+0 −2
Original line number Diff line number Diff line
@@ -20,13 +20,11 @@ import cn.escheduler.common.Constants; 
import cn.escheduler.common.utils.IpUtils;

import cn.escheduler.common.utils.OSUtils;

import org.junit.After;

import org.junit.Assert;

import org.junit.Before;

import org.junit.Test;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;



import java.util.Arrays;

import java.util.List;

import java.util.Random;

escheduler-common/src/test/java/cn/escheduler/common/utils/IpUtilsTest.java

0 → 100644
+41 −0
Original line number Diff line number Diff line 
package cn.escheduler.common.utils;



import org.junit.Assert;

import org.junit.Test;



import static org.junit.Assert.*;



public class IpUtilsTest {



    @Test

    public void ipToLong() {



        String ip = "192.168.110.1";

        String ip2 = "0.0.0.0";

        long longNumber = IpUtils.ipToLong(ip);

        long longNumber2 = IpUtils.ipToLong(ip2);

        System.out.println(longNumber);

        Assert.assertEquals(longNumber, 3232263681L);

        Assert.assertEquals(longNumber2, 0L);



        String ip3 = "255.255.255.255";

        long longNumber3 = IpUtils.ipToLong(ip3);

        System.out.println(longNumber3);

        Assert.assertEquals(longNumber3, 4294967295L);



    }



    @Test

    public void longToIp() {



        String ip = "192.168.110.1";

        String ip2 = "0.0.0.0";

        long longNum = 3232263681L;

        String i1 = IpUtils.longToIp(longNum);



        String i2 = IpUtils.longToIp(0);



        Assert.assertEquals(ip, i1);

        Assert.assertEquals(ip2, i2);

    }

}
 
 No newline at end of file

escheduler-server/src/main/java/cn/escheduler/server/ResInfo.java

+10 −0
Original line number Diff line number Diff line
@@ -102,6 +102,16 @@ public class ResInfo { 
    }





    public static String getHeartBeatInfo(Date now){

        return buildHeartbeatForZKInfo(OSUtils.getHost(),

                OSUtils.getProcessID(),

                OSUtils.cpuUsage(),

                OSUtils.memoryUsage(),

                DateUtils.dateToString(now),

                DateUtils.dateToString(now));



    }



    /**

     * build heartbeat info for zk

     * @param host