wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rocksdb-data-estimate' into rocksdb-unsafe-fsync

This commit is contained in:
Daniel Smith 2020-10-09 16:56:54 +00:00
parent 6e287eb0d1 a9301f78da
commit 2671157f8f
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/Dockerfile
View File

@ -11,7 +11,7 @@ RUN yum install -y yum-utils &&\
devtoolset-8-libubsan-devel devtoolset-8-valgrind-devel \ devtoolset-8-libubsan-devel devtoolset-8-valgrind-devel \
rh-python36-python-devel rh-ruby24 golang python27 rpm-build \ rh-python36-python-devel rh-ruby24 golang python27 rpm-build \
mono-core debbuild python-pip dos2unix valgrind-devel ccache \ mono-core debbuild python-pip dos2unix valgrind-devel ccache \
distcc wget git &&\ distcc wget git lz4 &&\
pip install boto3==1.1.1 pip install boto3==1.1.1
USER root USER root

4
build/Dockerfile.devel
View File

@ -50,8 +50,8 @@ RUN cp -iv /usr/local/bin/clang++ /usr/local/bin/clang++.deref &&\
ldconfig &&\ ldconfig &&\
rm -rf /mnt/artifacts rm -rf /mnt/artifacts
LABEL version=0.11.8 LABEL version=0.11.9
ENV DOCKER_IMAGEVER=0.11.8 ENV DOCKER_IMAGEVER=0.11.9
ENV CLANGCC=/usr/local/bin/clang.de8a65ef ENV CLANGCC=/usr/local/bin/clang.de8a65ef
ENV CLANGCXX=/usr/local/bin/clang++.de8a65ef ENV CLANGCXX=/usr/local/bin/clang++.de8a65ef

10
fdbserver/KeyValueStoreRocksDB.actor.cpp
View File

@ -379,16 +379,14 @@ struct RocksDBKeyValueStore : IKeyValueStore {
} }
StorageBytes getStorageBytes() override { StorageBytes getStorageBytes() override {
uint64_t live = 0;
ASSERT(db->GetIntProperty(rocksdb::DB::Properties::kEstimateLiveDataSize, &live));
int64_t free; int64_t free;
int64_t total; 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); g_network->getDiskBytes(path, free, total);
return StorageBytes(free, total, sstBytes + memtableBytes, free); return StorageBytes(free, total, live, free);
} }
}; };