GGLinnk/bees
1
0
Fork 0
mirror of https://github.com/Zygo/bees.git synced 2025-05-18 05:45:45 +02:00
Code Packages

context: don't forget to retry locked extents

Browse Source 
The caller of scan_forward has to stop advancing the BeesFileCrawl
position when an extent lock blocks a scan, so that it will resume
from the same position when the Task is scheduled again; otherwise,
bees simply skips over the extent and leave it incompletely deduped.

Signed-off-by: Zygo Blaxell <bees@furryterror.org>
This commit is contained in:
Zygo Blaxell 2022-12-22 00:07:49 -05:00
parent 66b00f8a97
commit c3b664fea5
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bees-context.cc
View File

@ -678,7 +678,7 @@ BeesContext::get_inode_mutex(const uint64_t inode)
return m_inode_locks(inode); return m_inode_locks(inode);
} }
void bool
BeesContext::scan_forward(const BeesFileRange &bfr_in) BeesContext::scan_forward(const BeesFileRange &bfr_in)
{ {
BEESTRACE("scan_forward " << bfr_in); BEESTRACE("scan_forward " << bfr_in);
@ -689,7 +689,7 @@ BeesContext::scan_forward(const BeesFileRange &bfr_in)
// Silently filter out blacklisted files // Silently filter out blacklisted files
if (is_blacklisted(bfr_in.fid())) { if (is_blacklisted(bfr_in.fid())) {
BEESCOUNT(scan_blacklisted); BEESCOUNT(scan_blacklisted);
return; return false;
} }
// Reconstitute FD // Reconstitute FD
@ -703,14 +703,14 @@ BeesContext::scan_forward(const BeesFileRange &bfr_in)
if (!bfr.fd()) { if (!bfr.fd()) {
// BEESLOGINFO("No FD in " << root_path() << " for " << bfr); // BEESLOGINFO("No FD in " << root_path() << " for " << bfr);
BEESCOUNT(scan_no_fd); BEESCOUNT(scan_no_fd);
return; return false;
} }
// Sanity check // Sanity check
if (bfr.begin() >= bfr.file_size()) { if (bfr.begin() >= bfr.file_size()) {
BEESLOGWARN("past EOF: " << bfr); BEESLOGWARN("past EOF: " << bfr);
BEESCOUNT(scan_eof); BEESCOUNT(scan_eof);
return; return false;
} }
BtrfsExtentWalker ew(bfr.fd(), bfr.begin(), root_fd()); BtrfsExtentWalker ew(bfr.fd(), bfr.begin(), root_fd());
@ -729,7 +729,6 @@ BeesContext::scan_forward(const BeesFileRange &bfr_in)
// BEESLOGDEBUG("Deferring extent bytenr " << to_hex(extent_bytenr) << " from " << bfr); // BEESLOGDEBUG("Deferring extent bytenr " << to_hex(extent_bytenr) << " from " << bfr);
BEESCOUNT(scanf_deferred_extent); BEESCOUNT(scanf_deferred_extent);
start_over = true; start_over = true;
return;
} }
Timer one_extent_timer; Timer one_extent_timer;
scan_one_extent(bfr, e); scan_one_extent(bfr, e);
@ -750,7 +749,7 @@ BeesContext::scan_forward(const BeesFileRange &bfr_in)
BEESCOUNTADD(scanf_total_ms, scan_timer.age() * 1000); BEESCOUNTADD(scanf_total_ms, scan_timer.age() * 1000);
BEESCOUNT(scanf_total); BEESCOUNT(scanf_total);
return; return start_over;
} }
BeesResolveAddrResult::BeesResolveAddrResult() BeesResolveAddrResult::BeesResolveAddrResult()

11
src/bees-roots.cc
View File

@ -626,13 +626,20 @@ BeesFileCrawl::crawl_one_extent()
// It might be corrupted data, the file might have been deleted or truncated, // It might be corrupted data, the file might have been deleted or truncated,
// or we might hit some other recoverable error. We'll try again with // or we might hit some other recoverable error. We'll try again with
// the next extent. // the next extent.
bool scanned_ok = false;
catch_all([&]() { catch_all([&]() {
BEESNOTE("scan_forward " << bfr); BEESNOTE("scan_forward " << bfr);
// BEESLOGDEBUG("scan_forward #" << Task::current_task().id() << " " << bfr); // BEESLOGDEBUG("scan_forward #" << Task::current_task().id() << " " << bfr);
m_ctx->scan_forward(bfr); scanned_ok = m_ctx->scan_forward(bfr);
// BEESLOGDEBUG("done_forward #" << Task::current_task().id() << " " << bfr); // BEESLOGDEBUG("done_forward #" << Task::current_task().id() << " " << bfr);
} ); } );
m_hold = new_holder; if (scanned_ok) {
m_hold = new_holder;
} else {
BEESLOGDEBUG("retrying lock for extent at " << bfr);
BEESCOUNT(crawl_restart);
return true;
}
} }
} else { } else {
BEESCOUNT(crawl_hole); BEESCOUNT(crawl_hole);

2
src/bees.h
View File

@ -751,7 +751,7 @@ public:
Fd home_fd(); Fd home_fd();
string root_path() const { return m_root_path; } string root_path() const { return m_root_path; }
void scan_forward(const BeesFileRange &bfr); bool scan_forward(const BeesFileRange &bfr);
bool is_root_ro(uint64_t root); bool is_root_ro(uint64_t root);
BeesRangePair dup_extent(const BeesFileRange &src, const shared_ptr<BeesTempFile> &tmpfile); BeesRangePair dup_extent(const BeesFileRange &src, const shared_ptr<BeesTempFile> &tmpfile);