Commit e884fdb0 authored by jinhai's avatar jinhai
Browse files

Merge branch 'branch-0.5.0' into 'branch-0.5.0' 

MS-609 Update task construct function

See merge request megasearch/milvus!658

Former-commit-id: 14844a8366e8e51d9f78b69d0ac03d8d7ba1fdf2
parents 6f79d411 9168a322

cpp/CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-574 - Milvus configuration refactor

- MS-578 - Make sure milvus5.0 don't crack 0.3.1 data

- MS-585 - Update namespace in scheduler

- MS-608 - Update TODO names

- MS-609 - Update task construct function



## New Feature

cpp/src/scheduler/ResourceMgr.cpp

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ ResourceMgr::Connect(const std::string& name1, const std::string& name2, Connect 
    auto res2 = GetResource(name2);

    if (res1 && res2) {

        res1->AddNeighbour(std::static_pointer_cast<Node>(res2), connection);

        // TODO(wxy): enable when task balance supported

        // TODO(wxyu): enable when task balance supported

        //        res2->AddNeighbour(std::static_pointer_cast<Node>(res1), connection);

        return true;

    }

cpp/src/scheduler/ResourceMgr.h

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ class ResourceMgr { 
        return disk_resources_;

    }



    // TODO(wxy): why return shared pointer

    // TODO(wxyu): why return shared pointer

    inline std::vector<ResourcePtr>

    GetAllResources() {

        return resources_;
@@ -89,7 +89,7 @@ class ResourceMgr { 
    GetNumGpuResource() const;



 public:

    // TODO(wxy): add stats interface(low)

    // TODO(wxyu): add stats interface(low)



 public:

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

cpp/src/scheduler/SchedInst.cpp

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ load_advance_config() { 
    //        }

    //    } catch (const char *msg) {

    //        SERVER_LOG_ERROR << msg;

    //        // TODO(wxy): throw exception instead

    //        // TODO(wxyu): throw exception instead

    //        exit(-1);

    ////        throw std::exception();

    //    }

cpp/src/scheduler/Scheduler.cpp

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ Scheduler::Process(const EventPtr& event) { 
    process_event(event);

}



// TODO(wxy): refactor the function

// TODO(wxyu): refactor the function

void

Scheduler::OnLoadCompleted(const EventPtr& event) {

    auto load_completed_event = std::static_pointer_cast<LoadCompletedEvent>(event);