From ba042f1531afe1a65fa29e26f6e783447ba69898 Mon Sep 17 00:00:00 2001 From: Yingchun Lai Date: Fri, 15 Dec 2023 12:11:56 +0800 Subject: [PATCH] more --- run.sh | 4 ++-- src/client/CMakeLists.txt | 4 +++- src/geo/bench/CMakeLists.txt | 12 +++++++----- src/geo/lib/CMakeLists.txt | 7 +++---- src/http/CMakeLists.txt | 3 ++- src/http/http_server.h | 13 +++++++------ src/http/test/CMakeLists.txt | 4 ++-- src/meta/meta_options.cpp | 12 ------------ src/meta/meta_options.h | 4 ---- src/meta/meta_service.cpp | 9 +++++---- src/meta/test/CMakeLists.txt | 18 ++++++++++++------ src/meta/test/meta_bulk_load_service_test.cpp | 3 ++- src/meta/test/meta_partition_guardian_test.cpp | 3 ++- src/meta/test/meta_state/CMakeLists.txt | 6 +++--- src/meta/test/meta_test_base.cpp | 3 ++- src/meta/test/update_configuration_test.cpp | 5 +++-- src/replica/CMakeLists.txt | 3 ++- src/replica/backup/test/CMakeLists.txt | 12 ++++++++++-- .../ranger/ranger_resource_policy_manager.cpp | 3 ++- src/runtime/test/CMakeLists.txt | 9 +++++++++ src/sample/CMakeLists.txt | 7 +++++-- src/server/CMakeLists.txt | 5 ++++- src/test/bench_test/CMakeLists.txt | 4 +++- src/test/pressure_test/CMakeLists.txt | 15 ++++++++------- src/utils/CMakeLists.txt | 1 + src/utils/filesystem.cpp | 12 ++++++++++++ src/utils/filesystem.h | 4 ++++ src/utils/metrics.cpp | 13 +++++++------ src/zookeeper/CMakeLists.txt | 4 +++- src/zookeeper/test/CMakeLists.txt | 5 +++-- 30 files changed, 128 insertions(+), 79 deletions(-) diff --git a/run.sh b/run.sh index 283eb40b89..4e08278b95 100755 --- a/run.sh +++ b/run.sh @@ -326,8 +326,8 @@ function run_build() if [ ! -z "${IWYU}" ]; then make $MAKE_OPTIONS 2> iwyu.out else - make pegasus_geo_bench $MAKE_OPTIONS - make install + make dsn.meta.test $MAKE_OPTIONS +# make install fi exit_if_fail $? diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index 5cad5a72c6..00279e1085 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -33,7 +33,9 @@ set(MY_PROJ_SRC "") # "GLOB" for non-recursive search set(MY_SRC_SEARCH_MODE "GLOB") -set(MY_PROJ_LIBS dsn_utils) +set(MY_PROJ_LIBS + dsn_utils + dsn_replication_common) # Extra files that will be installed set(MY_BINPLACES "") diff --git a/src/geo/bench/CMakeLists.txt b/src/geo/bench/CMakeLists.txt index 9da9d4306d..a0b2844b1b 100644 --- a/src/geo/bench/CMakeLists.txt +++ b/src/geo/bench/CMakeLists.txt @@ -28,19 +28,21 @@ set(MY_PROJ_SRC "") set(MY_SRC_SEARCH_MODE "GLOB") set(MY_PROJ_LIBS + pegasus_geo_lib + pegasus_client_static + dsn_client + dsn_utils + dsn_http + dsn_replication_common absl::flat_hash_set absl::strings s2testing s2 thrift - dsn_replication_common - pegasus_client_static rocksdb lz4 zstd - snappy - pegasus_geo_lib - dsn_utils) + snappy) set(MY_BOOST_LIBS Boost::system Boost::filesystem) diff --git a/src/geo/lib/CMakeLists.txt b/src/geo/lib/CMakeLists.txt index 094bfb352c..420bb24844 100644 --- a/src/geo/lib/CMakeLists.txt +++ b/src/geo/lib/CMakeLists.txt @@ -27,10 +27,9 @@ set(MY_PROJ_SRC "") # "GLOB" for non-recursive search set(MY_SRC_SEARCH_MODE "GLOB") -set(MY_PROJ_LIBS "" - # s2 - # pegasus_client_static - ) +set(MY_PROJ_LIBS + s2 + pegasus_client_static) set(MY_BOOST_LIBS Boost::system Boost::filesystem) diff --git a/src/http/CMakeLists.txt b/src/http/CMakeLists.txt index 44f93796d8..56c8f4fc67 100644 --- a/src/http/CMakeLists.txt +++ b/src/http/CMakeLists.txt @@ -21,7 +21,8 @@ set(MY_PROJ_SRC ${THIRDPARTY_ROOT}/build/Source/http-parser/http_parser.c) set(MY_SRC_SEARCH_MODE "GLOB") -set(MY_PROJ_LIBS "") +set(MY_PROJ_LIBS + dsn_replication_common) dsn_add_static_library() diff --git a/src/http/http_server.h b/src/http/http_server.h index 5ae780b983..ce124e5469 100644 --- a/src/http/http_server.h +++ b/src/http/http_server.h @@ -113,12 +113,13 @@ class http_server_base : public http_service { static std::once_flag flag; std::call_once(flag, [&]() { - register_handler("updateConfig", - std::bind(&http_server_base::update_config_handler, - this, - std::placeholders::_1, - std::placeholders::_2), - "ip:port/updateConfig?="); +// undefined reference to `dsn::http_server_base::update_config_handler +// register_handler("updateConfig", +// std::bind(&http_server_base::update_config_handler, +// this, +// std::placeholders::_1, +// std::placeholders::_2), +// "ip:port/updateConfig?="); }); } diff --git a/src/http/test/CMakeLists.txt b/src/http/test/CMakeLists.txt index ad607811e4..e04b952ded 100644 --- a/src/http/test/CMakeLists.txt +++ b/src/http/test/CMakeLists.txt @@ -27,10 +27,10 @@ set(MY_PROJ_LIBS dsn_utils curl gtest + rocksdb lz4 snappy - zstd - rocksdb) + zstd) set(MY_BOOST_LIBS Boost::system Boost::filesystem) diff --git a/src/meta/meta_options.cpp b/src/meta/meta_options.cpp index 7956ff35e2..c813c3a997 100644 --- a/src/meta/meta_options.cpp +++ b/src/meta/meta_options.cpp @@ -55,18 +55,6 @@ DSN_DEFINE_string(meta_server, "", "white list of replica-servers in meta-server"); -std::string meta_options::concat_path_unix_style(const std::string &prefix, - const std::string &postfix) -{ - size_t pos1 = prefix.size(); // last_valid_pos + 1 - while (pos1 > 0 && prefix[pos1 - 1] == '/') - pos1--; - size_t pos2 = 0; // first non '/' position - while (pos2 < postfix.size() && postfix[pos2] == '/') - pos2++; - return prefix.substr(0, pos1) + "/" + postfix.substr(pos2); -} - void meta_options::initialize() { utils::split_args(FLAGS_meta_state_service_parameters, meta_state_service_args); diff --git a/src/meta/meta_options.h b/src/meta/meta_options.h index f33d83174e..ffda22eae5 100644 --- a/src/meta/meta_options.h +++ b/src/meta/meta_options.h @@ -54,10 +54,6 @@ class meta_options public: void initialize(); - -public: - static std::string concat_path_unix_style(const std::string &prefix, - const std::string &postfix); }; } // namespace replication } // namespace dsn diff --git a/src/meta/meta_service.cpp b/src/meta/meta_service.cpp index c35e3be99f..5159e3cbb1 100644 --- a/src/meta/meta_service.cpp +++ b/src/meta/meta_service.cpp @@ -64,6 +64,7 @@ #include "utils/autoref_ptr.h" #include "utils/command_manager.h" #include "utils/factory_store.h" +#include "utils/filesystem.h" #include "utils/flags.h" #include "utils/fmt_logging.h" #include "utils/string_conv.h" @@ -224,7 +225,7 @@ error_code meta_service::remote_storage_initialize() utils::split_args(FLAGS_cluster_root, slices, '/'); std::string current = ""; for (unsigned int i = 0; i != slices.size(); ++i) { - current = meta_options::concat_path_unix_style(current, slices[i]); + current = dsn::utils::filesystem::concat_path_unix_style(current, slices[i]); task_ptr tsk = _storage->create_node(current, LPC_META_CALLBACK, [&err](error_code ec) { err = ec; }); tsk->wait(); @@ -445,16 +446,16 @@ error_code meta_service::start() LOG_INFO("initialize backup handler"); _backup_handler = std::make_shared( this, - meta_options::concat_path_unix_style(_cluster_root, "backup"), + dsn::utils::filesystem::concat_path_unix_style(_cluster_root, "backup"), FLAGS_cold_backup_root, [](backup_service *bs) { return std::make_shared(bs); }); } _bulk_load_svc = std::make_unique( - this, meta_options::concat_path_unix_style(_cluster_root, "bulk_load")); + this, dsn::utils::filesystem::concat_path_unix_style(_cluster_root, "bulk_load")); // initialize the server_state - _state->initialize(this, meta_options::concat_path_unix_style(_cluster_root, "apps")); + _state->initialize(this, dsn::utils::filesystem::concat_path_unix_style(_cluster_root, "apps")); while ((err = _state->initialize_data_structure()) != ERR_OK) { if (err == ERR_OBJECT_NOT_FOUND && FLAGS_recover_from_replica_server) { LOG_INFO("can't find apps from remote storage, and " diff --git a/src/meta/test/CMakeLists.txt b/src/meta/test/CMakeLists.txt index 49c9e4994d..2855419556 100644 --- a/src/meta/test/CMakeLists.txt +++ b/src/meta/test/CMakeLists.txt @@ -38,21 +38,27 @@ set(MY_PROJ_SRC ${MY_PROJ_SRC} misc/misc.cpp) set(MY_SRC_SEARCH_MODE "GLOB") set(MY_PROJ_LIBS - dsn.replication.zookeeper_provider + dsn_meta_server + dsn_dist_cmd dsn_replication_common + dsn.replication.zookeeper_provider + zookeeper + hashtable dsn.block_service - dsn.block_service.local dsn.block_service.hdfs + hdfs + dsn.block_service.local dsn.failure_detector - dsn_dist_cmd + dsn_aio dsn_http - dsn_meta_server dsn_runtime - dsn_aio zookeeper hashtable gtest - hdfs) + rocksdb + lz4 + zstd + snappy) set(MY_BOOST_LIBS Boost::system Boost::filesystem) diff --git a/src/meta/test/meta_bulk_load_service_test.cpp b/src/meta/test/meta_bulk_load_service_test.cpp index c83f8cbbb4..9b37305108 100644 --- a/src/meta/test/meta_bulk_load_service_test.cpp +++ b/src/meta/test/meta_bulk_load_service_test.cpp @@ -54,6 +54,7 @@ #include "utils/blob.h" #include "utils/error_code.h" #include "utils/fail_point.h" +#include "utils/filesystem.h" #include "utils/fmt_logging.h" namespace dsn { @@ -344,7 +345,7 @@ class bulk_load_service_test : public meta_test_base // initialize bulk load service _ms->_bulk_load_svc = std::make_unique( - _ms.get(), meta_options::concat_path_unix_style(_ms->_cluster_root, "bulk_load")); + _ms.get(), dsn::utils::filesystem::concat_path_unix_style(_ms->_cluster_root, "bulk_load")); mock_bulk_load_on_remote_storage( app_id_set, app_bulk_load_info_map, partition_bulk_load_info_map); diff --git a/src/meta/test/meta_partition_guardian_test.cpp b/src/meta/test/meta_partition_guardian_test.cpp index 403dcb3fe2..e718d04ad6 100644 --- a/src/meta/test/meta_partition_guardian_test.cpp +++ b/src/meta/test/meta_partition_guardian_test.cpp @@ -62,6 +62,7 @@ #include "runtime/task/task.h" #include "utils/autoref_ptr.h" #include "utils/error_code.h" +#include "utils/filesystem.h" namespace dsn { namespace replication { @@ -179,7 +180,7 @@ void meta_partition_guardian_test::cure_test() svc->_balancer.reset(new dummy_balancer(svc.get())); server_state *state = svc->_state.get(); - state->initialize(svc.get(), meta_options::concat_path_unix_style(svc->_cluster_root, "apps")); + state->initialize(svc.get(), dsn::utils::filesystem::concat_path_unix_style(svc->_cluster_root, "apps")); dsn::app_info info; info.is_stateful = true; info.status = dsn::app_status::AS_CREATING; diff --git a/src/meta/test/meta_state/CMakeLists.txt b/src/meta/test/meta_state/CMakeLists.txt index a1ab1f3fd2..219d3901b8 100644 --- a/src/meta/test/meta_state/CMakeLists.txt +++ b/src/meta/test/meta_state/CMakeLists.txt @@ -34,8 +34,8 @@ set(MY_PROJ_SRC "") set(MY_SRC_SEARCH_MODE "GLOB") set(MY_PROJ_LIBS - dsn_aio dsn_meta_server + dsn_aio dsn_replica_server dsn_replication_common dsn_runtime @@ -44,10 +44,10 @@ set(MY_PROJ_LIBS zookeeper hashtable dsn.replication.zookeeper_provider + rocksdb lz4 snappy - zstd - rocksdb) + zstd) set(MY_BOOST_LIBS Boost::system Boost::filesystem) diff --git a/src/meta/test/meta_test_base.cpp b/src/meta/test/meta_test_base.cpp index d05d8a1452..3461b15f0f 100644 --- a/src/meta/test/meta_test_base.cpp +++ b/src/meta/test/meta_test_base.cpp @@ -44,6 +44,7 @@ #include "runtime/task/task_tracker.h" #include "utils/error_code.h" #include "utils/factory_store.h" +#include "utils/filesystem.h" #include "utils/flags.h" #include "utils/fmt_logging.h" #include "utils/zlocks.h" @@ -71,7 +72,7 @@ void meta_test_base::SetUp() _ms->_split_svc = std::make_unique(_ms.get()); ASSERT_TRUE(_ms->_split_svc); _ms->_bulk_load_svc = std::make_unique( - _ms.get(), meta_options::concat_path_unix_style(_ms->_cluster_root, "bulk_load")); + _ms.get(), dsn::utils::filesystem::concat_path_unix_style(_ms->_cluster_root, "bulk_load")); ASSERT_TRUE(_ms->_bulk_load_svc); _ms->_bulk_load_svc->initialize_bulk_load_service(); diff --git a/src/meta/test/update_configuration_test.cpp b/src/meta/test/update_configuration_test.cpp index d80b32a3e2..96df24a1e3 100644 --- a/src/meta/test/update_configuration_test.cpp +++ b/src/meta/test/update_configuration_test.cpp @@ -63,6 +63,7 @@ #include "runtime/task/task.h" #include "utils/autoref_ptr.h" #include "utils/error_code.h" +#include "utils/filesystem.h" #include "utils/flags.h" #include "utils/fmt_logging.h" #include "utils/zlocks.h" @@ -224,7 +225,7 @@ void meta_service_test_app::update_configuration_test() svc->_balancer.reset(new dummy_balancer(svc.get())); server_state *ss = svc->_state.get(); - ss->initialize(svc.get(), meta_options::concat_path_unix_style(svc->_cluster_root, "apps")); + ss->initialize(svc.get(), dsn::utils::filesystem::concat_path_unix_style(svc->_cluster_root, "apps")); dsn::app_info info; info.is_stateful = true; info.status = dsn::app_status::AS_CREATING; @@ -303,7 +304,7 @@ void meta_service_test_app::adjust_dropped_size() svc->_balancer.reset(new dummy_balancer(svc.get())); server_state *ss = svc->_state.get(); - ss->initialize(svc.get(), meta_options::concat_path_unix_style(svc->_cluster_root, "apps")); + ss->initialize(svc.get(), dsn::utils::filesystem::concat_path_unix_style(svc->_cluster_root, "apps")); dsn::app_info info; info.is_stateful = true; info.status = dsn::app_status::AS_CREATING; diff --git a/src/replica/CMakeLists.txt b/src/replica/CMakeLists.txt index e2ebb4c63a..a4b295f479 100644 --- a/src/replica/CMakeLists.txt +++ b/src/replica/CMakeLists.txt @@ -72,7 +72,8 @@ set(MY_PROJ_LIBS rocksdb lz4 zstd - snappy) + snappy + zookeeper) set(MY_BOOST_LIBS Boost::filesystem) diff --git a/src/replica/backup/test/CMakeLists.txt b/src/replica/backup/test/CMakeLists.txt index 8582af791d..09505b2de9 100644 --- a/src/replica/backup/test/CMakeLists.txt +++ b/src/replica/backup/test/CMakeLists.txt @@ -23,12 +23,20 @@ set(MY_SRC_SEARCH_MODE "GLOB") set(MY_PROJ_LIBS dsn_meta_server dsn_replica_server - dsn_replication_common + dsn_nfs + dsn_dist_cmd dsn_runtime + dsn_meta_server + dsn_replication_common + dsn.replication.zookeeper_provider + zookeeper + hashtable dsn.block_service + dsn.block_service.hdfs dsn.block_service.local + dsn.failure_detector + dsn_aio dsn_utils - hashtable gtest rocksdb lz4 diff --git a/src/runtime/ranger/ranger_resource_policy_manager.cpp b/src/runtime/ranger/ranger_resource_policy_manager.cpp index 4bc5ee54ff..e56e24ff3c 100644 --- a/src/runtime/ranger/ranger_resource_policy_manager.cpp +++ b/src/runtime/ranger/ranger_resource_policy_manager.cpp @@ -51,6 +51,7 @@ #include "runtime/task/task.h" #include "runtime/task/task_code.h" #include "utils/blob.h" +#include "utils/filesystem.h" #include "utils/flags.h" #include "utils/fmt_logging.h" #include "utils/process_utils.h" @@ -205,7 +206,7 @@ ranger_resource_policy_manager::ranger_resource_policy_manager( void ranger_resource_policy_manager::start() { CHECK_NOTNULL(_meta_svc, ""); - _ranger_policy_meta_root = dsn::replication::meta_options::concat_path_unix_style( + _ranger_policy_meta_root = dsn::utils::filesystem::concat_path_unix_style( _meta_svc->cluster_root(), "ranger_policy_meta_root"); tasking::enqueue_timer(LPC_USE_RANGER_ACCESS_CONTROL, &_tracker, diff --git a/src/runtime/test/CMakeLists.txt b/src/runtime/test/CMakeLists.txt index 38e52a4f5b..e513d41b9d 100644 --- a/src/runtime/test/CMakeLists.txt +++ b/src/runtime/test/CMakeLists.txt @@ -34,6 +34,15 @@ set(MY_PROJ_LIBS dsn_runtime dsn_aio dsn_meta_server + dsn_dist_cmd + dsn_replication_common + dsn.replication.zookeeper_provider + zookeeper + hashtable + dsn.block_service + dsn.block_service.hdfs + dsn.block_service.local + dsn.failure_detector rocksdb lz4 zstd diff --git a/src/sample/CMakeLists.txt b/src/sample/CMakeLists.txt index 5e52aa181e..42c09456e0 100644 --- a/src/sample/CMakeLists.txt +++ b/src/sample/CMakeLists.txt @@ -21,8 +21,11 @@ set(MY_SRC_SEARCH_MODE "GLOB") # TODO(yingchun): should link pegasus_client shared lib only! set(MY_PROJ_LIBS - rocksdb - pegasus_client_static) + pegasus_client_static + dsn_client + dsn_replication_common + dsn_utils + rocksdb) set(MY_BOOST_LIBS Boost::filesystem Boost::system) diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index 8c8daa4d12..95fd0253c4 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -35,6 +35,7 @@ set(MY_PROJ_LIBS dsn.block_service dsn.failure_detector dsn.replication.zookeeper_provider + dsn_http dsn_utils rocksdb lz4 @@ -43,7 +44,9 @@ set(MY_PROJ_LIBS pegasus_base pegasus_client_static event - hashtable) + hashtable + dsn_dist_cmd + dsn_nfs) set(MY_BOOST_LIBS Boost::system Boost::filesystem) diff --git a/src/test/bench_test/CMakeLists.txt b/src/test/bench_test/CMakeLists.txt index 5a52808d8d..d0c2fd06be 100644 --- a/src/test/bench_test/CMakeLists.txt +++ b/src/test/bench_test/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -set(MY_PROJ_NAME "pegasus_bench") +set(MY_PROJ_NAME pegasus_bench) project(${MY_PROJ_NAME} C CXX) # Source files under CURRENT project directory will be automatically included. @@ -29,6 +29,8 @@ set(MY_SRC_SEARCH_MODE "GLOB") set(MY_PROJ_LIBS pegasus_client_static + dsn_client + dsn_replication_common dsn_utils rocksdb lz4 diff --git a/src/test/pressure_test/CMakeLists.txt b/src/test/pressure_test/CMakeLists.txt index 42e29b7366..b8b806b869 100644 --- a/src/test/pressure_test/CMakeLists.txt +++ b/src/test/pressure_test/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -set(MY_PROJ_NAME "pegasus_pressureclient") +set(MY_PROJ_NAME pegasus_pressureclient) project(${MY_PROJ_NAME} C CXX) # Source files under CURRENT project directory will be automatically included. @@ -28,12 +28,13 @@ set(MY_PROJ_SRC "") set(MY_SRC_SEARCH_MODE "GLOB") set(MY_PROJ_LIBS - pegasus_client_static - dsn_utils - sasl2 - gssapi_krb5 - krb5 - ) + pegasus_client_static + dsn_client + dsn_replication_common + dsn_utils + sasl2 + gssapi_krb5 + krb5) set(MY_BINPLACES "${CMAKE_CURRENT_SOURCE_DIR}/config-pressure.ini") diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt index 282b0abade..ce7adebd62 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -33,6 +33,7 @@ set(MY_BOOST_LIBS Boost::system Boost::filesystem) set(MY_PROJ_LIBS dsn_http + dsn_replication_common rocksdb lz4 zstd diff --git a/src/utils/filesystem.cpp b/src/utils/filesystem.cpp index 0ebe07ef77..29b39b8f92 100644 --- a/src/utils/filesystem.cpp +++ b/src/utils/filesystem.cpp @@ -569,6 +569,18 @@ std::string path_combine(const std::string &path1, const std::string &path2) return npath; } +std::string concat_path_unix_style(const std::string &prefix, + const std::string &postfix) +{ + size_t pos1 = prefix.size(); // last_valid_pos + 1 + while (pos1 > 0 && prefix[pos1 - 1] == '/') + pos1--; + size_t pos2 = 0; // first non '/' position + while (pos2 < postfix.size() && postfix[pos2] == '/') + pos2++; + return prefix.substr(0, pos1) + "/" + postfix.substr(pos2); +} + bool get_current_directory(std::string &path) { bool succ; diff --git a/src/utils/filesystem.h b/src/utils/filesystem.h index 2142d1be1a..7930b29791 100644 --- a/src/utils/filesystem.h +++ b/src/utils/filesystem.h @@ -75,8 +75,12 @@ std::string remove_file_name(const std::string &path); std::string get_file_name(const std::string &path); +// TODO(yingchun): maybe one the following 2 functions are duplicated and can be removed. std::string path_combine(const std::string &path1, const std::string &path2); +std::string concat_path_unix_style(const std::string &prefix, + const std::string &postfix); + typedef std::function ftw_handler; bool file_tree_walk(const std::string &dirpath, ftw_handler handler, bool recursive = true); diff --git a/src/utils/metrics.cpp b/src/utils/metrics.cpp index 0a17bc1e73..c0329fac57 100644 --- a/src/utils/metrics.cpp +++ b/src/utils/metrics.cpp @@ -240,12 +240,13 @@ metric_entity_prototype::~metric_entity_prototype() {} metrics_http_service::metrics_http_service(metric_registry *registry) : _registry(registry) { - register_handler("metrics", - std::bind(&metrics_http_service::get_metrics_handler, - this, - std::placeholders::_1, - std::placeholders::_2), - "ip:port/metrics"); +// undefined reference to `dsn::http_service::register_handler +// register_handler("metrics", +// std::bind(&metrics_http_service::get_metrics_handler, +// this, +// std::placeholders::_1, +// std::placeholders::_2), +// "ip:port/metrics"); } namespace { diff --git a/src/zookeeper/CMakeLists.txt b/src/zookeeper/CMakeLists.txt index c6d99a55d9..5ebfcd0e28 100644 --- a/src/zookeeper/CMakeLists.txt +++ b/src/zookeeper/CMakeLists.txt @@ -34,7 +34,9 @@ set(MY_PROJ_SRC "") # "GLOB" for non-recursive search set(MY_SRC_SEARCH_MODE "GLOB") -set(MY_PROJ_LIBS zookeeper hashtable) +set(MY_PROJ_LIBS + zookeeper + hashtable) # Extra files that will be installed set(MY_BINPLACES "") diff --git a/src/zookeeper/test/CMakeLists.txt b/src/zookeeper/test/CMakeLists.txt index bd5623dad5..4e722e8770 100644 --- a/src/zookeeper/test/CMakeLists.txt +++ b/src/zookeeper/test/CMakeLists.txt @@ -37,13 +37,14 @@ set(MY_PROJ_LIBS dsn.replication.zookeeper_provider dsn_runtime dsn_utils + dsn_http zookeeper hashtable gtest + rocksdb lz4 snappy - zstd - rocksdb) + zstd) set(MY_BOOST_LIBS Boost::system Boost::filesystem)