Commit 1b6d90a5 authored by 余昆's avatar 余昆
Browse files

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

parents 4b8a72f9 7d0a3ae0

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#440 - Server cannot startup with gpu_resource_config.enable=false in GPU version

- \#458 - Index data is not compatible between 0.5 and 0.6

- \#465 - Server hang caused by searching with nsg index

- \#485 - Increase code coverage rate

- \#486 - gpu no usage during index building

- \#497 - CPU-version search performance decreased

- \#504 - The code coverage rate of core/src/scheduler/optimizer is too low
@@ -49,6 +50,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#420 - Update shards merge part to match v0.5.3

- \#488 - Add log in scheduler/optimizer

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

- \#560 - Add version in server config file



## Improvement

- \#255 - Add ivfsq8 test report detailed version

core/conf/server_cpu_config.template

+2 −0
Original line number Diff line number Diff line 
# Default values are used when you make no changes to the following parameters.



version: 0.1                        # config version



server_config:

  address: 0.0.0.0                  # milvus server ip address (IPv4)

  port: 19530                       # milvus server port, must in range [1025, 65534]

core/conf/server_gpu_config.template

+2 −0
Original line number Diff line number Diff line 
# Default values are used when you make no changes to the following parameters.



version: 0.1                        # config version



server_config:

  address: 0.0.0.0                  # milvus server ip address (IPv4)

  port: 19530                       # milvus server port, must in range [1025, 65534]

core/src/db/engine/ExecutionEngineImpl.cpp

+2 −0
Original line number Diff line number Diff line
@@ -112,10 +112,12 @@ ExecutionEngineImpl::CreatetVecIndex(EngineType type) { 
            index = GetVecIndexFactory(IndexType::NSG_MIX);

            break;

        }

#ifdef CUSTOMIZATION

        case EngineType::FAISS_IVFSQ8H: {

            index = GetVecIndexFactory(IndexType::FAISS_IVFSQ8_HYBRID);

            break;

        }

#endif

        case EngineType::FAISS_PQ: {

#ifdef MILVUS_CPU_VERSION

            index = GetVecIndexFactory(IndexType::FAISS_IVFPQ_CPU);

core/src/server/Config.cpp

+32 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <iostream>

#include <regex>

#include <string>

#include <unordered_map>

#include <vector>



#include "config/YamlConfigMgr.h"
@@ -33,6 +34,8 @@ namespace server { 


constexpr uint64_t GB = 1UL << 30;



static const std::unordered_map<std::string, std::string> milvus_config_version_map({{"0.6.0", "0.1"}});



Config&

Config::GetInstance() {

    static Config config_inst;
@@ -69,6 +72,12 @@ Status 
Config::ValidateConfig() {

    Status s;



    std::string config_version;

    s = GetConfigVersion(config_version);

    if (!s.ok()) {

        return s;

    }



    /* server config */

    std::string server_addr;

    s = GetServerConfigAddress(server_addr);
@@ -383,6 +392,16 @@ Config::PrintAll() { 
}



////////////////////////////////////////////////////////////////////////////////

Status

Config::CheckConfigVersion(const std::string& value) {

    if (milvus_config_version_map.at(MILVUS_VERSION) != value) {

        std::string msg = "Invalid config version: " + value +

                          ". Expected config version: " + milvus_config_version_map.at(MILVUS_VERSION);

        return Status(SERVER_INVALID_ARGUMENT, msg);

    }

    return Status::OK();

}



Status

Config::CheckServerConfigAddress(const std::string& value) {

    if (!ValidationUtil::ValidateIpAddress(value).ok()) {
@@ -766,10 +785,14 @@ Config::CheckGpuResourceConfigBuildIndexResources(const std::vector<std::string> 


////////////////////////////////////////////////////////////////////////////////

ConfigNode&

Config::GetConfigNode(const std::string& name) {

Config::GetConfigRoot() {

    ConfigMgr* mgr = YamlConfigMgr::GetInstance();

    ConfigNode& root_node = mgr->GetRootNode();

    return root_node.GetChild(name);

    return mgr->GetRootNode();

}



ConfigNode&

Config::GetConfigNode(const std::string& name) {

    return GetConfigRoot().GetChild(name);

}



Status
@@ -816,6 +839,12 @@ Config::GetConfigSequenceStr(const std::string& parent_key, const std::string& c 
    return value;

}



Status

Config::GetConfigVersion(std::string& value) {

    value = GetConfigRoot().GetValue(CONFIG_VERSION);

    return CheckConfigVersion(value);

}



Status

Config::GetServerConfigAddress(std::string& value) {

    value = GetConfigStr(CONFIG_SERVER, CONFIG_SERVER_ADDRESS, CONFIG_SERVER_ADDRESS_DEFAULT);