Unverified Commit 551be85d authored by BossZou's avatar BossZou Committed by GitHub
Browse files

Improve ut coverage (#2516) (#2517) 



* Improve ut coverage (#2516)

Signed-off-by: default avataryhz <413554850@qq.com>

* Improve ut coverage

Signed-off-by: default avataryhz <413554850@qq.com>

* CI retry

Signed-off-by: default avataryhz <413554850@qq.com>

* Update helm config

Signed-off-by: default avatarJinHai-CN <hai.jin@zilliz.com>

* CI retry

Signed-off-by: default avatarYhz <yinghao.zou@zilliz.com>

* CI retry

Signed-off-by: default avatarYhz <yinghao.zou@zilliz.com>

Co-authored-by: default avatarJinHai-CN <hai.jin@zilliz.com>
parent 0543c594

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Please mark all change in change log and use the issue from GitHub 
-   \#2466 optimize k-selection implemention of faiss gpu version

-   \#2489 Add exception throw on mysql meta error

-   \#2495 Add creating lock file failure reason.

-   \#2516 Improve unit test coverage



## Task

ci/jenkins/Jenkinsfile

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ pipeline { 
        LOWER_BUILD_TYPE = params.BUILD_TYPE.toLowerCase()

        SEMVER = "${BRANCH_NAME.contains('/') ? BRANCH_NAME.substring(BRANCH_NAME.lastIndexOf('/') + 1) : BRANCH_NAME}"

        PIPELINE_NAME = "milvus-ci"

        HELM_BRANCH = "0.10.0"

        HELM_BRANCH = "master"

    }



    stages {

core/src/server/delivery/hybrid_request/HybridSearchRequest.cpp

+5 −4
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ HybridSearchRequest::Create(const std::shared_ptr<milvus::server::Context>& cont 
Status

HybridSearchRequest::OnExecute() {

    try {

        fiu_do_on("SearchRequest.OnExecute.throw_std_exception", throw std::exception());

        fiu_do_on("HybridSearchRequest.OnExecute.throw_std_exception", throw std::exception());

        std::string hdr = "SearchRequest(table=" + collection_name_;



        TimeRecorder rc(hdr);
@@ -71,7 +71,8 @@ HybridSearchRequest::OnExecute() { 
        engine::meta::hybrid::FieldsSchema fields_schema;

        collection_schema.collection_id_ = collection_name_;

        status = DBWrapper::DB()->DescribeHybridCollection(collection_schema, fields_schema);

        fiu_do_on("SearchRequest.OnExecute.describe_table_fail", status = Status(milvus::SERVER_UNEXPECTED_ERROR, ""));

        fiu_do_on("HybridSearchRequest.OnExecute.describe_table_fail",

                  status = Status(milvus::SERVER_UNEXPECTED_ERROR, ""));

        if (!status.ok()) {

            if (status.code() == DB_NOT_FOUND) {

                return Status(SERVER_COLLECTION_NOT_EXIST, CollectionNotExistMsg(collection_name_));
@@ -102,11 +103,11 @@ HybridSearchRequest::OnExecute() { 
        ProfilerStop();

#endif



        fiu_do_on("SearchRequest.OnExecute.query_fail", status = Status(milvus::SERVER_UNEXPECTED_ERROR, ""));

        fiu_do_on("HybridSearchRequest.OnExecute.query_fail", status = Status(milvus::SERVER_UNEXPECTED_ERROR, ""));

        if (!status.ok()) {

            return status;

        }

        fiu_do_on("SearchRequest.OnExecute.empty_result_ids", result_ids.clear());

        fiu_do_on("HybridSearchRequest.OnExecute.empty_result_ids", result_ids.clear());

        if (result_ids.empty()) {

            return Status::OK();  // empty table

        }

core/src/server/delivery/request/ReLoadSegmentsRequest.cpp

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 


#include "server/delivery/request/ReLoadSegmentsRequest.h"



#include <fiu-local.h>



#include "config/Config.h"

#include "server/DBWrapper.h"

#include "utils/TimeRecorder.h"
@@ -41,6 +43,7 @@ ReLoadSegmentsRequest::OnExecute() { 
        return status;

    }



    fiu_do_on("ReLoadSegmentsRequest.OnExecute.readonly", deploy_mode = "cluster_readonly");

    if (deploy_mode == "single" || deploy_mode == "cluster_writable") {

        // TODO: No need to reload segment files

        return Status(SERVER_SUCCESS, "");

core/src/server/init/InstanceLockCheck.cpp

+8 −2
Original line number Diff line number Diff line
@@ -10,13 +10,16 @@ 
// or implied. See the License for the specific language governing permissions and limitations under the License.



#include "server/init/InstanceLockCheck.h"

#include "utils/Log.h"



#include <errno.h>

#include <fcntl.h>

#include <string.h>

#include <unistd.h>



#include <fiu-local.h>



#include "utils/Log.h"



namespace milvus {

namespace server {
@@ -24,6 +27,7 @@ Status 
InstanceLockCheck::Check(const std::string& path) {

    std::string lock_path = path + "/lock";

    auto fd = open(lock_path.c_str(), O_RDWR | O_CREAT | O_NOFOLLOW, 0640);

    fiu_do_on("InstanceLockCheck.Check.fd", fd = -1);

    if (fd < 0) {

        std::string msg;

        if (errno == EROFS) {
@@ -41,7 +45,9 @@ InstanceLockCheck::Check(const std::string& path) { 
    fl.l_whence = SEEK_SET;

    fl.l_start = 0;

    fl.l_len = 0;

    if (fcntl(fd, F_SETLK, &fl) == -1) {

    auto fcl = fcntl(fd, F_SETLK, &fl);

    fiu_do_on("InstanceLockCheck.Check.fcntl", fcl = -1);

    if (fcl == -1) {

        std::string msg = "Can't lock file: " + lock_path + ", due to ";

        if (errno == EACCES || errno == EAGAIN) {

            msg += "permission denied. ";