Commit b458bdbd authored by 余昆's avatar 余昆
Browse files

Merge remote-tracking branch 'upstream/0.6.0' into 0.6.0-yk-refactor-scheduler

parents 6fcd2a13 3566fbbc

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#561 - Milvus server should report exception/error message or terminate on mysql metadata backend error

- \#599 - Build index log is incorrect

- \#602 - Optimizer specify wrong gpu_id

- \#606 - No log generated during building index with CPU



## Feature

- \#12 - Pure CPU version for Milvus
@@ -51,6 +52,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#488 - Add log in scheduler/optimizer

- \#502 - C++ SDK support IVFPQ and SPTAG

- \#560 - Add version in server config file

- \#605 - Print more messages when server start



## Improvement

- \#255 - Add ivfsq8 test report detailed version

ci/jenkins/pod/milvus-cpu-version-build-env-pod.yaml

+2 −2
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ spec: 
    tty: true

    resources:

      limits:

        memory: "32Gi"

        memory: "12Gi"

        cpu: "8.0"

      requests:

        memory: "16Gi"

        memory: "8Gi"

        cpu: "4.0"

  - name: milvus-mysql

    image: mysql:5.6

ci/jenkins/pod/milvus-gpu-version-build-env-pod.yaml

+2 −2
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ spec: 
    tty: true

    resources:

      limits:

        memory: "32Gi"

        memory: "12Gi"

        cpu: "8.0"

        nvidia.com/gpu: 1

      requests:

        memory: "16Gi"

        memory: "8Gi"

        cpu: "4.0"

  - name: milvus-mysql

    image: mysql:5.6

core/src/db/DBImpl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -842,13 +842,13 @@ DBImpl::BackgroundBuildIndex() { 


    if (!to_index_files.empty()) {

        // step 2: put build index task to scheduler

        std::map<scheduler::BuildIndexJobPtr, scheduler::TableFileSchemaPtr> job2file_map;

        std::vector<std::pair<scheduler::BuildIndexJobPtr, scheduler::TableFileSchemaPtr>> job2file_map;

        for (auto& file : to_index_files) {

            scheduler::BuildIndexJobPtr job = std::make_shared<scheduler::BuildIndexJob>(meta_ptr_, options_);

            scheduler::TableFileSchemaPtr file_ptr = std::make_shared<meta::TableFileSchema>(file);

            job->AddToIndexFiles(file_ptr);

            scheduler::JobMgrInst::GetInstance()->Put(job);

            job2file_map.insert(std::make_pair(job, file_ptr));

            job2file_map.push_back(std::make_pair(job, file_ptr));

        }



        for (auto iter = job2file_map.begin(); iter != job2file_map.end(); ++iter) {

core/src/server/Config.cpp

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ Config::ValidateConfig() { 
        return s;

    }



    std::cout << "GPU resources " << (gpu_resource_enable ? "ENABLED !" : "DISABLED !") << std::endl;

    if (gpu_resource_enable) {

        int64_t resource_cache_capacity;

        s = GetGpuResourceConfigCacheCapacity(resource_cache_capacity);