test/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2024-11-30 02:48:45 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Use SA_ONSTACK flag for SIGPIPE handler (#24688)

Browse Source 
Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
This commit is contained in:
congqixia 2023-06-08 15:50:35 +08:00 committed by GitHub
parent 54306a10b3
commit e729b504ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
internal/core/src/storage/MinioChunkManager.cpp
View File

@ -14,8 +14,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#include "storage/MinioChunkManager.h" #include <fstream>
#include <aws/core/auth/AWSCredentials.h> #include <aws/core/auth/AWSCredentials.h>
#include <aws/core/auth/AWSCredentialsProviderChain.h> #include <aws/core/auth/AWSCredentialsProviderChain.h>
#include <aws/core/auth/STSCredentialsProvider.h> #include <aws/core/auth/STSCredentialsProvider.h>
@ -28,12 +27,12 @@
#include <aws/s3/model/ListObjectsRequest.h> #include <aws/s3/model/ListObjectsRequest.h>
#include <aws/s3/model/PutObjectRequest.h> #include <aws/s3/model/PutObjectRequest.h>
#include <fstream> #include "storage/MinioChunkManager.h"
#include "storage/AliyunSTSClient.h" #include "storage/AliyunSTSClient.h"
#include "storage/AliyunCredentialsProvider.h" #include "storage/AliyunCredentialsProvider.h"
#include "exceptions/EasyAssert.h" #include "exceptions/EasyAssert.h"
#include "log/Log.h" #include "log/Log.h"
#include "signal.h"
#define THROWS3ERROR(FUNCTION) \ #define THROWS3ERROR(FUNCTION) \
do { \ do { \
@ -50,6 +49,19 @@ namespace milvus::storage {
std::atomic<size_t> MinioChunkManager::init_count_(0); std::atomic<size_t> MinioChunkManager::init_count_(0);
std::mutex MinioChunkManager::client_mutex_; std::mutex MinioChunkManager::client_mutex_;
static void
SwallowHandler(int signal) {
switch (signal) {
case SIGPIPE:
LOG_SERVER_WARNING_ << "SIGPIPE Swallowed" << std::endl;
break;
default:
LOG_SERVER_ERROR_
<< "Unexpected signal in SIGPIPE handler: " << signal
<< std::endl;
}
}
/** /**
* @brief convert std::string to Aws::String * @brief convert std::string to Aws::String
* because Aws has String type internally * because Aws has String type internally
@ -78,7 +90,11 @@ MinioChunkManager::InitSDKAPI(RemoteStorageType type) {
std::scoped_lock lock{client_mutex_}; std::scoped_lock lock{client_mutex_};
const size_t initCount = init_count_++; const size_t initCount = init_count_++;
if (initCount == 0) { if (initCount == 0) {
sdk_options_.httpOptions.installSigPipeHandler = true; // sdk_options_.httpOptions.installSigPipeHandler = true;
struct sigaction psa;
psa.sa_handler = SwallowHandler;
psa.sa_flags = psa.sa_flags | SA_ONSTACK;
sigaction(SIGPIPE, &psa, 0);
if (type == RemoteStorageType::GOOGLE_CLOUD) { if (type == RemoteStorageType::GOOGLE_CLOUD) {
sdk_options_.httpOptions.httpClientFactory_create_fn = []() { sdk_options_.httpOptions.httpClientFactory_create_fn = []() {
// auto credentials = google::cloud::oauth2_internal::GOOGLE_CLOUD_CPP_NS::GoogleDefaultCredentials(); // auto credentials = google::cloud::oauth2_internal::GOOGLE_CLOUD_CPP_NS::GoogleDefaultCredentials();