Skip to content

Available space should take into account both memory and disk #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ajbeamon merged 2 commits into from
Mar 20, 2018
Merged

Available space should take into account both memory and disk #41

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b46ffb4
Available space should take into account both memory and disk
Mar 8, 2018
64deb0e
Address review comments.
Mar 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions fdbserver/KeyValueStoreMemory.actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,12 @@ class KeyValueStoreMemory : public IKeyValueStore, NonCopyable {
int64_t uncommittedBytes = queue.totalSize() + transactionSize;

//Check that we have enough space in memory and on disk
int64_t availableSize = std::min(getAvailableSize(), diskQueueBytes.free / 4 - uncommittedBytes);
int64_t freeSize = std::min(getAvailableSize(), diskQueueBytes.free / 4 - uncommittedBytes);
int64_t availableSize = std::min(getAvailableSize(), diskQueueBytes.available / 4 - uncommittedBytes);
int64_t totalSize = std::min(memoryLimit, diskQueueBytes.total / 4 - uncommittedBytes);

return StorageBytes(std::max((int64_t)0, availableSize), std::max((int64_t)0, totalSize), diskQueueBytes.used, diskQueueBytes.available);
return StorageBytes(std::max((int64_t)0, freeSize), std::max((int64_t)0, totalSize), diskQueueBytes.used,
std::max((int64_t)0, availableSize));
}

void semiCommit() {
Expand Down