update ceph source to reef 18.1.2

[ceph.git] / ceph / src / rocksdb / memory / arena.cc

diff --git a/ceph/src/rocksdb/memory/arena.cc b/ceph/src/rocksdb/memory/arena.cc
index 5f83004482f739a68fae4c7a79d112df84781b43..10b8969b4d71c70556a0f119db9031e05c8c1a00 100644 (file)
--- a/ceph/src/rocksdb/memory/arena.cc
+++ b/ceph/src/rocksdb/memory/arena.cc
@@ -12,11 +12,13 @@
 #include <sys/mman.h>
 #endif
 #include <algorithm>
+
 #include "logging/logging.h"
 #include "port/malloc.h"
 #include "port/port.h"
 #include "rocksdb/env.h"
 #include "test_util/sync_point.h"
+#include "util/string_util.h"
 
 namespace ROCKSDB_NAMESPACE {
 
@@ -161,7 +163,6 @@ char* Arena::AllocateAligned(size_t bytes, size_t huge_page_size,
 #ifdef MAP_HUGETLB
   if (huge_page_size > 0 && bytes > 0) {
     // Allocate from a huge page TLB table.
-    assert(logger != nullptr);  // logger need to be passed in.
     size_t reserved_size =
         ((bytes - 1U) / huge_page_size + 1U) * huge_page_size;
     assert(reserved_size >= bytes);
@@ -170,7 +171,7 @@ char* Arena::AllocateAligned(size_t bytes, size_t huge_page_size,
     if (addr == nullptr) {
       ROCKS_LOG_WARN(logger,
                      "AllocateAligned fail to allocate huge TLB pages: %s",
-                     strerror(errno));
+                     errnoStr(errno).c_str());
       // fail back to malloc
     } else {
       return addr;