disagg: Bump aws sdk (#8247)

close #8274

.gitmodules

@@ -94,13 +94,13 @@
 	url = https://github.com/guanzhi/GmSSL.git
 [submodule "contrib/aws"]
 	path = contrib/aws
-	url = https://github.com/JaySon-Huang/aws-sdk-cpp.git
+	url = https://github.com/aws/aws-sdk-cpp.git
 [submodule "contrib/aws-c-auth"]
 	path = contrib/aws-c-auth
 	url = https://github.com/awslabs/aws-c-auth.git
 [submodule "contrib/aws-c-cal"]
 	path = contrib/aws-c-cal
-	url = https://github.com/ClickHouse/aws-c-cal.git
+	url = https://github.com/awslabs/aws-c-cal.git
 [submodule "contrib/aws-c-common"]
 	path = contrib/aws-c-common
 	url = https://github.com/awslabs/aws-c-common.git

contrib/aws-cmake/CMakeLists.txt

@@ -12,7 +12,13 @@ set(AWS_PUBLIC_COMPILE_DEFS)
 set(AWS_PRIVATE_COMPILE_DEFS)
 set(AWS_PRIVATE_LIBS)
 
-list(APPEND AWS_PRIVATE_COMPILE_DEFS "-DENABLE_CURL_CLIENT")
+# Versions
+list(APPEND AWS_PUBLIC_COMPILE_DEFS "-DAWS_SDK_VERSION_MAJOR=1")
+list(APPEND AWS_PUBLIC_COMPILE_DEFS "-DAWS_SDK_VERSION_MINOR=11")
+list(APPEND AWS_PUBLIC_COMPILE_DEFS "-DAWS_SDK_VERSION_PATCH=186")
+
+# ignore the symbols defined in `aws/common/external/ittnotify.h`
+list(APPEND AWS_PRIVATE_COMPILE_DEFS "-DENABLE_CURL_CLIENT -DINTEL_NO_ITTNOTIFY_API")
 
 if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
     list(APPEND AWS_PRIVATE_COMPILE_DEFS "-DDEBUG_BUILD")
@@ -48,7 +54,6 @@ SET(AWS_S2N_TLS_DIR "${TiFlash_SOURCE_DIR}/contrib/aws-s2n-tls")
 SET(AWS_S3_DIR "${TiFlash_SOURCE_DIR}/contrib/aws-c-s3")
 SET(AWS_SDKUTILS_DIR "${TiFlash_SOURCE_DIR}/contrib/aws-c-sdkutils")
 
-
 # aws-cpp-sdk-core
 file(GLOB AWS_SDK_CORE_SRC
     "${AWS_SDK_CORE_DIR}/source/*.cpp"
@@ -64,15 +69,18 @@ file(GLOB AWS_SDK_CORE_SRC
     "${AWS_SDK_CORE_DIR}/source/external/cjson/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/external/tinyxml2/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/http/*.cpp"
-    "${AWS_SDK_CORE_DIR}/source/http/standard/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/http/curl/*.cpp"
+    "${AWS_SDK_CORE_DIR}/source/http/standard/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/internal/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/monitoring/*.cpp"
+    "${AWS_SDK_CORE_DIR}/source/smithy/*.cpp"
+    "${AWS_SDK_CORE_DIR}/source/smithy/tracing/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/utils/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/utils/base64/*.cpp"
+    "${AWS_SDK_CORE_DIR}/source/utils/component-registry/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/utils/crypto/*.cpp"
-    "${AWS_SDK_CORE_DIR}/source/utils/crypto/openssl/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/utils/crypto/factory/*.cpp"
+    "${AWS_SDK_CORE_DIR}/source/utils/crypto/openssl/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/utils/event/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/utils/json/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/utils/logging/*.cpp"
@@ -95,10 +103,6 @@ OPTION(USE_AWS_MEMORY_MANAGEMENT "Aws memory management" OFF)
 configure_file("${AWS_SDK_CORE_DIR}/include/aws/core/SDKConfig.h.in"
     "${CMAKE_CURRENT_BINARY_DIR}/include/aws/core/SDKConfig.h" @ONLY)
 
-list(APPEND AWS_PUBLIC_COMPILE_DEFS "-DAWS_SDK_VERSION_MAJOR=1")
-list(APPEND AWS_PUBLIC_COMPILE_DEFS "-DAWS_SDK_VERSION_MINOR=10")
-list(APPEND AWS_PUBLIC_COMPILE_DEFS "-DAWS_SDK_VERSION_PATCH=36")
-
 list(APPEND AWS_SOURCES ${AWS_SDK_CORE_SRC} ${AWS_SDK_CORE_NET_SRC} ${AWS_SDK_CORE_PLATFORM_SRC})
 
 list(APPEND AWS_PUBLIC_INCLUDES
@@ -140,6 +144,8 @@ file(GLOB AWS_CAL_SRC
 )
 
 if (ENABLE_OPENSSL_ENCRYPTION)
+    # Note: We use `unix/*.c` for both OS_LINUX and OS_DARWIN
+    # `darwin/*.c` lead to compile errors
     file(GLOB AWS_CAL_OS_SRC
         "${AWS_CAL_DIR}/source/unix/*.c"
     )
@@ -204,9 +210,6 @@ list(APPEND AWS_PUBLIC_INCLUDES
 # aws-checksums
 file(GLOB AWS_CHECKSUMS_SRC
     "${AWS_CHECKSUMS_DIR}/source/*.c"
-    "${AWS_CHECKSUMS_DIR}/source/intel/*.c"
-    "${AWS_CHECKSUMS_DIR}/source/intel/asm/*.c"
-    "${AWS_CHECKSUMS_DIR}/source/arm/*.c"
 )
 
 if(AWS_ARCH_INTEL AND AWS_HAVE_GCC_INLINE_ASM)
@@ -220,14 +223,6 @@ if (AWS_ARCH_ARM64)
         "${AWS_CHECKSUMS_DIR}/source/arm/*.c"
     )
     set_source_files_properties("${AWS_CHECKSUMS_DIR}/source/arm/crc32c_arm.c" PROPERTIES COMPILE_FLAGS -march=armv8-a+crc)
-elseif (AWS_ARCH_ARM32)
-    if (AWS_ARM32_CRC)
-        file(GLOB AWS_CHECKSUMS_ARCH_SRC
-            "${AWS_CHECKSUMS_DIR}/source/arm/*.c"
-            "${AWS_CHECKSUMS_DIR}/source/arm/asm/*.c"
-        )
-        set_source_files_properties(source/arm/crc32c_arm.c PROPERTIES COMPILE_FLAGS -march=armv8-a+crc)
-    endif()
 endif()
 
 list(APPEND AWS_SOURCES ${AWS_CHECKSUMS_SRC} ${AWS_CHECKSUMS_ARCH_SRC})
@@ -248,6 +243,8 @@ elseif (OS_DARWIN)
     file(GLOB AWS_IO_OS_SRC
         "${AWS_IO_DIR}/source/bsd/*.c"
         "${AWS_IO_DIR}/source/posix/*.c"
+        # Note darwin source files leads to compile errors, ignore them
+        # "${AWS_IO_DIR}/source/darwin/*.c"
     )
 endif()
 
@@ -290,13 +287,14 @@ file(GLOB AWS_CRT_SRC
     "${AWS_CRT_DIR}/source/auth/*.cpp"
     "${AWS_CRT_DIR}/source/crypto/*.cpp"
     "${AWS_CRT_DIR}/source/endpoints/*.cpp"
-    "${AWS_CRT_DIR}/source/external/*.cpp"
     "${AWS_CRT_DIR}/source/http/*.cpp"
     "${AWS_CRT_DIR}/source/io/*.cpp"
 )
 
 list(APPEND AWS_SOURCES ${AWS_CRT_SRC})
 list(APPEND AWS_PUBLIC_INCLUDES "${AWS_CRT_DIR}/include/")
+configure_file("${AWS_CRT_DIR}/include/aws/crt/Config.h.in"
+    ${CMAKE_CURRENT_BINARY_DIR}/include/aws/crt/Config.h @ONLY)
 
 
 # aws-c-mqtt

dbms/src/Server/Server.cpp

@@ -705,28 +705,25 @@ class Server::TcpHttpServersHolder
             server->start();
     }
 
+    // terminate all TCP servers when receive exit signal
     void onExit()
     {
         auto & config = server.config();
 
-        LOG_DEBUG(log, "Received termination signal.");
-        LOG_DEBUG(log, "Waiting for current connections to close.");
+        LOG_INFO(log, "Received termination signal, stopping server...");
+        LOG_INFO(log, "Waiting for current connections to close.");
 
         int current_connections = 0;
         for (auto & server : servers)
         {
             server->stop();
             current_connections += server->currentConnections();
         }
-        String debug_msg = "Closed all listening sockets.";
-
-        if (current_connections)
-            LOG_DEBUG(log, "{} Waiting for {} outstanding connections.", debug_msg, current_connections);
-        else
-            LOG_DEBUG(log, debug_msg);
 
+        String debug_msg = "Closed all listening sockets.";
         if (current_connections)
         {
+            LOG_INFO(log, "{} Waiting for {} outstanding connections.", debug_msg, current_connections);
             const int sleep_max_ms = 1000 * config.getInt("shutdown_wait_unfinished", 5);
             const int sleep_one_ms = 100;
             int sleep_current_ms = 0;
@@ -741,18 +738,21 @@ class Server::TcpHttpServersHolder
                 std::this_thread::sleep_for(std::chrono::milliseconds(sleep_one_ms));
             }
         }
+        else
+        {
+            LOG_INFO(log, debug_msg);
+        }
 
         debug_msg = "Closed connections.";
-
         if (current_connections)
-            LOG_DEBUG(
+            LOG_INFO(
                 log,
                 "{} But {} remains."
                 " Tip: To increase wait time add to config: <shutdown_wait_unfinished>60</shutdown_wait_unfinished>",
                 debug_msg,
                 current_connections);
         else
-            LOG_DEBUG(log, debug_msg);
+            LOG_INFO(log, debug_msg);
     }
 
 private: