Commit d1c5e539 authored by jinhai's avatar jinhai
Browse files

Merge branch '0.5.1' into '0.5.1' 

0.5.1

See merge request megasearch/milvus!801

Former-commit-id: 23debbabd6c2041c941a04eb0a683239bc044da1
parents 4a22689e ee273d98

CHANGELOG.md

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



## Bug



## Feature

- \#90 - The server start error messages could be improved to enhance user experience

- \#104 - test_scheduler core dump

- \#115 - Using new structure for tasktable

- \#139 - New config opion use_gpu_threshold



## Improvement

- \#64 - Improvement dump function in scheduler
@@ -16,9 +20,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#96 - Remove .a file in milvus/lib for docker-version

- \#118 - Using shared_ptr instead of weak_ptr to avoid performance loss

- \#122 - Add unique id for Job



## Feature

- \#115 - Using new structure for tasktable

- \#130 - Set task state MOVED after resource copy it completed



## Task

core/conf/server_config.template

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ cache_config: 
engine_config:

  use_blas_threshold: 20            # if nq <  use_blas_threshold, use SSE, faster with fluctuated response times

                                    # if nq >= use_blas_threshold, use OpenBlas, slower with stable response times

  use_gpu_threshold: 1000



resource_config:

  search_resources:                 # define the GPUs used for search computation, must be in format: gpux

core/src/scheduler/JobMgr.cpp

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ JobMgr::worker_function() { 
        // disk resources NEVER be empty.

        if (auto disk = res_mgr_->GetDiskResources()[0].lock()) {

            for (auto& task : tasks) {

                disk->task_table().Put(task);

                disk->task_table().Put(task, nullptr);

            }

        }

    }

core/src/scheduler/Scheduler.cpp

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ Scheduler::OnLoadCompleted(const EventPtr& event) { 
            if (resource->HasExecutor() == false) {

                load_completed_event->task_table_item_->Move();

            }

            Action::PushTaskToAllNeighbour(load_completed_event->task_table_item_->task, resource);

            Action::PushTaskToAllNeighbour(load_completed_event->task_table_item_, resource);

            break;

        }

        default: { break; }

core/src/scheduler/TaskTable.cpp

+2 −17
Original line number Diff line number Diff line
@@ -264,8 +264,8 @@ TaskTable::PickToExecute(uint64_t limit) { 
}



void

TaskTable::Put(TaskPtr task) {

    auto item = std::make_shared<TaskTableItem>();

TaskTable::Put(TaskPtr task, TaskTableItemPtr from) {

    auto item = std::make_shared<TaskTableItem>(std::move(from));

    item->id = id_++;

    item->task = std::move(task);

    item->state = TaskTableItemState::START;
@@ -276,21 +276,6 @@ TaskTable::Put(TaskPtr task) { 
    }

}



void

TaskTable::Put(std::vector<TaskPtr>& tasks) {

    for (auto& task : tasks) {

        auto item = std::make_shared<TaskTableItem>();

        item->id = id_++;

        item->task = std::move(task);

        item->state = TaskTableItemState::START;

        item->timestamp.start = get_current_timestamp();

        table_.put(std::move(item));

    }

    if (subscriber_) {

        subscriber_();

    }

}



size_t

TaskTable::TaskToExecute() {

    size_t count = 0;