Commit 795e69bb authored by JinHai-CN's avatar JinHai-CN
Browse files

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


Former-commit-id: 7c140fb85e3d8b9993772968a011be9ade0ebeea
parents 56b786dc 078fea91

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#122 - Add unique id for Job

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

- \#149 - Improve large query optimizer pass

- \#156 - Not return error when search_resources and index_build_device set cpu



## Task

core/src/server/Config.cpp

+9 −3
Original line number Diff line number Diff line
@@ -714,9 +714,12 @@ Config::CheckResourceConfigSearchResources(const std::vector<std::string>& value 
        return Status(SERVER_INVALID_ARGUMENT, msg);

    }



    for (auto& gpu_device : value) {

        if (!CheckGpuDevice(gpu_device).ok()) {

            std::string msg = "Invalid search resource: " + gpu_device +

    for (auto& device : value) {

        if (device == "cpu") {

            continue;

        }

        if (!CheckGpuDevice(device).ok()) {

            std::string msg = "Invalid search resource: " + device +

                              ". Possible reason: resource_config.search_resources does not match your hardware.";

            return Status(SERVER_INVALID_ARGUMENT, msg);

        }
@@ -726,6 +729,9 @@ Config::CheckResourceConfigSearchResources(const std::vector<std::string>& value 


Status

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

    if (value == "cpu") {

        return Status::OK();

    }

    if (!CheckGpuDevice(value).ok()) {

        std::string msg = "Invalid index build device: " + value +

                          ". Possible reason: resource_config.index_build_device does not match your hardware.";