Merge branch 'master' into general_ci_ipv

Author: acelyc111

.github/workflows/lint_and_test_cpp.yaml

@@ -324,6 +324,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: "./.github/actions/rebuild_thirdparty_if_needed"
+      # TODO(yingchun): Append "-m dsn_utils_tests" to the command if not needed to pack server or tools, for example, the dependencies are static linked.
       - uses: "./.github/actions/build_pegasus"
       - uses: "./.github/actions/upload_artifact"
 

run.sh

@@ -81,6 +81,9 @@ function usage_build()
 {
     echo "Options for subcommand 'build':"
     echo "   -h|--help             print the help info"
+    echo "   -m|--modules          specify modules to build, split by ',',"
+    echo "                         e.g., \"pegasus_unit_test,dsn_runtime_tests,dsn_meta_state_tests\","
+    echo "                         if not set, then build all objects"
     echo "   -t|--type             build type: debug|release, default is release"
     echo "   -c|--clear            clear pegasus before building, not clear thirdparty"
     echo "   --clear_thirdparty    clear thirdparty/pegasus before building"
@@ -128,13 +131,18 @@ function run_build()
     USE_JEMALLOC=OFF
     BUILD_TEST=OFF
     IWYU=""
+    BUILD_MODULES=""
     while [[ $# > 0 ]]; do
         key="$1"
         case $key in
             -h|--help)
                 usage_build
                 exit 0
                 ;;
+            -m|--modules)
+                BUILD_MODULES=$2
+                shift
+                ;;
             -t|--type)
                 BUILD_TYPE="$2"
                 shift
@@ -213,6 +221,12 @@ function run_build()
         exit 1
     fi
 
+    # Replace all ',' to ' ' in $BUILD_MODULES.
+    if [ "$BUILD_MODULES" != "" ]; then
+        BUILD_MODULES=${BUILD_MODULES//,/ }
+    fi
+    echo "build_modules=$BUILD_MODULES"
+
     CMAKE_OPTIONS="-DCMAKE_C_COMPILER=${C_COMPILER}
                    -DCMAKE_CXX_COMPILER=${CXX_COMPILER}
                    -DUSE_JEMALLOC=${USE_JEMALLOC}"
@@ -325,6 +339,8 @@ function run_build()
     pushd $BUILD_DIR
     if [ ! -z "${IWYU}" ]; then
         make $MAKE_OPTIONS 2> iwyu.out
+    elif [ "$BUILD_MODULES" != "" ]; then
+        make $BUILD_MODULES $MAKE_OPTIONS
     else
         make install $MAKE_OPTIONS
     fi

src/replica/storage/simple_kv/test/simple_kv.server.impl.cpp

@@ -37,20 +37,19 @@
 
 #include "aio/aio_task.h"
 #include "aio/file_io.h"
+#include "common/replication.codes.h"
 #include "consensus_types.h"
 #include "rocksdb/env.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/status.h"
 #include "runtime/serverlet.h"
-#include "runtime/task/task_code.h"
 #include "simple_kv_types.h"
 #include "utils/autoref_ptr.h"
 #include "utils/binary_reader.h"
 #include "utils/blob.h"
 #include "utils/env.h"
 #include "utils/filesystem.h"
 #include "utils/fmt_logging.h"
-#include "utils/threadpool_code.h"
 #include "utils/utils.h"
 
 // TODO(yingchun): most of the code are the same as
@@ -68,8 +67,6 @@ namespace dsn {
 namespace replication {
 namespace test {
 
-DEFINE_TASK_CODE(LPC_AIO_IMMEDIATE_CALLBACK, TASK_PRIORITY_COMMON, dsn::THREAD_POOL_DEFAULT)
-
 bool simple_kv_service_impl::s_simple_kv_open_fail = false;
 bool simple_kv_service_impl::s_simple_kv_close_fail = false;
 bool simple_kv_service_impl::s_simple_kv_get_checkpoint_fail = false;

src/utils/simple_logger.cpp

@@ -138,6 +138,31 @@ void screen_logger::dsn_logv(const char *file,
     vprintf(fmt, args);
     printf("\n");
 
+    if (log_level >= LOG_LEVEL_ERROR) {
+        ::fflush(stdout);
+    }
+
+    process_fatal_log(log_level);
+}
+
+void screen_logger::dsn_log(const char *file,
+                            const char *function,
+                            const int line,
+                            dsn_log_level_t log_level,
+                            const char *str)
+{
+    utils::auto_lock<::dsn::utils::ex_lock_nr> l(_lock);
+
+    print_header(stdout, log_level);
+    if (!_short_header) {
+        printf("%s:%d:%s(): ", file, line, function);
+    }
+    printf("%s\n", str);
+
+    if (log_level >= LOG_LEVEL_ERROR) {
+        ::fflush(stdout);
+    }
+
     process_fatal_log(log_level);
 }
 

src/utils/simple_logger.h

@@ -57,9 +57,7 @@ class screen_logger : public logging_provider
                  const char *function,
                  const int line,
                  dsn_log_level_t log_level,
-                 const char *str) override
-    {
-    }
+                 const char *str) override;
 
     virtual void flush();