utils

acelyc111 · Dec 19, 2023 · 4c6a003 · 4c6a003
1 parent ef08ee6
commit 4c6a003
Show file tree

Hide file tree

Showing 57 changed files with 312 additions and 185 deletions.
diff --git a/run.sh b/run.sh
@@ -326,10 +326,9 @@ function run_build()
     if [ ! -z "${IWYU}" ]; then
         make $MAKE_OPTIONS 2> iwyu.out
     else
-        make pegasus_server $MAKE_OPTIONS
+        make $MAKE_OPTIONS
 #        pegasus_shell
 #        pegasus_server
-#        pegasus_unit_test
 #        make install
     fi
     exit_if_fail $?

diff --git a/src/aio/CMakeLists.txt b/src/aio/CMakeLists.txt
@@ -35,6 +35,9 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
         dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
         rocksdb
         lz4
         zstd

diff --git a/src/aio/test/CMakeLists.txt b/src/aio/test/CMakeLists.txt
@@ -38,8 +38,12 @@ set(MY_PROJ_LIBS
         dsn_replication_common
         gtest
         dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
         dsn_aio
         test_utils
+        dsn_utils
         rocksdb
         lz4
         zstd

diff --git a/src/base/test/CMakeLists.txt b/src/base/test/CMakeLists.txt
@@ -28,10 +28,13 @@ set(MY_PROJ_SRC "")
 set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
-    dsn_runtime
-    dsn_utils
-    pegasus_base
-    gtest)
+        dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
+        dsn_utils
+        pegasus_base
+        gtest)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)
 

diff --git a/src/block_service/CMakeLists.txt b/src/block_service/CMakeLists.txt
@@ -39,4 +39,4 @@ dsn_add_static_library()
 
 add_subdirectory(hdfs)
 add_subdirectory(local)
-#add_subdirectory(test)
+add_subdirectory(test)
diff --git a/src/block_service/test/CMakeLists.txt b/src/block_service/test/CMakeLists.txt
@@ -27,6 +27,9 @@ set(MY_PROJ_LIBS
         dsn.block_service.local
         dsn.block_service.hdfs
         dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
         dsn_utils
         gtest
         gtest_main
@@ -35,9 +38,7 @@ set(MY_PROJ_LIBS
         rocksdb
         lz4
         zstd
-        snappy
-        ssl
-        crypto)
+        snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)
 

