Avoid mutating global state, to fix TSAN failure

apache · Nov 3, 2024 · ce67a27 · ce67a27
1 parent 452185c
commit ce67a27
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/cpp/src/arrow/filesystem/s3_test_util.cc b/cpp/src/arrow/filesystem/s3_test_util.cc
@@ -106,10 +106,6 @@ Status MinioTestServer::GenerateCertificateFile() {
                                 strlen(kMinioPrivateKey)));
   ARROW_RETURN_NOT_OK(private_key_fd.Close());
 
-  arrow::fs::FileSystemGlobalOptions global_options;
-  global_options.tls_ca_file_path = ca_file_path();
-  ARROW_RETURN_NOT_OK(arrow::fs::Initialize(global_options));
-
   return Status::OK();
 }
 

diff --git a/cpp/src/arrow/filesystem/s3fs_test.cc b/cpp/src/arrow/filesystem/s3fs_test.cc
@@ -499,6 +499,9 @@ class TestS3FS : public S3TestMixin {
     // Most tests will create buckets
     options_.allow_bucket_creation = true;
     options_.allow_bucket_deletion = true;
+    if (enable_tls_) {
+      options_.tls_ca_file_path = minio_->ca_file_path();
+    }
     MakeFileSystem();
     // Set up test bucket
     {