diff --git a/src/paimon/CMakeLists.txt b/src/paimon/CMakeLists.txt index bba5e07c..9fa42a98 100644 --- a/src/paimon/CMakeLists.txt +++ b/src/paimon/CMakeLists.txt @@ -335,6 +335,7 @@ if(PAIMON_BUILD_TESTS) common/io/buffered_input_stream_test.cpp common/io/memory_segment_output_stream_test.cpp common/io/offset_input_stream_test.cpp + common/logging/logging_test.cpp common/metrics/metrics_impl_test.cpp common/options/memory_size_test.cpp common/options/time_duration_test.cpp diff --git a/src/paimon/common/logging/logging.cpp b/src/paimon/common/logging/logging.cpp index 96f9971d..58924367 100644 --- a/src/paimon/common/logging/logging.cpp +++ b/src/paimon/common/logging/logging.cpp @@ -81,7 +81,7 @@ std::unique_ptr Logger::GetLogger(const std::string& path) { std::shared_lock lock(getRegistryLock()); return creator.value()(path); } - + std::unique_lock ulock(getRegistryLock()); if (!google::IsGoogleLoggingInitialized()) { google::InitGoogleLogging(program_invocation_name); } diff --git a/src/paimon/common/logging/logging_test.cpp b/src/paimon/common/logging/logging_test.cpp new file mode 100644 index 00000000..61940c2d --- /dev/null +++ b/src/paimon/common/logging/logging_test.cpp @@ -0,0 +1,39 @@ +/* + * Copyright 2025-present Alibaba Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include "paimon/logging.h" + +#include +#include +#include + +#include "paimon/common/executor/future.h" +#include "paimon/executor.h" +#include "paimon/testing/utils/testharness.h" +namespace paimon::test { +TEST(LoggerTest, TestMultiThreadGetLogger) { + auto executor = CreateDefaultExecutor(/*thread_count=*/4); + auto get_logger = []() { + auto logger = Logger::GetLogger("my_log"); + ASSERT_TRUE(logger); + }; + + std::vector> futures; + for (int i = 0; i < 1000; ++i) { + futures.push_back(Via(executor.get(), get_logger)); + } + Wait(futures); +} +} // namespace paimon::test