diff --git a/src/client/test/CMakeLists.txt b/src/client/test/CMakeLists.txt
@@ -25,6 +25,9 @@ set(MY_PROJ_LIBS
         dsn_client
         dsn_replication_common
         dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
         dsn_utils
         gtest
         rocksdb

diff --git a/src/common/test/CMakeLists.txt b/src/common/test/CMakeLists.txt
@@ -30,6 +30,9 @@ set(MY_PROJ_LIBS
         dsn_http
         dsn_replication_common
         dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
         dsn_utils
         gtest
         rocksdb

diff --git a/src/failure_detector/test/CMakeLists.txt b/src/failure_detector/test/CMakeLists.txt
@@ -36,6 +36,9 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 set(MY_PROJ_LIBS
         dsn_meta_server
         dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
         dsn_replica_server
         dsn.security
         dsn_nfs

diff --git a/src/geo/bench/CMakeLists.txt b/src/geo/bench/CMakeLists.txt
@@ -28,6 +28,10 @@ set(MY_PROJ_SRC "")
 set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
+        dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
         pegasus_geo_lib
         pegasus_client_static
         dsn_client

diff --git a/src/geo/test/CMakeLists.txt b/src/geo/test/CMakeLists.txt
@@ -28,6 +28,10 @@ set(MY_PROJ_SRC "")
 set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
+        dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
         absl::flat_hash_set
         absl::strings
         pegasus_geo_lib

diff --git a/src/http/test/CMakeLists.txt b/src/http/test/CMakeLists.txt
@@ -24,6 +24,9 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 set(MY_PROJ_LIBS
         dsn_http
         dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
         dsn_utils
         curl
         gtest

diff --git a/src/meta/CMakeLists.txt b/src/meta/CMakeLists.txt
@@ -43,6 +43,9 @@ set(MY_PROJ_LIBS
         dsn_dist_cmd
         dsn_http
         dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
         dsn_ranger
         dsn.security
         dsn.task

diff --git a/src/meta/test/CMakeLists.txt b/src/meta/test/CMakeLists.txt
@@ -52,8 +52,10 @@ set(MY_PROJ_LIBS
         dsn_aio
         dsn_http
         dsn_runtime
-        zookeeper
-        hashtable
+        dsn_utils
+        sasl2
+        gssapi_krb5
+        krb5
         gtest
         rocksdb
         lz4

diff --git a/src/meta/test/balancer_simulator/CMakeLists.txt b/src/meta/test/balancer_simulator/CMakeLists.txt
@@ -44,8 +44,11 @@ set(MY_PROJ_LIBS
         dsn.replication.zookeeper_provider
         zookeeper
         hashtable
-        dsn_utils
         dsn_runtime
+        dsn_utils
+        sasl2
+        gssapi_krb5
+        krb5
         gtest
         rocksdb
         lz4

diff --git a/src/meta/test/meta_state/CMakeLists.txt b/src/meta/test/meta_state/CMakeLists.txt
@@ -39,6 +39,9 @@ set(MY_PROJ_LIBS
         dsn_replica_server
         dsn_replication_common
         dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
         dsn_utils
         gtest
         zookeeper

diff --git a/src/nfs/test/CMakeLists.txt b/src/nfs/test/CMakeLists.txt
@@ -35,15 +35,19 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
         dsn_nfs
+        dsn_http
         dsn_runtime
-        gtest
         dsn_aio
-        dsn_http
+        dsn_utils
+        sasl2
+        gssapi_krb5
+        krb5
+        test_utils
+        gtest
         rocksdb
         lz4
         zstd
-        snappy
-        test_utils)
+        snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)
 

diff --git a/src/perf_counter/test/CMakeLists.txt b/src/perf_counter/test/CMakeLists.txt
@@ -36,9 +36,13 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 set(MY_PROJ_LIBS
         dsn_meta_server
         dsn_replication_common
+        dsn_runtime
+        dsn_aio
         dsn_utils
+        sasl2
+        gssapi_krb5
+        krb5
         gtest
-        dsn_runtime
         rocksdb
         lz4
         zstd

diff --git a/src/redis_protocol/proxy_ut/CMakeLists.txt b/src/redis_protocol/proxy_ut/CMakeLists.txt
@@ -31,20 +31,24 @@ set(MY_BOOST_LIBS Boost::system Boost::filesystem)
 
 set(MY_PROJ_LIBS
         pegasus.rproxylib
-        dsn_utils
         absl::flat_hash_set
         absl::strings
         pegasus_geo_lib
         event
         s2
         pegasus_client_static
         dsn_client
-        test_utils
+        dsn_runtime
+        dsn_aio
+        dsn_utils
+        sasl2
+        gssapi_krb5
+        krb5
+        gtest
         rocksdb
         lz4
         zstd
-        snappy
-        gtest)
+        snappy)
 
 set(MY_BINPLACES "config.ini" "run.sh")
 

diff --git a/src/replica/CMakeLists.txt b/src/replica/CMakeLists.txt
@@ -67,6 +67,9 @@ set(MY_PROJ_LIBS
         dsn_dist_cmd
         dsn_http
         dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
         dsn_aio
         dsn_meta_server
         rocksdb
@@ -82,7 +85,7 @@ set(MY_BINPLACES "")
 
 dsn_add_static_library()
 
-#add_subdirectory(duplication/test)
+add_subdirectory(duplication/test)
 add_subdirectory(backup/test)
 add_subdirectory(bulk_load/test)
 add_subdirectory(split/test)

diff --git a/src/replica/backup/test/CMakeLists.txt b/src/replica/backup/test/CMakeLists.txt
@@ -26,6 +26,9 @@ set(MY_PROJ_LIBS dsn_meta_server
         dsn_nfs
         dsn_dist_cmd
         dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
         dsn_meta_server
         dsn_replication_common
         dsn.replication.zookeeper_provider

diff --git a/src/replica/bulk_load/test/CMakeLists.txt b/src/replica/bulk_load/test/CMakeLists.txt
@@ -23,6 +23,9 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
         dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
         dsn_meta_server
         dsn_replica_server
         dsn.security

diff --git a/src/replica/duplication/duplication_pipeline.cpp b/src/replica/duplication/duplication_pipeline.cpp
@@ -42,14 +42,6 @@ namespace dsn {
 
 namespace replication {
 
-//                     //
-// mutation_duplicator //
-//                     //
-
-/*static*/ std::function<std::unique_ptr<mutation_duplicator>(
-    replica_base *, absl::string_view /*remote cluster*/, absl::string_view /*app*/)>
-    mutation_duplicator::creator;
-
 //               //
 // load_mutation //
 //               //
@@ -121,8 +113,8 @@ ship_mutation::ship_mutation(replica_duplicator *duplicator)
       _stub(duplicator->_replica->get_replica_stub()),
       METRIC_VAR_INIT_replica(dup_shipped_bytes)
 {
-    _mutation_duplicator = new_mutation_duplicator(
-        duplicator, _duplicator->remote_cluster_name(), _replica->get_app_info()->app_name);
+//    _mutation_duplicator = new_mutation_duplicator(
+//        duplicator, _duplicator->remote_cluster_name(), _replica->get_app_info()->app_name);
     _mutation_duplicator->set_task_environment(duplicator);
 }
 

diff --git a/src/replica/duplication/mutation_duplicator.h b/src/replica/duplication/mutation_duplicator.h
@@ -66,11 +66,6 @@ class mutation_duplicator : public replica_base
     /// \param cb: Call it when all the given mutations were sent successfully
     virtual void duplicate(mutation_tuple_set mutations, callback cb) = 0;
 
-    // Singleton creator of mutation_duplicator.
-    static std::function<std::unique_ptr<mutation_duplicator>(
-        replica_base *, absl::string_view /*remote cluster*/, absl::string_view /*app name*/)>
-        creator;
-
     explicit mutation_duplicator(replica_base *r) : replica_base(r) {}
 
     virtual ~mutation_duplicator() = default;
@@ -83,11 +78,11 @@ class mutation_duplicator : public replica_base
     pipeline::environment _env;
 };
 
-inline std::unique_ptr<mutation_duplicator> new_mutation_duplicator(
-    replica_base *r, absl::string_view remote_cluster_address, absl::string_view app)
-{
-    return mutation_duplicator::creator(r, remote_cluster_address, app);
-}
+//inline std::unique_ptr<mutation_duplicator> new_mutation_duplicator(
+//    replica_base *r, absl::string_view remote_cluster_address, absl::string_view app)
+//{
+//    return mutation_duplicator::create(r, remote_cluster_address, app);
+//}
 
 } // namespace replication
 } // namespace dsn
diff --git a/src/replica/duplication/test/CMakeLists.txt b/src/replica/duplication/test/CMakeLists.txt
@@ -22,20 +22,29 @@ set(MY_PROJ_SRC "")
 set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
-        dsn_utils
+        dsn_replica_server
+        dsn.block_service
+        dsn.block_service.hdfs
+        dsn.block_service.local
+        dsn_nfs
+        dsn_dist_cmd
         dsn_aio
         dsn_http
-        dsn_meta_server
         dsn_ranger
-        dsn_replica_server
+        dsn_runtime
+        dsn_meta_server
+        sasl2
+        gssapi_krb5
+        krb5
         dsn.replication.zookeeper_provider
+        zookeeper
+        hashtable
         dsn_replication_common
         dsn.rpc
         dsn.failure_detector
-        zookeeper
-        hashtable
-        gtest
+        dsn_utils
         test_utils
+        gtest
         rocksdb
         lz4
         zstd

diff --git a/src/replica/duplication/test/duplication_test_base.h b/src/replica/duplication/test/duplication_test_base.h
@@ -34,9 +34,9 @@ class duplication_test_base : public replica_test_base
 public:
     duplication_test_base()
     {
-        mutation_duplicator::creator = [](replica_base *r, absl::string_view, absl::string_view) {
-            return std::make_unique<mock_mutation_duplicator>(r);
-        };
+//        mutation_duplicator::creator = [](replica_base *r, absl::string_view, absl::string_view) {
+//            return std::make_unique<mock_mutation_duplicator>(r);
+//        };
         stub->_duplication_sync_timer = std::make_unique<duplication_sync_timer>(stub.get());
     }