diff --git a/src/storage/slog/ob_storage_logger_manager.cpp b/src/storage/slog/ob_storage_logger_manager.cpp index 3b07cd7c14..b05d00fc34 100644 --- a/src/storage/slog/ob_storage_logger_manager.cpp +++ b/src/storage/slog/ob_storage_logger_manager.cpp @@ -52,9 +52,6 @@ int ObStorageLoggerManager::init( const bool need_reserved) { int ret = OB_SUCCESS; - const int64_t MAX_CONCURRENT_ITEM_CNT = !lib::is_mini_mode() ? - MAX(128, sysconf(_SC_NPROCESSORS_ONLN) * 2) : 64; - static const int64_t MAX_TENANT_BUCKET = 63; if (OB_UNLIKELY(is_inited_)) { ret = OB_INIT_TWICE; @@ -64,9 +61,9 @@ int ObStorageLoggerManager::init( STORAGE_REDO_LOG(WARN, "invalid arguments", K(ret), KP(log_dir), K(max_log_file_size)); } else if (OB_FAIL(prepare_log_buffers(MAX_CONCURRENT_ITEM_CNT, NORMAL_LOG_ITEM_SIZE))) { STORAGE_REDO_LOG(WARN, "fail to prepare log buffers", K(ret), - K(MAX_CONCURRENT_ITEM_CNT), LITERAL_K(NORMAL_LOG_ITEM_SIZE)); + LITERAL_K(MAX_CONCURRENT_ITEM_CNT), LITERAL_K(NORMAL_LOG_ITEM_SIZE)); } else if (OB_FAIL(prepare_log_items(MAX_CONCURRENT_ITEM_CNT))) { - STORAGE_REDO_LOG(WARN, "fail to prepare log items", K(ret), K(MAX_CONCURRENT_ITEM_CNT)); + STORAGE_REDO_LOG(WARN, "fail to prepare log items", K(ret), LITERAL_K(MAX_CONCURRENT_ITEM_CNT)); } else { log_dir_ = log_dir; max_log_file_size_ = max_log_file_size; diff --git a/src/storage/slog/ob_storage_logger_manager.h b/src/storage/slog/ob_storage_logger_manager.h index 3bd7021b0c..f2a96f6c87 100644 --- a/src/storage/slog/ob_storage_logger_manager.h +++ b/src/storage/slog/ob_storage_logger_manager.h @@ -70,7 +70,8 @@ private: int get_using_disk_space(int64_t &using_space) const; private: - static constexpr int64_t NORMAL_LOG_ITEM_SIZE = 512 * 1024; //512KB + static constexpr int64_t NORMAL_LOG_ITEM_SIZE = 8 * 1024; //8KB + static constexpr int64_t MAX_CONCURRENT_ITEM_CNT = 1024; static constexpr int64_t RESERVED_DISK_SIZE = 4 * 1024 * 1024 * 1024L; // 4G common::ObArenaAllocator allocator_; diff --git a/unittest/storage/slog/test_storage_logger_manager.cpp b/unittest/storage/slog/test_storage_logger_manager.cpp index 9aea7e43f3..b426a651ca 100644 --- a/unittest/storage/slog/test_storage_logger_manager.cpp +++ b/unittest/storage/slog/test_storage_logger_manager.cpp @@ -51,8 +51,7 @@ public: public: static const int64_t MAX_FILE_SIZE = 256 * 1024 * 1024; - const int64_t MAX_CONCURRENT_ITEM_CNT = !lib::is_mini_mode() ? - MAX(128, sysconf(_SC_NPROCESSORS_ONLN) * 2) : 64; + const int64_t MAX_CONCURRENT_ITEM_CNT = 1024; public: char dir_[128]; @@ -102,7 +101,7 @@ TEST_F(TestStorageLoggerManager, test_manager_basic) log_item, 1); ASSERT_NE(OB_SUCCESS, ret); // test normal item allocation (not local) - ret = SLOGGERMGR.alloc_item(30 * 1024, log_item, 15); + ret = SLOGGERMGR.alloc_item(3 * 1024, log_item, 15); ASSERT_EQ(OB_SUCCESS, ret); ASSERT_TRUE(log_item->is_inited_); ASSERT_FALSE(log_item->is_local_); @@ -220,7 +219,7 @@ TEST_F (TestStorageLoggerManager, test_build_item) data_len = dummy_header.get_serialize_size() + dummy_entry.get_serialize_size() + 12; - buf_size = 512<<10; + buf_size = 8<<10; ASSERT_EQ(data_len, log_item->get_data_len()); ASSERT_EQ(data_len, log_item->get_log_data_len()); ASSERT_EQ(buf_size, log_item->get_buf_size()); @@ -280,7 +279,7 @@ TEST_F (TestStorageLoggerManager, test_build_item) data_len = dummy_header.get_serialize_size() + 3 * dummy_entry.get_serialize_size() + 111; - buf_size = 512<<10; + buf_size = 8<<10; ASSERT_EQ(data_len, log_item->get_data_len()); ASSERT_EQ(data_len, log_item->get_log_data_len()); ASSERT_EQ(buf_size, log_item->get_buf_size());