Unverified Commit 8f127498 authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #1498 from cydrain/caiyd_add_version_check 

#1463 enable config version check
parents d9add5fb f6b4ed33

core/src/server/Config.cpp

+1 −1
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ Config::CheckConfigVersion(const std::string& value) { 
            std::string msg = "Invalid config version: " + value +

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

            SERVER_LOG_ERROR << msg;

            // return Status(SERVER_INVALID_ARGUMENT, msg);

            return Status(SERVER_INVALID_ARGUMENT, msg);

        }

    }

    return Status::OK();

core/unittest/server/test_config.cpp

+4 −4
Original line number Diff line number Diff line
@@ -685,10 +685,10 @@ TEST_F(ConfigTest, SERVER_CONFIG_VALID_FAIL_TEST) { 
    milvus::Status s = config.LoadConfigFile(config_path + VALID_CONFIG_FILE);

    ASSERT_TRUE(s.ok());



    // fiu_enable("check_config_version_fail", 1, NULL, 0);

    // s = config.ValidateConfig();

    // ASSERT_FALSE(s.ok());

    // fiu_disable("check_config_version_fail");

    fiu_enable("check_config_version_fail", 1, NULL, 0);

    s = config.ValidateConfig();

    ASSERT_FALSE(s.ok());

    fiu_disable("check_config_version_fail");



    /* server config */

    fiu_enable("check_config_address_fail", 1, NULL, 0);