update sources to 12.2.8

[ceph.git] / ceph / src / kv / RocksDBStore.cc

diff --git a/ceph/src/kv/RocksDBStore.cc b/ceph/src/kv/RocksDBStore.cc
index a13c47291c869f5c765693bb4a35aec5d5c1a57c..d18056d24b06996f5e1d9ab8724e357bd9a1514a 100644 (file)
--- a/ceph/src/kv/RocksDBStore.cc
+++ b/ceph/src/kv/RocksDBStore.cc
@@ -162,14 +162,14 @@ int RocksDBStore::tryInterpret(const string &key, const string &val, rocksdb::Op
 {
   if (key == "compaction_threads") {
     std::string err;
-    int f = strict_sistrtoll(val.c_str(), &err);
+    int f = strict_iecstrtoll(val.c_str(), &err);
     if (!err.empty())
       return -EINVAL;
     //Low priority threadpool is used for compaction
     opt.env->SetBackgroundThreads(f, rocksdb::Env::Priority::LOW);
   } else if (key == "flusher_threads") {
     std::string err;
-    int f = strict_sistrtoll(val.c_str(), &err);
+    int f = strict_iecstrtoll(val.c_str(), &err);
     if (!err.empty())
       return -EINVAL;
     //High priority threadpool is used for flusher
@@ -354,8 +354,8 @@ int RocksDBStore::do_open(ostream &out, bool create_if_missing)
 
   opt.table_factory.reset(rocksdb::NewBlockBasedTableFactory(bbt_opts));
   dout(10) << __func__ << " block size " << g_conf->rocksdb_block_size
-           << ", block_cache size " << prettybyte_t(block_cache_size)
-          << ", row_cache size " << prettybyte_t(row_cache_size)
+           << ", block_cache size " << byte_u_t(block_cache_size)
+          << ", row_cache size " << byte_u_t(row_cache_size)
           << "; shards "
           << (1 << g_conf->rocksdb_cache_shard_bits)
           << ", type " << g_conf->rocksdb_cache_type