Commit f58dcc08 authored by groot's avatar groot
Browse files

fix config test bug 


Former-commit-id: 06d5bd484cb4d98e0e5a6fc8805b984dc9b742f8
parent eefcf004

core/unittest/server/CMakeLists.txt

+0 −8
Original line number Diff line number Diff line
@@ -67,11 +67,3 @@ target_link_libraries(test_server 
        )



install(TARGETS test_server DESTINATION unittest)
 


configure_file(appendix/server_config.yaml

        "${CMAKE_CURRENT_BINARY_DIR}/milvus/conf/server_config.yaml"

        COPYONLY)



configure_file(appendix/log_config.conf

        "${CMAKE_CURRENT_BINARY_DIR}/milvus/conf/log_config.conf"

        COPYONLY)

core/unittest/server/appendix/log_config.conf

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
* GLOBAL:

    FORMAT                  =   "%datetime | %level | %logger | %msg"

    FILENAME                =   "/tmp/milvus/logs/milvus-%datetime{%y-%M-%d-%H:%m}-global.log"

    ENABLED                 =   true

    TO_FILE                 =   true

    TO_STANDARD_OUTPUT      =   false

    SUBSECOND_PRECISION     =   3

    PERFORMANCE_TRACKING    =   false

    MAX_LOG_FILE_SIZE       =   209715200 ## Throw log files away after 200MB

* DEBUG:

    FILENAME                =   "/tmp/milvus/logs/milvus-%datetime{%y-%M-%d-%H:%m}-debug.log"

    ENABLED                 =   true

* WARNING:

    FILENAME                =   "/tmp/milvus/logs/milvus-%datetime{%y-%M-%d-%H:%m}-warning.log"

* TRACE:

    FILENAME                =   "/tmp/milvus/logs/milvus-%datetime{%y-%M-%d-%H:%m}-trace.log"

* VERBOSE:

    FORMAT                  =   "%datetime{%d/%M/%y} | %level-%vlevel | %msg"

    TO_FILE                 =   false

    TO_STANDARD_OUTPUT      =   false

## Error logs

* ERROR:

    ENABLED                 =   true

    FILENAME                =   "/tmp/milvus/logs/milvus-%datetime{%y-%M-%d-%H:%m}-error.log"

* FATAL:

    ENABLED                 =   true

    FILENAME                =   "/tmp/milvus/logs/milvus-%datetime{%y-%M-%d-%H:%m}-fatal.log"

core/unittest/server/appendix/server_config.yaml

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



server_config:

  address: 0.0.0.0                  # milvus server ip address (IPv4)

  port: 19530                       # port range: 1025 ~ 65534

  deploy_mode: single               # deployment type: single, cluster_readonly, cluster_writable

  time_zone: UTC+8



db_config:

  primary_path: /tmp/milvus    # path used to store data and meta

  secondary_path:                   # path used to store data only, split by semicolon



  backend_url: sqlite://:@:/        # URI format: dialect://username:password@host:port/database

                                    # Keep 'dialect://:@:/', and replace other texts with real values

                                    # Replace 'dialect' with 'mysql' or 'sqlite'



  insert_buffer_size: 4             # GB, maximum insert buffer size allowed

                                    # sum of insert_buffer_size and cpu_cache_capacity cannot exceed total memory



  preload_table:                    # preload data at startup, '*' means load all tables, empty value means no preload

                                    # you can specify preload tables like this: table1,table2,table3



metric_config:

  enable_monitor: false             # enable monitoring or not

  collector: prometheus             # prometheus

  prometheus_config:

    port: 8080                      # port prometheus uses to fetch metrics



cache_config:

  cpu_cache_capacity: 16            # GB, CPU memory used for cache

  cpu_cache_threshold: 0.85         # percentage of data that will be kept when cache cleanup is triggered

  gpu_cache_capacity: 4             # GB, GPU memory used for cache

  gpu_cache_threshold: 0.85         # percentage of data that will be kept when cache cleanup is triggered

  cache_insert_data: false          # whether to load inserted data into cache



engine_config:

  use_blas_threshold: 20            # if nq <  use_blas_threshold, use SSE, faster with fluctuated response times

                                    # if nq >= use_blas_threshold, use OpenBlas, slower with stable response times



resource_config:

  search_resources:                 # define the GPUs used for search computation, valid value: gpux

    - gpu0

  index_build_device: gpu0          # GPU used for building index

core/unittest/server/test_config.cpp

+6 −8
Original line number Diff line number Diff line
@@ -22,28 +22,26 @@ 
#include "utils/CommonUtil.h"

#include "utils/ValidationUtil.h"

#include "server/Config.h"

#include "server/utils.h"



namespace {



static const char *CONFIG_FILE_PATH = "./milvus/conf/server_config.yaml";

static const char *LOG_FILE_PATH = "./milvus/conf/log_config.conf";



static constexpr uint64_t KB = 1024;

static constexpr uint64_t MB = KB * 1024;

static constexpr uint64_t GB = MB * 1024;



} // namespace



TEST(ConfigTest, CONFIG_TEST) {

TEST_F(ConfigTest, CONFIG_TEST) {

    milvus::server::ConfigMgr *config_mgr = milvus::server::YamlConfigMgr::GetInstance();



    milvus::Status s = config_mgr->LoadConfigFile("");

    ASSERT_FALSE(s.ok());



    s = config_mgr->LoadConfigFile(LOG_FILE_PATH);

    s = config_mgr->LoadConfigFile(INVALID_CONFIG_PATH);

    ASSERT_FALSE(s.ok());



    s = config_mgr->LoadConfigFile(CONFIG_FILE_PATH);

    s = config_mgr->LoadConfigFile(VALID_CONFIG_PATH);

    ASSERT_TRUE(s.ok());



    config_mgr->Print();
@@ -99,9 +97,9 @@ TEST(ConfigTest, CONFIG_TEST) { 
    ASSERT_TRUE(seqs.empty());

}



TEST(ConfigTest, SERVER_CONFIG_TEST) {

TEST_F(ConfigTest, SERVER_CONFIG_TEST) {

    milvus::server::Config &config = milvus::server::Config::GetInstance();

    milvus::Status s = config.LoadConfigFile(CONFIG_FILE_PATH);

    milvus::Status s = config.LoadConfigFile(VALID_CONFIG_PATH);

    ASSERT_TRUE(s.ok());



    s = config.ValidateConfig();

core/unittest/server/util_test.cpp→core/unittest/server/test_util.cpp

+5 −0
Original line number Diff line number Diff line
@@ -275,6 +275,11 @@ TEST(ValidationUtilTest, VALIDATE_INDEX_TEST) { 
    ASSERT_EQ(milvus::server::ValidationUtil::ValidateTableIndexType((int)milvus::engine::EngineType::INVALID).code(),

              milvus::SERVER_INVALID_INDEX_TYPE);

    for (int i = 1; i <= (int)milvus::engine::EngineType::MAX_VALUE; i++) {

#ifndef CUSTOMIZATION

        if (i == (int)milvus::engine::EngineType::FAISS_IVFSQ8H) {

            continue;

        }

#endif

        ASSERT_EQ(milvus::server::ValidationUtil::ValidateTableIndexType(i).code(), milvus::SERVER_SUCCESS);

    }

    ASSERT_EQ(milvus::server::ValidationUtil::ValidateTableIndexType(