more

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 $?
 

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 "")

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)
 

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)
 

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()
 

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?<key>=<value>");
+// 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?<key>=<value>");
         });
     }
 

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)
 

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);

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

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<backup_service>(
             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<policy_context>(bs); });
     }
 
     _bulk_load_svc = std::make_unique<bulk_load_service>(
-        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 "

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)
 

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<bulk_load_service>(
-            _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);
 

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;

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)
 

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<meta_split_service>(_ms.get());
     ASSERT_TRUE(_ms->_split_svc);
     _ms->_bulk_load_svc = std::make_unique<bulk_load_service>(
-        _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();
 

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;

src/replica/CMakeLists.txt

@@ -72,7 +72,8 @@ set(MY_PROJ_LIBS
         rocksdb
         lz4
         zstd
-        snappy)
+        snappy
+        zookeeper)
 
 set(MY_BOOST_LIBS Boost::filesystem)
 

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

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,

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

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)