BEESTOOLONG("dedup " << brp);
- BeesAddress first_addr(brp.first.fd(), brp.first.begin());
- BeesAddress second_addr(brp.second.fd(), brp.second.begin());
-
- const auto first_gpoz = first_addr.get_physical_or_zero();
- const auto second_gpoz = second_addr.get_physical_or_zero();
- if (first_gpoz == second_gpoz) {
- BEESLOGDEBUG("equal physical addresses " << first_addr << " and " << second_addr << " in dedup");
+ if (bees_extent_same_bytenr(m_root_fd, brp.first, brp.second)) {
+ BEESLOGDEBUG("equal physical addresses "
+ << bees_extent_addr(m_root_fd, brp.first) << " and "
+ << bees_extent_addr(m_root_fd, brp.second) << " in dedup");
BEESCOUNT(bug_dedup_same_physical);
}
BEESCOUNT(dedup_try);
- BEESNOTE("waiting to dedup " << brp);
- auto lock = MultiLocker::get_lock("dedupe");
-
- BEESLOGINFO("dedup: src " << pretty(brp.first.size()) << " [" << to_hex(brp.first.begin()) << ".." << to_hex(brp.first.end()) << "] {" << first_addr << "} " << name_fd(brp.first.fd()) << "\n"
- << " dst " << pretty(brp.second.size()) << " [" << to_hex(brp.second.begin()) << ".." << to_hex(brp.second.end()) << "] {" << second_addr << "} " << name_fd(brp.second.fd()));
- BEESNOTE("dedup: src " << pretty(brp.first.size()) << " [" << to_hex(brp.first.begin()) << ".." << to_hex(brp.first.end()) << "] {" << first_addr << "} " << name_fd(brp.first.fd()) << "\n"
- << " dst " << pretty(brp.second.size()) << " [" << to_hex(brp.second.begin()) << ".." << to_hex(brp.second.end()) << "] {" << second_addr << "} " << name_fd(brp.second.fd()));
+ BEESLOGINFO("dedup: src " << pretty(brp.first.size()) << " [" << to_hex(brp.first.begin()) << ".." << to_hex(brp.first.end()) << "] " << bees_extent_addr(m_root_fd, brp.first) << " " << name_fd(brp.first.fd()) << "\n"
+ << " dst " << pretty(brp.second.size()) << " [" << to_hex(brp.second.begin()) << ".." << to_hex(brp.second.end()) << "] " << bees_extent_addr(m_root_fd, brp.second) << " " << name_fd(brp.second.fd()));
while (true) {
try {
+ BEESNOTE("waiting to dedup " << brp);
+ auto lock = MultiLocker::get_lock("dedupe");
+
+ BEESNOTE("dedup: src " << pretty(brp.first.size()) << " [" << to_hex(brp.first.begin()) << ".." << to_hex(brp.first.end()) << "] " << bees_extent_addr(m_root_fd, brp.first) << " " << name_fd(brp.first.fd()) << "\n"
+ << " dst " << pretty(brp.second.size()) << " [" << to_hex(brp.second.begin()) << ".." << to_hex(brp.second.end()) << "] " << bees_extent_addr(m_root_fd, brp.second) << " " << name_fd(brp.second.fd()));
+
Timer dedup_timer;
const bool rv = btrfs_extent_same(brp.first.fd(), brp.first.begin(), brp.first.size(), brp.second.fd(), brp.second.begin());
BEESCOUNTADD(dedup_ms, dedup_timer.age() * 1000);