diff --git a/build/Dockerfile b/build/Dockerfile index ad9669fba9..3ff21e854a 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -11,7 +11,7 @@ RUN yum install -y yum-utils &&\ devtoolset-8-libubsan-devel devtoolset-8-valgrind-devel \ rh-python36-python-devel rh-ruby24 golang python27 rpm-build \ mono-core debbuild python-pip dos2unix valgrind-devel ccache \ - distcc wget git &&\ + distcc wget git lz4 &&\ pip install boto3==1.1.1 USER root diff --git a/build/Dockerfile.devel b/build/Dockerfile.devel index a88e79b7f4..07be525e45 100644 --- a/build/Dockerfile.devel +++ b/build/Dockerfile.devel @@ -50,8 +50,8 @@ RUN cp -iv /usr/local/bin/clang++ /usr/local/bin/clang++.deref &&\ ldconfig &&\ rm -rf /mnt/artifacts -LABEL version=0.11.8 -ENV DOCKER_IMAGEVER=0.11.8 +LABEL version=0.11.9 +ENV DOCKER_IMAGEVER=0.11.9 ENV CLANGCC=/usr/local/bin/clang.de8a65ef ENV CLANGCXX=/usr/local/bin/clang++.de8a65ef diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp index a45e73a592..0b05453c9c 100644 --- a/fdbserver/KeyValueStoreRocksDB.actor.cpp +++ b/fdbserver/KeyValueStoreRocksDB.actor.cpp @@ -379,16 +379,14 @@ struct RocksDBKeyValueStore : IKeyValueStore { } StorageBytes getStorageBytes() override { + uint64_t live = 0; + ASSERT(db->GetIntProperty(rocksdb::DB::Properties::kEstimateLiveDataSize, &live)); + int64_t free; int64_t total; - - uint64_t sstBytes = 0; - ASSERT(db->GetIntProperty(rocksdb::DB::Properties::kTotalSstFilesSize, &sstBytes)); - uint64_t memtableBytes = 0; - ASSERT(db->GetIntProperty(rocksdb::DB::Properties::kSizeAllMemTables, &memtableBytes)); g_network->getDiskBytes(path, free, total); - return StorageBytes(free, total, sstBytes + memtableBytes, free); + return StorageBytes(free, total, live, free); } };