From 80db8aaf204e237fd652cd2f7abf98ffd92d9b20 Mon Sep 17 00:00:00 2001 From: yu yunfeng Date: Tue, 28 May 2019 17:50:20 +0800 Subject: [PATCH] Fix compile error Former-commit-id: 07f4dd06011ef519e29744dcd5b8ac9e407b2505 --- cpp/CMakeLists.txt | 5 ++--- cpp/conf/server_config.yaml | 8 ++++++++ cpp/src/CMakeLists.txt | 17 ++++++++++++----- cpp/unittest/CMakeLists.txt | 3 ++- cpp/unittest/db/db_tests.cpp | 6 ------ cpp/unittest/metrics/CMakeLists.txt | 11 +++++++---- 6 files changed, 31 insertions(+), 19 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index e87d8698..3312a128 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -73,14 +73,13 @@ link_directories(${VECWISE_THIRD_PARTY_BUILD}/lib64) # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/third_party) add_subdirectory(src) -#add_subdirectory(test_client) -#add_subdirectory(unittest) -#add_subdirectory(unittest) +add_subdirectory(unittest) if (BUILD_UNIT_TEST) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/unittest) endif(BUILD_UNIT_TEST) + add_custom_target(Clean-All COMMAND ${CMAKE_BUILD_TOOL} clean) #install diff --git a/cpp/conf/server_config.yaml b/cpp/conf/server_config.yaml index fb6f6bea..964a23fd 100644 --- a/cpp/conf/server_config.yaml +++ b/cpp/conf/server_config.yaml @@ -11,6 +11,14 @@ db_config: db_flush_interval: 5 #unit: second idmapper_max_open_file: 128 +metric_config: + is_startup: true # true is on, false is off + collector: prometheus # prometheus, now we only have prometheus + prometheus_config: + collect_type: pull # pull means prometheus pull the message from megasearch, push means megasearch push metric to push gateway + push_gateway_ip_address: 127.0.0.1 + push_gateway_port: 9091 + license_config: license_path: "/tmp/system.license" diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index 0922cbd8..f91944fa 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -13,6 +13,11 @@ aux_source_directory(db db_files) aux_source_directory(wrapper wrapper_files) #aux_source_directory(metrics metrics_files) +set(metrics_files + metrics/Metrics.cpp + metrics/MetricBase.h +) + set(license_check_files license/LicenseLibrary.cpp @@ -22,7 +27,7 @@ set(license_check_files set(license_generator_files license/LicenseGenerator.cpp license/LicenseLibrary.cpp - ../unittest/metrics/counter_test.cpp ../unittest/metrics/metrics_test.cpp) + ) set(service_files thrift/gen-cpp/MegasearchService.cpp @@ -35,8 +40,8 @@ set(vecwise_engine_files ${cache_files} ${db_files} ${wrapper_files} - metrics/Metrics.cpp -# ${metrics_files} +# metrics/Metrics.cpp + ${metrics_files} ) set(get_sys_info_files @@ -97,6 +102,8 @@ endif () cuda_add_library(vecwise_engine STATIC ${vecwise_engine_files}) target_link_libraries(vecwise_engine ${engine_libs}) +add_library(metrics STATIC ${metrics_files}) + if (ENABLE_LICENSE STREQUAL "ON") add_library(vecwise_license STATIC ${license_check_files}) target_link_libraries(vecwise_license ${license_libs}) @@ -108,7 +115,7 @@ endif () # libprometheus-cpp-core.a # ) -#add_library(metrics STATIC ${metrics_files} metrics/MetricBase.h) +#add_library(vecwise_engine STATIC ${metrics_files} ) #target_link_libraries(metrics ${metrics_lib}) add_executable(vecwise_server @@ -116,7 +123,7 @@ add_executable(vecwise_server ${server_files} ${utils_files} ${service_files} -# ${metrics_files} + ${metrics_files} ${VECWISE_THIRD_PARTY_BUILD}/include/easylogging++.cc ) diff --git a/cpp/unittest/CMakeLists.txt b/cpp/unittest/CMakeLists.txt index 4968f4de..652fd492 100644 --- a/cpp/unittest/CMakeLists.txt +++ b/cpp/unittest/CMakeLists.txt @@ -15,7 +15,8 @@ set(unittest_libs yaml-cpp gtest_main gmock_main - pthread) + pthread + metrics) add_subdirectory(server) add_subdirectory(db) diff --git a/cpp/unittest/db/db_tests.cpp b/cpp/unittest/db/db_tests.cpp index e42a7261..07faac53 100644 --- a/cpp/unittest/db/db_tests.cpp +++ b/cpp/unittest/db/db_tests.cpp @@ -9,12 +9,8 @@ #include "utils.h" #include "db/DB.h" -<<<<<<< HEAD -#include "metrics/Metrics.h" -======= #include "db/DBImpl.h" #include "db/MetaConsts.h" ->>>>>>> main/branch-1.2 using namespace zilliz::vecwise; @@ -113,8 +109,6 @@ TEST_F(DBTest2, ARHIVE_DISK_CHECK) { TEST_F(DBTest, DB_TEST) { - server::Metrics::GetInstance().Init(); - server::Metrics::GetInstance().exposer_ptr()->RegisterCollectable(server::Metrics::GetInstance().registry_ptr()); static const std::string group_name = "test_group"; static const int group_dim = 256; diff --git a/cpp/unittest/metrics/CMakeLists.txt b/cpp/unittest/metrics/CMakeLists.txt index 89650823..25fed966 100644 --- a/cpp/unittest/metrics/CMakeLists.txt +++ b/cpp/unittest/metrics/CMakeLists.txt @@ -16,18 +16,21 @@ aux_source_directory(../../src/db db_srcs) aux_source_directory(../../src/config config_files) aux_source_directory(../../src/cache cache_srcs) aux_source_directory(../../src/wrapper wrapper_src) -#aux_source_directory(../../src/metrics metrics_files) + include_directories(/usr/include) include_directories(../../third_party/build/include) link_directories(../../third_party/build/lib) include_directories(/usr/local/cuda/include) link_directories("/usr/local/cuda/lib64") -include_directories(../db/utils.h) +#include_directories(../db/utils.h) +include_directories(../../src/metrics) set(require_files ../../src/metrics/Metrics.cpp + +# ../../src/cache/CacheMgr.cpp # ../../src/metrics/PrometheusMetrics.cpp ../../src/server/ServerConfig.cpp ../../src/utils/CommonUtil.cpp @@ -39,7 +42,6 @@ set(count_test_src # ${unittest_srcs} # ${config_files} # ${require_files} - metrics_test.cpp ${unittest_srcs} ${config_files} ${cache_srcs} @@ -48,7 +50,8 @@ set(count_test_src ${require_files} metrics_test.cpp ../db/utils.cpp - ../../src/metrics/Metrics.cpp) + ../../src/metrics/Metrics.h + ) add_executable(metrics_test ${count_test_src} ${require_files} ) -- GitLab