Commit d6253571 authored by milvus-ci-robot's avatar milvus-ci-robot
Browse files

Merge remote-tracking branch 'upstream/0.5.1' into 0.5.1 


Former-commit-id: 4a802e77d84616518cd55898b11b272889704063
parents 536f9406 37f8d2fd

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ Please mark all change in change log and use the ticket from JIRA. 
# Milvus 0.5.1 (TODO)



## Bug

- \#104 - test_scheduler core dump



## Improvement

- \#64 - Improvement dump function in scheduler

- \#80 - Print version information into log during server start

core/src/scheduler/JobMgr.cpp

+9 −0
Original line number Diff line number Diff line
@@ -49,6 +49,15 @@ JobMgr::Stop() { 
    }

}



json

JobMgr::Dump() const {

    json ret{

        {"running", running_},

        {"event_queue_length", queue_.size()},

    };

    return ret;

}



void

JobMgr::Put(const JobPtr& job) {

    {

core/src/scheduler/JobMgr.h

+5 −1
Original line number Diff line number Diff line
@@ -28,13 +28,14 @@ 
#include <vector>



#include "ResourceMgr.h"

#include "interface/interfaces.h"

#include "job/Job.h"

#include "task/Task.h"



namespace milvus {

namespace scheduler {



class JobMgr {

class JobMgr : public interface::dumpable {

 public:

    explicit JobMgr(ResourceMgrPtr res_mgr);
@@ -44,6 +45,9 @@ class JobMgr { 
    void

    Stop();



    json

    Dump() const override;



 public:

    void

    Put(const JobPtr& job);

core/src/scheduler/ResourceMgr.cpp

+15 −11
Original line number Diff line number Diff line
@@ -170,16 +170,20 @@ ResourceMgr::GetNumGpuResource() const { 
    return num;

}



std::string

ResourceMgr::Dump() {

    std::stringstream ss;

    ss << "ResourceMgr contains " << resources_.size() << " resources." << std::endl;



json

ResourceMgr::Dump() const {

    json resources{};

    for (auto& res : resources_) {

        ss << res->Dump();

    }



    return ss.str();

        resources.push_back(res->Dump());

    }

    json ret{

        {"number_of_resource", resources_.size()},

        {"number_of_disk_resource", disk_resources_.size()},

        {"number_of_cpu_resource", cpu_resources_.size()},

        {"number_of_gpu_resource", gpu_resources_.size()},

        {"resources", resources},

    };

    return ret;

}



std::string
@@ -187,9 +191,9 @@ ResourceMgr::DumpTaskTables() { 
    std::stringstream ss;

    ss << ">>>>>>>>>>>>>>>ResourceMgr::DumpTaskTable<<<<<<<<<<<<<<<" << std::endl;

    for (auto& resource : resources_) {

        ss << resource->Dump() << std::endl;

        ss << resource->task_table().Dump();

        ss << resource->Dump() << std::endl << std::endl;

        ss << resource->name() << std::endl;

        ss << resource->task_table().Dump().dump();

        ss << resource->name() << std::endl << std::endl;

    }

    return ss.str();

}

core/src/scheduler/ResourceMgr.h

+4 −3
Original line number Diff line number Diff line
@@ -25,13 +25,14 @@ 
#include <utility>

#include <vector>



#include "interface/interfaces.h"

#include "resource/Resource.h"

#include "utils/Log.h"



namespace milvus {

namespace scheduler {



class ResourceMgr {

class ResourceMgr : public interface::dumpable {

 public:

    ResourceMgr() = default;
@@ -103,8 +104,8 @@ class ResourceMgr { 


 public:

    /******** Utility Functions ********/

    std::string

    Dump();

    json

    Dump() const override;



    std::string

    DumpTaskTables();