Skip to content

Fix backup worker assertion failure [release-7.1] #8887

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
jzhou77 merged 1 commit into from
Nov 22, 2022
Merged

Fix backup worker assertion failure [release-7.1] #8887

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions fdbserver/BackupWorker.actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ struct VersionedMessage {
Arena arena; // Keep a reference to the memory containing the message
size_t bytes; // arena's size when inserted, which can grow afterwards

VersionedMessage(LogMessageVersion v, StringRef m, const VectorRef<Tag>& t, const Arena& a)
: version(v), message(m), tags(t), arena(a), bytes(a.getSize()) {}
VersionedMessage(LogMessageVersion v, StringRef m, const VectorRef<Tag>& t, const Arena& a, size_t n)
: version(v), message(m), tags(t), arena(a), bytes(n) {}
Version getVersion() const { return version.version; }
uint32_t getSubVersion() const { return version.sub; }

Expand Down Expand Up @@ -924,15 +924,17 @@ ACTOR Future<Void> pullAsyncData(BackupData* self) {
// Note we aggressively peek (uncommitted) messages, but only committed
// messages/mutations will be flushed to disk/blob in uploadData().
while (r->hasMessage()) {
state size_t takeBytes = 0;
if (!prev.sameArena(r->arena())) {
TraceEvent(SevDebugMemory, "BackupWorkerMemory", self->myId)
.detail("Take", r->arena().getSize())
.detail("Current", self->lock->activePermits());

wait(self->lock->take(TaskPriority::DefaultYield, r->arena().getSize()));
takeBytes = r->arena().getSize(); // more bytes can be allocated after the wait.
wait(self->lock->take(TaskPriority::DefaultYield, takeBytes));
prev = r->arena();
}
self->messages.emplace_back(r->version(), r->getMessage(), r->getTags(), r->arena());
self->messages.emplace_back(r->version(), r->getMessage(), r->getTags(), r->arena(), takeBytes);
r->nextMessage();
}

Expand Down