Skip to content

Fix xbcloud put "out-of-order chunk" failure on sparse chunks (page-compressed tables) #1781

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

Open
egezonberisha wants to merge 1 commit into
base: trunk
Choose a base branch
from
+10 −2
Open

Fix xbcloud put "out-of-order chunk" failure on sparse chunks (page-compressed tables) #1781

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
12 changes: 10 additions & 2 deletions storage/innobase/xtrabackup/src/xbcloud/xbcloud.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,8 @@ void put_func(put_thread_ctxt_t &cntx) {
entry->path = chunk.path;
}

if (chunk.type == XB_CHUNK_TYPE_PAYLOAD) {
if (chunk.type == XB_CHUNK_TYPE_PAYLOAD ||
chunk.type == XB_CHUNK_TYPE_SPARSE) {
res = (xb_rstream_result_t)xb_stream_validate_checksum(&chunk);
if (res != XB_STREAM_READ_CHUNK) {
break;
Expand Down Expand Up @@ -909,14 +910,21 @@ void put_func(put_thread_ctxt_t &cntx) {
std::placeholders::_1, object_name, chunk.raw_length,
cntx.has_errors));

if (chunk.type == XB_CHUNK_TYPE_SPARSE) {
for (size_t i = 0; i < chunk.sparse_map_size; ++i)
entry->offset += chunk.sparse_map[i].skip;
}
entry->offset += chunk.length;
entry->chunk_idx++;

if (chunk.type == XB_CHUNK_TYPE_EOF) {
filehash.erase(entry->path);
}

/* Reset chunk */
/* Reset chunk. chunk.raw_data is now owned by the upload buffer, but
chunk.sparse_map is not referenced by it, so free it here to avoid
leaking it on every iteration. */
my_free(chunk.sparse_map);
memset(&chunk, 0, sizeof(chunk));
} while (!cntx.has_errors->load());

Expand Down